From e8695dfeae568d933c867e14183e6780ac0ce8ee Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 1 Sep 2023 19:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subsistenceAllowance/addForm.vue | 188 +++++------ .../subsistenceAllowance.vue | 53 +-- .../modules/communityParty/members/create.vue | 18 +- .../modules/communityParty/members/detail.vue | 176 +++++----- .../communityParty/members/memberList.vue | 36 +- .../modules/communityParty/members/update.vue | 307 +++++++----------- 6 files changed, 366 insertions(+), 412 deletions(-) diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue index 51e9912cd..114f5d374 100644 --- a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue +++ b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue @@ -131,7 +131,7 @@
民族: - {{ nationName || "--" }} + {{ formData.nationName || "--" }}
@@ -187,7 +187,8 @@
- + +
@@ -203,92 +204,41 @@ - + - -
- 残疾类别: - {{ formData.disabilityCategoryName || "--" }} -
- - - - - - -
- -
- 残疾级别: - {{ formData.disabilityLevelName || "--" }} -
- - - - - - -
-
+ +
+ 银行卡号: + {{ formData.bankAccount || "--" }} +
+ + + +
- - -
- 残疾证号: - {{ formData.disabilityNum || "--" }} -
- - - -
- -
- 低保: - {{ formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }} -
- - - - - - -
-
+ + + + +
+ 退休金额: + {{ formData.retirementAmount || "--" }} +
+ + + +
+
- -
- 退休金额: - {{ formData.retirementAmount || "--" }} -
- - - -
月收入: @@ -302,35 +252,52 @@ > - - -
- 联系人: - {{ formData.contactName || "--" }} + 工作单位: + {{ formData.workUnit || "--" }}
- +
+
+ +
- 联系电话: - {{ formData.contactMobile || "--" }} + 职业: + {{ formData.occupation || "--" }}
- +
+ +
+ 离退休时间: + {{formData.retireTime||'--'}} +
+ + + + +
@@ -387,26 +354,27 @@ data() { return { btnDisable: false, - + formData: { name: "", - mobile: "", - idType: "", + idType: null, idNum: "", + birthday: "", + mobile: "", gender: "", + nation: "", localResidenceFlag: null, placeOfDomicile: "", currentResidence: "", - disabilityCategoryCode: "", - disabilityLevel: "", - disabilityNum: "", - subsistenceAllowanceFlag: null, - retirementAmount: null, - monthIncome: null, - contactName: "", - contactMobile: "", + bankAccount: "", + retirementAmount: "", + monthIncome: "", + workUnit: null, + occupation: "", + retireTime: "", remark: "", - }, + agencyId: this.$store.state.user.agencyId, + }, genderList, binaryOptionList, dataRule: { @@ -447,7 +415,7 @@ await this.getDetail(this.scopeId); }, async getDetail(categorizedResiId) { - const url = `/governance/commonDemand/detail/${categorizedResiId}`; + const url = `/actual/base/resiCategorized/subsistenceAllowance/detail/${categorizedResiId}`; const { data, code, msg } = await requestGet(url); if (code === 0) { console.log(data); @@ -463,8 +431,8 @@ } const url = this.formType === "edit" - ? "" - : ""; + ? "/actual/base/resiCategorized/subsistenceAllowance/update" + : "/actual/base/resiCategorized/subsistenceAllowance/create"; const { data, code, msg } = await requestPost(url, this.formData); if (code === 0) { diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue index c6bd8da4e..8c7e2f66e 100644 --- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue +++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue @@ -244,37 +244,39 @@ + + { + this.$refs.ref_add_form.initForm("edit", row); + }); + }, // 新增弹出框组件取消事件 handleClose() { this.formType = ""; @@ -587,7 +594,7 @@ }, // 删除处理 async cancelFuwu(id) { - const url = ""; + const url = "/actual/base/resiCategorized/subsistenceAllowance/deleteBatch"; const { data, code, msg } = await requestPost(url, id); if (code === 0) { this.$message.success("取消成功!"); @@ -599,7 +606,7 @@ // 获取列表 async getTableData() { this.tableLoading = true; - const url = ""; + const url = "/actual/base/resiCategorized/subsistenceAllowance/page"; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/communityParty/members/create.vue b/src/views/modules/communityParty/members/create.vue index 912c44c17..36c88884a 100644 --- a/src/views/modules/communityParty/members/create.vue +++ b/src/views/modules/communityParty/members/create.vue @@ -294,13 +294,12 @@
- 取 消 - 确 定 + 取 消 + 确 定
@@ -538,6 +537,11 @@ export default { }, }, props: { + source: { + //展示来源:manage 管理平台 visiual 可视化平台 + type: String, + default: "manage", + }, } } diff --git a/src/views/modules/communityParty/members/detail.vue b/src/views/modules/communityParty/members/detail.vue index eafc319ee..1705090fc 100644 --- a/src/views/modules/communityParty/members/detail.vue +++ b/src/views/modules/communityParty/members/detail.vue @@ -1,24 +1,23 @@