单位添加查询条件

src/views/base/companyInfo-list.vue

@@ -62,6 +62,23 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="queryModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 110px"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
       <!-- <el-form-item label="服务场景" prop="type">
         <el-select
           v-model="queryModel.type"
@@ -150,6 +167,11 @@
         label="全称"
         width="120"
       ></el-table-column>
+      <el-table-column
+        prop="unitTypeName"
+        label="单位性质"
+        width="120"
+      ></el-table-column>
       <el-table-column
         prop="sceneName"
         label="场景值"
@@ -310,6 +332,7 @@ import Constant from "@/constant";
 import companyInfoDetail from "./companyInfo-detail";
 import companyDeviceRelationList from "./companyDeviceRelation-list";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import sceneInfoApi from "@/api/base/sceneInfo";
 import SelectTree from "@/components/SelectTree";
 import QRCode from "qrcodejs2";
@@ -330,6 +353,7 @@ export default {
         subordinate: false,
         sceneId: "",
         type: "",
+        unitType:""
       },
       loading: false,
       tableData: [],
@@ -368,6 +392,7 @@ export default {
       },
       xlsLoading: false,
       sceneData: [],
+      typeData:[]
     };
   },
   created() {
@@ -385,6 +410,13 @@ export default {
       }
     });
 
+    var formData = new FormData();
+    formData.append("catalogName", "单位性质");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
+
     this.changePage(1);
     this.loadTree();
   },
@@ -446,6 +478,8 @@ export default {
         formData.append("sceneId", self.queryModel.sceneId);
       }
 
+      formData.append("unitType", self.queryModel.unitType);
+
       // if (self.queryModel.type != null) {
       //   formData.append("type", self.queryModel.type);
       // }