修改

src/views/base/personInfo-list.vue

@@ -662,7 +662,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
+        <!-- <el-form-item label="单位">
           <el-select-tree
             size="large"
             :props="props"
@@ -671,7 +671,7 @@
             height="200"
             width="300px"
           ></el-select-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="用户身份" prop="personRoleId">
           <el-select
             filterable
@@ -876,7 +876,7 @@ export default {
       uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
       uploadXlsData: {
         subFolder: "company",
-        companyId: "",
+        // companyId: "",
         personRoleId: ""
       },
       personRoleResult: [],
@@ -924,24 +924,24 @@ export default {
     };
   },
   watch: {
-    "uploadXlsData.companyId":function(newVal,oldVal){
-        var self = this;
-
-        if(newVal!=null){
-          var formData = new FormData();
-          formData.append("companyId", newVal);
-
-          //查询单位下角色
-          personRoleInfoApi.listByCompanyId(formData)
-          .then(response=>{
-              var jsonData = response.data;
-
-              if (jsonData.result) {
-                self.personRoleResult = jsonData.data;
-              }
-          })
-        }
-    },
+    // "uploadXlsData.companyId":function(newVal,oldVal){
+    //     var self = this;
+
+    //     if(newVal!=null){
+    //       var formData = new FormData();
+    //       formData.append("companyId", newVal);
+
+    //       //查询单位下角色
+    //       personRoleInfoApi.listByCompanyId(formData)
+    //       .then(response=>{
+    //           var jsonData = response.data;
+
+    //           if (jsonData.result) {
+    //             self.personRoleResult = jsonData.data;
+    //           }
+    //       })
+    //     }
+    // },
     "queryModel.parentId": function (val, oldval) {
       if (val != null && val != "") {
         var self = this;
@@ -1015,6 +1015,19 @@ export default {
       }
     });
 
+    var formData5 = new FormData();
+    formData5.append("sceneId", "1");
+
+    //查询单位下角色
+    personRoleInfoApi.findBySceneId(formData5)
+    .then(response=>{
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.personRoleResult = jsonData.data;
+        }
+    })
+
     this.loadTree();
   },
   methods: {
@@ -1240,12 +1253,12 @@ export default {
     beforeUpload(file, fileList) {
       //导入前判断
       var self = this;
-      var companyId = self.uploadXlsData.companyId;
+      var personRoleId = self.uploadXlsData.personRoleId;
 
-      if (companyId==null || companyId.length==0) {
+      if (personRoleId==null || personRoleId.length==0) {
         self.$message({
           type: "warning",
-          message: "请选择单位!",
+          message: "请选择用户身份!",
         });
         self.xlsLoading = false;
         return false;

src/views/base/workPersonScheduling-change.vue

@@ -48,6 +48,7 @@
             <el-form-item label="员工" prop="personId">
               <el-select
                 filterable
+                multiple
                 v-model="queryModel.personId"
                 clearable
                 size="mini"