From a06cdf8d06cdedff224263854e7bc7df5e797bfb Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 31 Oct 2023 16:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuzhaoren/addForm.vue  | 18 ++++++-----
 .../gangweizhaoren/addForm.vue                | 18 ++++++-----
 .../jinengzhaoren/addForm.vue                 | 18 ++++++-----
 .../wennuanzhaoren/addForm.vue                | 31 +++++++++----------
 4 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
index 16b531f8b..f783d58a6 100644
--- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue
@@ -175,7 +175,7 @@
         </el-form-item>
         <el-form-item
           label="服务范围"
-          prop="objList"
+          prop="gridIdList"
           label-width="150px"
           :class="{ 'form-item': source === 'visiual' }"
           style="display: block"
@@ -449,7 +449,7 @@ export default {
         policyId: "", //政策依据
         serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务方Id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@@ -482,7 +482,7 @@ export default {
         serviceTimeStart: [
           { required: true, message: "服务时间不能为空", trigger: "change" },
         ],
-        objList: [
+        gridIdList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
         resiSearchTagId: [
@@ -634,7 +634,9 @@ export default {
 
       if (code === 0) {
         this.formData = { ...data };
-        console.log(this.formData);
+        if(!data.noticeApproches){
+          this.formData.noticeApproches = [];
+        }
         this.scopeIdArray = data.gridIdList.map(i => i.objectId);
         this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
         this.handleChangeServiceTypeLevel1();
@@ -891,7 +893,7 @@ export default {
     },
 
     handleChangeScope(value) {
-      this.formData.objList = [];
+      this.formData.gridIdList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
       selArray.forEach((element) => {
@@ -900,7 +902,7 @@ export default {
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
-        this.formData.objList.push(obj);
+        this.formData.gridIdList.push(obj);
       });
     },
 
@@ -919,7 +921,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      this.formData.objList = await this.handleTreeList();
+      this.formData.gridIdList = await this.handleTreeList();
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -1008,7 +1010,7 @@ export default {
       this.formData = {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue
index 60b6fe95c..f4e7e7577 100644
--- a/src/views/modules/communityService/gangweizhaoren/addForm.vue
+++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue
@@ -175,7 +175,7 @@
         </el-form-item>
         <el-form-item
           label="服务范围"
-          prop="objList"
+          prop="gridIdList"
           label-width="150px"
           :class="{ 'form-item': source === 'visiual' }"
           style="display: block"
@@ -449,7 +449,7 @@ export default {
         policyId: "", //政策依据
         serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务方Id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@@ -482,7 +482,7 @@ export default {
         serviceTimeStart: [
           { required: true, message: "服务时间不能为空", trigger: "change" },
         ],
-        objList: [
+        gridIdList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
         resiSearchTagId: [
@@ -634,7 +634,9 @@ export default {
 
       if (code === 0) {
         this.formData = { ...data };
-        console.log(this.formData);
+        if(!data.noticeApproches){
+          this.formData.noticeApproches = [];
+        }
         this.scopeIdArray = data.gridIdList.map(i => i.objectId);
         this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
         this.handleChangeServiceTypeLevel1();
@@ -891,7 +893,7 @@ export default {
     },
 
     handleChangeScope(value) {
-      this.formData.objList = [];
+      this.formData.gridIdList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
       selArray.forEach((element) => {
@@ -900,7 +902,7 @@ export default {
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
-        this.formData.objList.push(obj);
+        this.formData.gridIdList.push(obj);
       });
     },
 
@@ -919,7 +921,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      this.formData.objList = await this.handleTreeList();
+      this.formData.gridIdList = await this.handleTreeList();
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -1008,7 +1010,7 @@ export default {
       this.formData = {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue
index 8743a16a8..495b8ba07 100644
--- a/src/views/modules/communityService/jinengzhaoren/addForm.vue
+++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue
@@ -175,7 +175,7 @@
         </el-form-item>
         <el-form-item
           label="服务范围"
-          prop="objList"
+          prop="gridIdList"
           label-width="150px"
           :class="{ 'form-item': source === 'visiual' }"
           style="display: block"
@@ -449,7 +449,7 @@ export default {
         policyId: "", //政策依据
         serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务方Id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@@ -483,7 +483,7 @@ export default {
         serviceTimeStart: [
           { required: true, message: "服务时间不能为空", trigger: "change" },
         ],
-        objList: [
+        gridIdList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
         resiSearchTagId: [
@@ -635,7 +635,9 @@ export default {
 
       if (code === 0) {
         this.formData = { ...data };
-        console.log(this.formData);
+        if(!data.noticeApproches){
+          this.formData.noticeApproches = [];
+        }
         this.scopeIdArray = data.gridIdList.map(i => i.objectId);
         this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
         this.handleChangeServiceTypeLevel1();
@@ -891,7 +893,7 @@ export default {
     },
 
     handleChangeScope(value) {
-      this.formData.objList = [];
+      this.formData.gridIdList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
       selArray.forEach((element) => {
@@ -900,7 +902,7 @@ export default {
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
-        this.formData.objList.push(obj);
+        this.formData.gridIdList.push(obj);
       });
     },
 
@@ -919,7 +921,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      this.formData.objList = await this.handleTreeList();
+      this.formData.gridIdList = await this.handleTreeList();
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -1008,7 +1010,7 @@ export default {
       this.formData = {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
index 7c7066c0b..9c90d611a 100644
--- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue
@@ -169,13 +169,13 @@
           style="display: block"
         >
           <el-checkbox-group v-model="formData.noticeApproches">
-            <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
-            <el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox>
+            <el-checkbox label="sms" >短信通知</el-checkbox>
+            <el-checkbox label="wx_official_account" >微信公众号消息通知</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item
           label="服务范围"
-          prop="objList"
+          prop="gridIdList"
           label-width="150px"
           :class="{ 'form-item': source === 'visiual' }"
           style="display: block"
@@ -449,7 +449,7 @@ export default {
         policyId: "", //政策依据
         serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务方Id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@@ -483,7 +483,7 @@ export default {
         serviceTimeStart: [
           { required: true, message: "服务时间不能为空", trigger: "change" },
         ],
-        objList: [
+        gridIdList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
         resiSearchTagId: [
@@ -586,7 +586,7 @@ export default {
     if (this.formType === "add") {
       this.$refs.ref_form.resetFields();
     } else if (this.formType == "edit") {
-      this.loadInfo();
+      await this.loadInfo();
     }
 
     await this.iniDefaultData();
@@ -635,14 +635,15 @@ export default {
 
       if (code === 0) {
         this.formData = { ...data };
-        console.log(this.formData);
+        if(!data.noticeApproches){
+          this.formData.noticeApproches = [];
+        }
         this.scopeIdArray = data.gridIdList.map(i => i.objectId);
         this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
         this.handleChangeServiceTypeLevel1();
         this.formData.serviceTypeLevel2Id = data.serviceTypeLevel2Id;
         this.feedbackFormData = { ...data.feedback };
         await this.getServiceuserList(data.serviceOrgType);
-
         await this.getTagName();
         // this.fileList = []
         // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
@@ -772,7 +773,6 @@ export default {
     },
     async iniDefaultData() {
       const { defaultData } = this;
-      console.log("iniDefaultData3", defaultData);
       if (defaultData) {
         const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
         if (serviceOrgType) {
@@ -784,8 +784,8 @@ export default {
         }
         if (scopeIdArray) {
           this.scopeIdArray = scopeIdArray;
-          await nextTick();
-          this.handleChangeScope();
+          // await nextTick();
+          // this.handleChangeScope();
         }
       }
     },
@@ -891,16 +891,15 @@ export default {
     },
 
     handleChangeScope(value) {
-      this.formData.objList = [];
+      this.formData.gridIdList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
-      console.log("handleChangeScope", selArray);
       selArray.forEach((element) => {
         let obj = {
           objectType: element.data.objectType,
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
-        this.formData.objList.push(obj);
+        this.formData.gridIdList.push(obj);
       });
     },
 
@@ -919,7 +918,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      this.formData.objList = await this.handleTreeList();
+      this.formData.gridIdList = await this.handleTreeList();
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -1008,7 +1007,7 @@ export default {
       this.formData = {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
-        objList: [], //
+        gridIdList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
         serviceTimeStart: "", //服务起始时间yyyy-MM-dd