From 3c8104554af2aa13a050cab832a0d704f3a9a062 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 8 Apr 2022 11:30:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9B=86=E4=BD=93=E7=BB=8F=E6=B5=8E?= =?UTF-8?q?=E8=82=A1=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppGroupShareholders/components/Add.vue | 150 ++++++++++++------ .../AppGroupShareholders/components/List.vue | 4 - .../AppPublicArrearage/components/Add.vue | 61 ++++--- 3 files changed, 140 insertions(+), 75 deletions(-) diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue index 6a168b7f..07daf787 100644 --- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue +++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue @@ -14,13 +14,13 @@ - - + + - - + + @@ -29,8 +29,8 @@ - - + + @@ -43,11 +43,11 @@ @@ -59,7 +59,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,43 +128,43 @@ export default { return { id: '', form: { - useCertificate: '', + organizationName: '', areaId: '', areaName: '', - usePerson: '', - houseNumber: '', - idNumber: '', - landOwnership: '', - landArea: '', - landFourTo: '', - useSituation: '', - fileList: '', - + unifiedCode: '', + stockCertificateCode: '', + fileList: [], }, + // tableData: {}, + table: {}, isEdit: false, radioFrom: '', page: {current: 1, size: 10, total: 0}, tableData: [], disabledLevel: 3, page: {current: 1, size: 10, total: 0}, - + sysInfoDialog: false, + data: {}, } }, computed: { rules() { return { - useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}], - areaName: [{required: true, message: '请选择所在地区', trigger: 'blur'}], - usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}], - houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'}], - idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}], - landOwnership: [{required: true, message: '请输入土地所有权', trigger: 'blur'}], - landArea: [{required: true, message: '请输入土地面积', trigger: 'blur'}], - landFourTo: [{required: true, message: '请输入土地四至', trigger: 'blur'}], - useSituation: [{required: true, message: '请输入使用情况', trigger: 'blur'}], + organizationName: [{required: true, message: '请输入集体经济组织名称', trigger: 'blur'}], + unifiedCode: [{required: true, message: '请输入统一社会信用代码', trigger: 'blur'}], + areaId: [{required: true, message: '请选择所在地区', trigger: 'blur'}], + stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}], fileList: [{required: true, message: '请上传图片', trigger: 'blur'}], } }, + dialogRules() { + return { + name: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}], + idNumber: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}], + householdRelation: [{required: true, message: '请选择与户主关系', trigger: 'blur'}], + shareholdingNumber: [{required: true, message: '请输入持股数量', trigger: 'blur'}], + } + }, ...mapState(['user']), colConfigs() { return [ @@ -149,12 +177,13 @@ export default { } }, created() { + this.$dict.load('householdRelation') if (this.params && this.params.id) { this.id = this.params.id this.getDetail(this.params.id) } this.form.areaId = this.user.info.areaId - this.getTableData() + // this.getTableData() }, methods: { cancel(isRefresh) { @@ -163,20 +192,40 @@ export default { isRefresh: !!isRefresh, }) }, - getTableData() { - this.instance.post("/appcollectiveeconomyequity/list", null, { - params: {...this.page } + // getTableData() { + // this.instance.post("/appcollectiveeconomyequity/list", null, { + // params: {...this.page } + // }).then(res => { + // if (res?.data) { + // this.data = res.data?.records + // this.tableData = res.data?.records.shareholderLists + // this.page.total = res.data.total + // } + // }) + // }, + getDetail(id) { + this.instance.post(`/appcollectiveeconomyequity/queryDetailById`,null, { + params: { + id: id, + ...this.page, + } }).then(res => { - if (res?.data) { - this.tableData = res.data?.records.shareholderList - this.page.total = res.data.total + if (res.code === 0) { + this.data = res.data, + this.tableData = res.data.shareholderList + this.page.total = res.data.shareholderList.length } }) }, - getDetail(id) { - this.instance.post(`/appcollectiveeconomyequity/queryDetailById?id=${id}`).then(res => { - if (res.code === 0) { - this.data = res.data + onConfirm() { + this.$refs.dialogForm.validate((valid) => { + if(valid) { + let tableDataList = [] + tableDataList.push(this.table) + this.tableData = tableDataList + setTimeout(() => { + this.sysInfoDialog = false + }, 600) } }) }, @@ -186,6 +235,7 @@ export default { this.instance.post(`/appcollectiveeconomyequity/addOrUpdate`, { ...this.form, id: this.params.id || '', + shareholderList: this.tableData, }).then(res => { if (res.code == 0) { this.$message.success('提交成功') diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue index c1610888..89ec9e56 100644 --- a/project/xiushan/apps/AppGroupShareholders/components/List.vue +++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue @@ -36,7 +36,6 @@ diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsStatistics.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsStatistics.vue index 7487f6c4..2813745d 100644 --- a/project/xiushan/apps/financing/AppFinancingNeeds/needsStatistics.vue +++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsStatistics.vue @@ -1,21 +1,114 @@