.env.development

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

src/views/sys/user-detail.vue

@@ -28,7 +28,7 @@
             style="width:300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属单位" prop="companyId">
+        <el-form-item label="企业" prop="companyId">
           <!-- <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
             <el-option
               v-for="company in companyResult"
@@ -37,12 +37,26 @@
               :value="company.id"
             ></el-option>
           </el-select> -->
-          <el-select-tree
+          <!-- <el-select-tree
           size="mediumn"
           :options="companyResult"
           v-model="formModel.companyId"
           width="300px"
-        ></el-select-tree>
+        ></el-select-tree> -->
+        <el-select
+                v-model="formModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width: 250px"
+                :filter-method="filterMethod"
+              >
+                <el-option
+                  v-for="result in companyInfoResult"
+                  :key="result.id"
+                  :label="result.companyName"
+                  :value="result.id"
+                ></el-option>
+              </el-select>
         </el-form-item>
         <el-form-item label="分配角色" prop="roles">
           <el-select
@@ -74,6 +88,7 @@
 import Constant from "@/constant";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
+import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 
 export default {
@@ -102,7 +117,8 @@ export default {
       formModel: {},
       showDialog: true,
       loading: false,
-      submitting: false
+      submitting: false,
+      companyInfoResult:[]
     };
   },
   methods: {
@@ -143,7 +159,20 @@ export default {
           });
         }
       });
-    }
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoResult = jsonData.data;
+        }
+      });
+    },
   },
   async mounted() {
     var self = this;
@@ -169,6 +198,20 @@ export default {
         if (jsonData.result) {
           self.formModel = jsonData.data;
           self.showModal = true;
+
+          let companyId = self.formModel.companyId;
+          if (companyId != null) {
+            var formData = new FormData();
+            formData.append("pageSize", 5);
+            formData.append("companyId", companyId);
+
+            companyInfoApi.list(formData).then(function (response) {
+              var jsonData = response.data;
+              if (jsonData.result) {
+                self.companyInfoResult = jsonData.data;
+              }
+            });
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }
@@ -179,9 +222,6 @@ export default {
         self.$message.error(error + "");
         self.loading = false;
       });
-  },
-  components: {
-    "el-select-tree": SelectTree
   }
 };
 </script>

src/views/sys/user-list.vue

@@ -35,13 +35,21 @@
             :value="company.id"
           ></el-option>
         </el-select> -->
-        <el-select-tree
-          size="mini"
-          :props="props"
-          :options="companyResult"
-          v-model="queryModel.companyId"
-          height="200"
-        ></el-select-tree>
+        <el-select
+                v-model="queryModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width: 250px"
+                :filter-method="filterMethod"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in companyInfoResult"
+                  :key="result.id"
+                  :label="result.companyName"
+                  :value="result.id"
+                ></el-option>
+              </el-select>
       </el-form-item>
       <el-form-item label="角色" prop="roleId">
         <el-select
@@ -180,6 +188,7 @@ import Constant from "@/constant";
 import UserDetail from "./user-detail";
 import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
+import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -219,6 +228,7 @@ export default {
         label: "name",
         children: "children"
       },
+      companyInfoResult:[]
     };
   },
   methods: {
@@ -388,7 +398,20 @@ export default {
           });
         }
       });
-    }
+    },
+    filterMethod(query, item) {
+      var self = this;
+      var formData = new FormData();
+      formData.append("pageSize", 5);
+      formData.append("companyName", query);
+
+      companyInfoApi.list(formData).then(function (response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          self.companyInfoResult = jsonData.data;
+        }
+      });
+    },
   },
   mounted: function() {
     var self = this;
@@ -410,7 +433,7 @@ export default {
   },
   components: {
     "user-detail": UserDetail,
-    "el-select-tree": SelectTree,
+    // "el-select-tree": SelectTree,
   }
 };
 </script>