Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang

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);
         }
     },
 

src/views/modules/communityService/policy/addPolicy.vue

@@ -158,7 +158,7 @@
         >
         <el-switch
           v-model="value"
-  active-color="#409EFF"
+          active-color="#0056d6"
           inactive-color="#ff4949">
         </el-switch>
       </el-form-item>
@@ -769,6 +769,11 @@ export default {
       } else {
         url = "/governance/policy/updatePolicy";
         this.formData.policyId = this.policyId;
+        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
+        }
       }
     
       if (this.formType == "copy" && this.formData.assignFlag == 0) {
@@ -795,7 +800,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) {