增加上级单位查询。

src/views/base/companyInfo-detail.vue

@@ -134,7 +134,7 @@ import Constant from "@/constant";
 import companyInfoApi from "@/api/base/companyInfo";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import { getToken } from "@/utils/auth"; // get token from cookie
-
+ 
 export default {
   props: ["businessKey", "title"],
   data() {
@@ -158,7 +158,7 @@ export default {
       headers: {
         Authorization: getToken()
       },
-      companyResult: "",
+      companyResult: [],
       typeData: []
     };
   },

src/views/base/companyInfo-list.vue

@@ -17,6 +17,23 @@
       <el-form-item label="单位名称" prop="name">
         <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
       </el-form-item>
+      <el-form-item label="上级单位" prop="parentId">
+        <el-select
+          size="mini"
+          v-model="queryModel.parentId"
+          filterable
+          placeholder="请选择"
+          style="width:280px"
+        >
+          <el-option
+            v-for="company in companyResult"
+            :key="company.id"
+            :label="company.name"
+            :value="company.id"
+          ></el-option>
+        </el-select>&nbsp;
+        <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -137,7 +154,9 @@ export default {
     var self = this;
     return {
       queryModel: {
-        name: ""
+        name: "",
+        parentId: "",
+        subordinate: false
       },
       loading: false,
       tableData: [],
@@ -155,11 +174,19 @@ export default {
       tableHeight: "",
       showDeviceModal: false,
       companyId: "",
-      qrCode: ""
+      qrCode: "",
+      companyResult: []
     };
   },
   created() {
-    this.tableHeight = window.innerHeight - 280;
+    var self = this;
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
   },
   methods: {
     changePage(pageIndex) {
@@ -174,6 +201,8 @@ export default {
       formData.append("pageSize", self.pageSize);
 
       formData.append("name", self.queryModel.name);
+      formData.append("parentId", self.queryModel.parentId);
+      formData.append("subordinate", self.queryModel.subordinate);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -193,6 +222,8 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          self.tableHeight = window.innerHeight - 280;
         })
         .catch(error => {
           self.loading = false;