用户角色管理及导入

src/views/base/personInfo-list.vue

@@ -616,21 +616,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
-          <!-- <el-select
-            v-model="uploadCompanyId"
-            filterable
-            placeholder="请选择"
-            @change="changeUploadCompayId"
-            style="width: 280px"
-          >
-            <el-option
-              v-for="company in companyResult"
-              :key="company.id"
-              :label="company.name"
-              :value="company.id"
-            ></el-option>
-          </el-select> -->
+        <!-- <el-form-item label="单位">
           <el-select-tree
             size="mini"
             :props="props"
@@ -640,7 +626,7 @@
             height="200"
           ></el-select-tree
           >
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="上传文件">
           <el-upload
             class="upload-demo"
@@ -1129,17 +1115,17 @@ 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 {
+      // if (self.uploadCompanyId == null || self.uploadCompanyId == "") {
+      //   self.$message({
+      //     type: "warning",
+      //     message: "请选择单位",
+      //   });
+      //   self.xlsLoading = false;
+      //   return false;
+      // } else {
         self.xlsLoading = true;
-        return true;
-      }
+        //return true;
+      //}
     },
     //批量导入-上传成功
     handleBatchImportSuccess(response, file, fileList) {

src/views/base/personPopedom-detail.vue

@@ -51,7 +51,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="展示的图标" prop="showIconId">
+        <!-- <el-form-item label="展示的图标" prop="showIconId">
           <el-select
             v-model="formModel.showIconId"
             filterable
@@ -66,7 +66,7 @@
               :value="icon.iconId"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注信息" prop="remark">
           <el-input
             v-model="formModel.remark"
@@ -93,6 +93,7 @@ import deviceInfoApi from "@/api/base/deviceInfo";
 import companyStructureInfoApi from "@/api/base/companyStructureInfo";
 import iconInfoApi from "@/api/base/iconInfo";
 import SelectTree from "@/components/SelectTree";
+import { Breadcrumb } from "element-ui";
 
 export default {
   components: {
@@ -180,23 +181,23 @@ export default {
         });
       }
     },
-    "formModel.personRoleId": function (val, oldval) {
-      if (val != null && val != "") {
-        var self = this;
-        self.formModel.showIconId = "";
-        var formData = new FormData();
-        formData.append("roleId", val);
+    // "formModel.personRoleId": function (val, oldval) {
+    //   if (val != null && val != "") {
+    //     var self = this;
+    //     self.formModel.showIconId = "";
+    //     var formData = new FormData();
+    //     formData.append("roleId", val);
 
-        iconInfoApi.listByRoleId(formData).then(function (response) {
-          var jsonData = response.data;
-          if (jsonData.result) {
-            if (jsonData.data != null && jsonData.data != "") {
-              self.iconResult = jsonData.data;
-            }
-          }
-        });
-      }
-    },
+    //     iconInfoApi.listByRoleId(formData).then(function (response) {
+    //       var jsonData = response.data;
+    //       if (jsonData.result) {
+    //         if (jsonData.data != null && jsonData.data != "") {
+    //           self.iconResult = jsonData.data;
+    //         }
+    //       }
+    //     });
+    //   }
+    // },
   },
   methods: {
     closeDialog() {
@@ -205,46 +206,58 @@ export default {
     handleSubmit() {
       var self = this;
       self.formModel.personId = self.personId;
+      // if (
+      //   self.formModel.showIconId != null &&
+      //   self.formModel.showIconId != ""
+      // ) {
+      //   var showIconId = self.formModel.showIconId.join(",");
+      //   self.formModel.showIconId = showIconId;
+      // } else {
+      //   self.formModel.showIconId = "";
+      // }
+
       if (
-        self.formModel.showIconId != null &&
-        self.formModel.showIconId != ""
+        self.formModel.companyStructureId != null &&
+        self.formModel.companyStructureId == "0"
       ) {
-        var showIconId = self.formModel.showIconId.join(",");
-        self.formModel.showIconId = showIconId;
+        self.$message({
+          message: "请选择下级机构",
+          type: "warning",
+        });
+        self.formModel.companyStructureId == null;
       } else {
-        self.formModel.showIconId = "";
-      }
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return personPopedomApi.add(self.formModel);
-            } else {
-              return personPopedomApi.update(self.formModel);
-            }
-          })().then(function (response) {
-            var jsonData = response.data;
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            (function () {
+              var id = self.formModel.id;
 
-            if (jsonData.result) {
-              self.$message({
-                message: "保存成功!",
-                type: "success",
-              });
+              if (id == null || id.length == 0) {
+                return personPopedomApi.add(self.formModel);
+              } else {
+                return personPopedomApi.update(self.formModel);
+              }
+            })().then(function (response) {
+              var jsonData = response.data;
 
-              self.$emit("close", true);
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning",
-              });
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success",
+                });
 
-              self.$emit("close", false);
-            }
-          });
-        }
-      });
+                self.$emit("close", true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning",
+                });
+                self.formModel.companyStructureId == null;
+                self.$emit("close", false);
+              }
+            });
+          }
+        });
+      }
     },
   },
   mounted: function () {

src/views/base/personPopedom-list.vue

@@ -43,27 +43,27 @@
         <el-table-column
           prop="companyName"
           label="公司"
-          width="180"
+          width="200"
         ></el-table-column>
         <el-table-column
-          prop="departmentName"
+          prop="companyStructureName"
           label="部门"
-          width="180"
+          width="120"
         ></el-table-column>
         <el-table-column
           prop="roleName"
           label="角色"
           width="150"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="showIconId"
           label="图标信息"
           width="150"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="remark"
           label="备注信息"
-          width="150"
+          width="120"
         ></el-table-column>
         <el-table-column prop="useEnable" label="默认" width="180">
           <template slot-scope="{ row }">