Merge branch 'bug_mk' into dev

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);
+        this.$message.error(error);
-        console.log(msg);
+        console.log(error);
         }
     },