人员导入修改。

src/views/base/personInfo-list.vue

@@ -568,17 +568,31 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <!-- <el-form-item label="单位">
+        <el-form-item label="单位">
           <el-select-tree
-            size="mini"
+            size="large"
             :props="props"
             :options="companyResult"
-            v-model="uploadCompanyId"
-            @input="changeUploadCompayId($event)"
+            v-model="uploadXlsData.companyId"
             height="200"
-          ></el-select-tree
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="用户身份" prop="personRoleId">
+          <el-select
+            filterable
+            placeholder="请选择"
+            style="width: 300px;"
+            v-model="uploadXlsData.personRoleId"
           >
-        </el-form-item> -->
+            <el-option
+              v-for="role in personRoleResult"
+              :key="role.personRoleName"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>        
         <el-form-item label="上传文件">
           <el-upload
             class="upload-demo"
@@ -675,9 +689,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeBatchUnBoundDevice">关 闭</el-button>
-        <el-button type="primary" @click="handleBatchUnBoundDevice"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="handleBatchUnBoundDevice">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 批量解绑设备end -->
@@ -708,6 +720,7 @@ import PersonPopedomList from "./personPopedom-list";
 
 import personInfoApi from "@/api/base/personInfo";
 import companyInfoApi from "@/api/base/companyInfo";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
 import companyPositionApi from "@/api/base/companyPosition";
 import deviceInfoApi from "@/api/base/deviceInfo";
 import personDeviceRelationApi from "@/api/base/personDeviceRelation";
@@ -756,14 +769,15 @@ export default {
       modalTitle: "",
       businessKey: "",
       companyResult: [],
-      uploadCompanyId: "",
       batchImportVisible: false,
       batchImportFileList: [],
       uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
       uploadXlsData: {
         subFolder: "company",
         companyId: "",
+        personRoleId: ""
       },
+      personRoleResult: [],
       headers: {
         Authorization: getToken(),
       },
@@ -804,6 +818,26 @@ export default {
       showRoleModal: false,
     };
   },
+  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;
+              }
+          })
+        }
+    }
+  },
   created() {
     var self = this;
 
@@ -1052,10 +1086,6 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
-    changeUploadCompayId(value) {
-      var self = this;
-      self.uploadXlsData.companyId = value;
-    },
     bindDevice(record) {
       //绑定设备
       this.personId = record.id;
@@ -1070,17 +1100,19 @@ export default {
     beforeUpload(file, fileList) {
       //导入前判断
       var self = this;
-      // if (self.uploadCompanyId == null || self.uploadCompanyId == "") {
-      //   self.$message({
-      //     type: "warning",
-      //     message: "请选择单位",
-      //   });
-      //   self.xlsLoading = false;
-      //   return false;
-      // } else {
-      self.xlsLoading = true;
-      //return true;
-      //}
+      var companyId = self.uploadXlsData.companyId;
+
+      if (companyId==null || companyId.length==0) {
+        self.$message({
+          type: "warning",
+          message: "请选择单位!",
+        });
+        self.xlsLoading = false;
+        return false;
+      } else {
+        self.xlsLoading = true;
+        return true;
+      }
     },
     //批量导入-上传成功
     handleBatchImportSuccess(response, file, fileList) {
@@ -1090,15 +1122,12 @@ export default {
         self.$message.success(response.message);
         this.batchImportFileList = [];
         this.changePage(1);
-        this.uploadCompanyId = "";
-        this.uploadXlsData.companyId = "";
+
         this.batchImportVisible = false;
       } else {
         //this.$message.error(response.message);
         this.batchImportFileList = [];
         this.changePage(1);
-        this.uploadCompanyId = "";
-        this.uploadXlsData.companyId = "";
 
         if (response.data != null) {
           //下载有错误信息提示的报表