From e79a60a44a2da16b9b4125fc5f5e20e8f363f874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 15 Apr 2025 17:57:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=A7=E7=9A=8412345=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/eventOld/cpts/event-info.vue | 9 ++++++--- src/views/modules/shequzhili/eventOld/eventList.vue | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 5be3d723f..7d8f31aff 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -513,12 +513,15 @@ export default { this.grid = val.value; }, async handelDispose() { - console.log(this.grid,"DSFKDSFJDKS"); - if(!this.grid){ - console.log(this.grid,"DSFKDSFJDKS"); + console.log(this.$refs.ref_detail.info,"sdf;lsdk"); + if(this.$refs.ref_detail.info.gridId){ + this.grid=this.$refs.ref_detail.info.gridId + }else{ this.$message.error("请选择网格"); return } + // console.log(this.grid,"DSFKDSFJDKS"); + this.$refs.ref_processinfo_dispose.getProcessInfo(); if (this.$refs.ref_processinfo_dispose.okflag) { this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index f71e0afcd..9e8eb7fbb 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -753,8 +753,9 @@ export default { }, async delEvent(eventId) { const url = "/governance/icEventOld/delete"; - let idsArr = [eventId]; - const { data, code, msg } = await requestPost(url, idsArr); + const formData = new FormData(); + formData.append('ids', eventId) + const { data, code, msg } = await requestPost(url, formData); if (code === 0) { this.$message.success("删除成功！"); this.getTableData(); From a86a70ebbd668f9e4f669c58a8a106fdc463a58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 22 Apr 2025 10:36:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/organization/organization.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index adee93749..cf5488a2e 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1778,14 +1778,19 @@ export default { }, // 人员修改 async updatePeoDo () { - const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]); + const manageScopeArra=[] + if(this.peoForm.manageScopes){ + const targetAgencyIds =this.peoForm.manageScopes?this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]):this.peoForm.manageScopes; // 用于存储提取结果的 Set 对象 const result = new Set(); // 调用递归函数提取 level 与 agencyId 组合成的字符串 this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); // 将 Set 对象转换为数组 + manageScopeArray = Array.from(result); + console.log(this.peoForm,"查看"); + } - const manageScopeArray = Array.from(result); + const url = "/gov/org/staff/editstaff"; let params = { staffId: this.userStaffId, @@ -2072,7 +2077,6 @@ export default { this.gridTableFlag = false; this.agencyTableFlag = false; this.departmentTableFlag = false; - this.selDeptType = row.deptType; this.getDepartmentStaffListData(); this.assembleBreadcrumbArr(row.departmentId, "department"); @@ -2254,7 +2258,7 @@ export default { this.peoForm.post = data.workType; this.peoForm.idCard = data.idCard; this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[]; - this.peoForm.orgLevels = data.orgLevels; + this.peoForm.orgLevels = data.manageLevelStr; this.manageOrgIds = data.manageOrgIdStr; // 已有的权限（角色） let existedRoleArr = []; @@ -2264,6 +2268,7 @@ export default { } }); this.peoForm.newRoles = existedRoleArr; + } else { this.$message.error(msg); } From f22047276531b4b2638d7a7dd0501018db081c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 22 Apr 2025 15:41:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?var=E5=92=8Cconst=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index cf5488a2e..9507a5077 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1778,7 +1778,6 @@ export default { }, // 人员修改 async updatePeoDo () { - const manageScopeArra=[] if(this.peoForm.manageScopes){ const targetAgencyIds =this.peoForm.manageScopes?this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]):this.peoForm.manageScopes; // 用于存储提取结果的 Set 对象 @@ -1786,7 +1785,7 @@ export default { // 调用递归函数提取 level 与 agencyId 组合成的字符串 this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); // 将 Set 对象转换为数组 - manageScopeArray = Array.from(result); + var manageScopeArray = Array.from(result); console.log(this.peoForm,"查看"); } From 46b747ed9bb27b96325074c29becfa26d6fb66a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 25 Apr 2025 09:38:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/event/cpts/process-form-complete.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue index 2b98d4251..41228dcb3 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue @@ -262,7 +262,7 @@
+ prop="confirmSolved">
@@ -273,7 +273,7 @@
+ prop="satisfactionResult">
Date: Tue, 6 May 2025 14:15:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=89=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/event/cpts/event-info.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index d93b18d47..8db11604b 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -202,7 +202,7 @@
填报不合规诉求：
-
{{ irregularity.find(v => v.value ==item.irregularity).label }}
+
{{ binaryOptionList.find(v => v.value ==item.irregularity).label }}
不合规诉求类型：
@@ -252,7 +252,7 @@