人员角色管理和公司信息管理修改

.env.development

@@ -1,8 +1,8 @@
 OUT_PUT_DIR=dist/jp-housekeeper-portal
 
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
-VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+#VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

src/views/base/companyInfo-detail.vue

@@ -134,7 +134,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="关联单位" prop="relationCompanyId">
+            <el-form-item label="关联物业公司" prop="relationCompanyId">
               <el-select-tree
                 :props="props"
                 :options="companyResult"

src/views/base/personPopedom-detail.vue

@@ -39,7 +39,11 @@
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="关联场景" prop="sceneId">
-          <el-select v-model="sceneId" filterable placeholder="请选择">
+          <el-select
+            v-model="formModel.sceneId"
+            filterable
+            placeholder="请选择"
+          >
             <el-option
               v-for="result in sceneData"
               :key="result.id"
@@ -48,7 +52,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="服务公司" prop="serviceCompanyId" v-if="sceneId == '4'">
+        <el-form-item
+          label="服务公司"
+          prop="serviceCompanyId"
+          v-if="sceneId == '4'"
+        >
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -128,6 +136,9 @@ export default {
         companyId: [
           { required: true, message: "对应公司不能为空", trigger: "blur" },
         ],
+        sceneId: [
+          { required: true, message: "关联场景值不能为空", trigger: "blur" },
+        ],
         personRoleId: [
           { required: true, message: "对应角色不能为空", trigger: "blur" },
         ],
@@ -154,7 +165,7 @@ export default {
       },
       sceneData: [],
       sceneId: "",
-      oldPersonRoleId:"",
+      oldPersonRoleId: "",
     };
   },
   created() {
@@ -188,12 +199,12 @@ export default {
     "formModel.companyId": function (val, oldval) {
       if (val != null && val != "") {
         var self = this;
-        if(self.oldPersonRoleId != ""){
-          self.formModel.personRoleId = self.oldPersonRoleId;
-        }else{
-          self.formModel.personRoleId = "";
-          self.oldPersonRoleId = "";
-        }
+        // if (self.oldPersonRoleId != "") {
+        //   self.formModel.personRoleId = self.oldPersonRoleId;
+        // } else {
+        //   self.formModel.personRoleId = "";
+        //   self.oldPersonRoleId = "";
+        // }
         var formData = new FormData();
         formData.append("companyId", val);
         personRoleInfoApi.listByCompanyId(formData).then(function (response) {
@@ -214,30 +225,31 @@ export default {
           }
         });
 
-        companyInfoApi.edit(val).then((response) => {
-          var jsonData = response.data;
-          if (jsonData.result) {
-            self.sceneId = jsonData.data.sceneId;
-          }
-        });
+        if (self.oldPersonRoleId == "") {
+          companyInfoApi.edit(val).then((response) => {
+            var jsonData = response.data;
+            if (jsonData.result) {
+              self.formModel.sceneId = jsonData.data.sceneId;
+            }
+          });
+        }
       }
     },
-    "sceneId": function (val, oldval) {
+    "formModel.sceneId": function (val, oldval) {
       if (val != null && val != "") {
         var self = this;
         var formData = new FormData();
         formData.append("sceneId", val);
-      
         personRoleInfoApi.findBySceneId(formData).then(function (response) {
           var jsonData = response.data;
           if (jsonData.result) {
             if (jsonData.data != null && jsonData.data != "") {
-              if(self.oldPersonRoleId != ""){
-                self.formModel.personRoleId = self.oldPersonRoleId;
-              }else{
-                self.formModel.personRoleId = "";
-                self.oldPersonRoleId = "";
-              }
+              // if (self.oldPersonRoleId != "") {
+              //   self.formModel.personRoleId = self.oldPersonRoleId;
+              // } else {
+              //   self.formModel.personRoleId = "";
+              //   self.oldPersonRoleId = "";
+              // }
               self.personRoleResult = jsonData.data;
             }
           }