From d6a2b47af50e499029b1782ec1b9c1d7ba75f292 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 29 May 2023 14:48:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 81 +++++++++++++++++++ .../modules/lingshan/bmfw/zdbf/cpts/edit.vue | 8 +- .../modules/shequzhili/event/cpts/add.vue | 2 + 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 159dc60..5fe1ab5 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -430,6 +430,15 @@ placeholder="请输入联系电话" > + + + +
取 消 @@ -493,6 +502,15 @@
+ + + +
@@ -937,6 +955,15 @@
+ + + +
取 消 @@ -983,6 +1010,15 @@
+ + + +
取 消 @@ -1046,6 +1082,15 @@
+ + + +
取 消 @@ -1089,6 +1134,15 @@ placeholder="请输入联系电话" > + + + +
取 消 @@ -1164,6 +1218,15 @@
+ + + +
取 消 @@ -1291,6 +1354,7 @@ export default { longitude: "", //经度 latitude: "", //纬度 centerAddress: "", + description: "", }, // 新增组织 agencyForm: { @@ -1303,6 +1367,7 @@ export default { contacts: "", mobile: "", code: "", + description: "", }, // 树 tree: [], @@ -1347,6 +1412,7 @@ export default { areaCode: "", agencyId: "", areaName: "", + description: "", }, // 下级机关单位 OrgUnitDetailsForm: { @@ -1355,6 +1421,7 @@ export default { departmentId: "", departmentName: "", mobile: "", + description: "", }, // 网格修改表单 modifyGridFrom: { @@ -1371,6 +1438,7 @@ export default { griId: "", // 排序 gridSort: 0, + description: "", }, judgeOrgInfoLevel: [], keyWords: "", @@ -1902,6 +1970,7 @@ export default { this.insertForm.code = ""; this.insertForm.mobile = ""; this.insertForm.departmentName = ""; + this.insertForm.description = ""; this.peoForm = { name: "", @@ -1931,6 +2000,7 @@ export default { (this.GridForm.location = ""), (this.GridForm.longitude = ""), (this.GridForm.latitude = ""); + this.GridForm.description = ""; }, /** 人员清空 */ peoFormRest() { @@ -1967,6 +2037,7 @@ export default { (this.agencyForm.code = ""), (this.latitude = ""), (this.longitude = ""); + this.agencyForm.description = ""; }, // 修改市级组织 cancelModifyCityOrgPopRest() { @@ -1979,6 +2050,7 @@ export default { (this.OrgDetailsForm.areaCode = ""); this.OrgDetailsForm.agencyId = ""; (this.latitude = ""), (this.longitude = ""); + this.OrgDetailsForm.description = ""; }, // 修改下级机关单位 OrgUnitDetailsRest() { @@ -1987,6 +2059,7 @@ export default { (this.OrgUnitDetailsForm.departmentId = ""), (this.OrgUnitDetailsForm.departmentName = ""), (this.OrgUnitDetailsForm.mobile = ""); + this.OrgUnitDetailsForm.description = ""; }, // 修改网格清空 ModifyGridPopRest() { @@ -2001,6 +2074,7 @@ export default { (this.modifyGridFrom.gridType = ""), (this.modifyGridFrom.manageDistrict = ""), (this.modifyGridFrom.griId = ""); + this.modifyGridFrom.description = ""; }, // 社区新增弹框取消按钮 cancel() { @@ -2711,6 +2785,7 @@ export default { contacts: this.agencyForm.contacts, mobile: this.agencyForm.mobile, code: this.agencyForm.code, + description: this.agencyForm.description, latitude: this.latitude, longitude: this.longitude, }; @@ -2790,6 +2865,7 @@ export default { this.OrgDetailsForm.centerAddress = data.centerAddress; this.OrgDetailsForm.areaCode = data.areaCode; this.OrgDetailsForm.mobile = data.mobile; + this.OrgDetailsForm.description = data.description; this.latitude = data.latitude; this.longitude = data.longitude; this.OrgDetailsForm.agencyId = data.agencyId; @@ -2814,6 +2890,7 @@ export default { this.OrgUnitDetailsForm.departmentId = data.departmentId; this.OrgUnitDetailsForm.departmentName = data.departmentName; this.OrgUnitDetailsForm.mobile = data.mobile; + this.OrgUnitDetailsForm.description = data.description; } else { this.$message.error(msg); } @@ -2840,6 +2917,7 @@ export default { this.modifyGridFrom.manageDistrict = data.manageDistrict; this.modifyGridFrom.griId = data.grid; this.modifyGridFrom.gridSort = data.gridSort; + this.modifyGridFrom.description = data.description; } else { this.$message.error(msg); } @@ -2855,6 +2933,7 @@ export default { contacts: this.OrgDetailsForm.contacts, mobile: this.OrgDetailsForm.mobile, code: this.OrgDetailsForm.code, + description: this.OrgDetailsForm.description, latitude: this.latitude, longitude: this.longitude, }; @@ -2883,6 +2962,7 @@ export default { departmentId: this.OrgUnitDetailsForm.departmentId, departmentName: this.OrgUnitDetailsForm.departmentName, mobile: this.OrgUnitDetailsForm.mobile, + description: this.OrgUnitDetailsForm.description, }; const { data, code, msg } = await requestPost(url, params); @@ -2911,6 +2991,7 @@ export default { code: this.modifyGridFrom.code, gridType: this.modifyGridFrom.gridType, sort: this.modifyGridFrom.gridSort, + description: this.modifyGridFrom.description, }; const { data, code, msg } = await requestPost(url, params); diff --git a/src/views/modules/lingshan/bmfw/zdbf/cpts/edit.vue b/src/views/modules/lingshan/bmfw/zdbf/cpts/edit.vue index 655c22a..6e2023e 100644 --- a/src/views/modules/lingshan/bmfw/zdbf/cpts/edit.vue +++ b/src/views/modules/lingshan/bmfw/zdbf/cpts/edit.vue @@ -1295,12 +1295,12 @@ @@ -1966,12 +1966,12 @@ export default { }, async getInfo() { - const url = `/epmetuser/lingShan/helpCrowd/getPersonHelpTypeDetail`; const { resiId } = this; + const url = `/epmetuser/lingShan/helpCrowd/getPersonHelpTypeDetail?resiId=${resiId}`; const params = { resiId, }; - const { data, code, msg } = await requestGet(url, params); + const { data, code, msg } = await requestPost(url, params); if (code === 0) { let fmData = iniFmData(); let helpType = Object.keys(data.helpCrowdDetails).filter( diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 721ca2a..3c00a86 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -406,6 +406,8 @@ export default { value: "id", label: "name", children: "subCategory", + checkStrictly: true, + emitPath: false, }, hideUploadBtn: false, eventTypeOptions: [