From 6794dd6d48ae275f3188aa08613e13f29f78e52d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 22 Jul 2024 14:14:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/gxxq/addForm.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index c82182bfc..c5fae0c57 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -760,6 +760,11 @@ export default { if (this.formType === "edit") { url = "/governance/commonDemand/update"; params.id = this.scopeId; + if(this.serviceOptiondList.findIndex(item=>item.id === params.assignInfo.serverOrgId) != -1){ + let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === params.assignInfo.serverOrgId)[0] + params.serverOrgName = name + params.serverOrgMobile = mobile + } } const { data, code, msg } = await requestPost(url, params); @@ -774,8 +779,8 @@ export default { } }catch (error) { this.newFormData.serviceScopeList = serviceScopeListCopy - this.$message.error(msg); - console.log(msg); + this.$message.error(error); + console.log(error); } }, From bebb7f74daab361c6f24ac8e5b8a3bab1b0e71fd Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 24 Jul 2024 11:12:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/policy/addPolicy.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 77ab2a150..242ec7ba1 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -769,6 +769,11 @@ export default { } else { url = "/governance/policy/updatePolicy"; this.formData.policyId = this.policyId; + if(this.serviceOptiondList.findIndex(item=>item.id === params.assignInfo.serverOrgId) != -1){ + let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === params.assignInfo.serverOrgId)[0] + params.serverOrgName = name + params.serverOrgMobile = mobile + } } if (this.formType == "copy" && this.formData.assignFlag == 0) { From aa8f1ec4a86fdfc93d558eca4c0821216613d3f7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 24 Jul 2024 14:06:23 +0800 Subject: [PATCH 3/5] 1 --- .../modules/communityService/policy/addPolicy.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 242ec7ba1..a9a5533e3 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -769,10 +769,12 @@ export default { } else { url = "/governance/policy/updatePolicy"; this.formData.policyId = this.policyId; - if(this.serviceOptiondList.findIndex(item=>item.id === params.assignInfo.serverOrgId) != -1){ - let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === params.assignInfo.serverOrgId)[0] - params.serverOrgName = name - params.serverOrgMobile = mobile + console.log(this.formData.assignInfo.serverOrgId); + console.log(this.serviceOptiondList); + if(this.serviceOptiondList.findIndex(item=>item.id === this.formData.assignInfo.serverOrgId) != -1){ + let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === this.formData.assignInfo.serverOrgId)[0] + this.formData.serverOrgName = name + this.formData.serverOrgMobile = mobile } } @@ -800,7 +802,9 @@ export default { assignFlag:this.formData.assignFlag, assignInfo:this.formData.assignInfo, resiSearchTagId:this.formData.resiSearchTagId, - policyId:this.formData.policyId + policyId:this.formData.policyId, + serverOrgMobile:this.formData.serverOrgMobile, + serverOrgName:this.formData.serverOrgName }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { From c792cbd5cc7e86244a5e5dd53f91493a78c11c5e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 24 Jul 2024 14:08:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8C=87=E6=B4=BE?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/policy/addPolicy.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index a9a5533e3..ef4d37030 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -157,10 +157,10 @@ label-width="150px" > - + v-model="value" + active-color="#409EFF" + inactive-color="#ff4949"> + item.id === this.formData.assignInfo.serverOrgId) != -1){ + if(this.serviceOptiondList && this.serviceOptiondList.findIndex(item=>item.id === this.formData.assignInfo.serverOrgId) != -1){ let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === this.formData.assignInfo.serverOrgId)[0] this.formData.serverOrgName = name this.formData.serverOrgMobile = mobile From bb78e25a7cbee9316875bf62e664791b9ec75ace Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 24 Jul 2024 16:32:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=80=E5=85=B3=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/policy/addPolicy.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index ef4d37030..ddb1d12e2 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -158,7 +158,7 @@ > @@ -769,8 +769,6 @@ export default { } else { url = "/governance/policy/updatePolicy"; this.formData.policyId = this.policyId; - console.log(this.formData.assignInfo.serverOrgId); - console.log(this.serviceOptiondList); if(this.serviceOptiondList && this.serviceOptiondList.findIndex(item=>item.id === this.formData.assignInfo.serverOrgId) != -1){ let {name,mobile} = this.serviceOptiondList.filter(item=>item.id === this.formData.assignInfo.serverOrgId)[0] this.formData.serverOrgName = name