资产信息和资产位置添加所属公司和部门过滤功能

ruoyi-ui/src/views/asset/information/index.vue

@@ -51,22 +51,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="使用部门" prop="userDepartment">
-        <el-input
-          v-model="queryParams.userDepartment"
-          placeholder="请输入使用部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="使用部门" prop="userDepartment">
+        <div style="display:inline-block; width: 183px;">
+          <treeselect
+                v-model="queryParams.userDepartment"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择使用部门"
+              />
+        </div>
       </el-form-item>
       <el-form-item label="管理部门" prop="department">
-        <el-input
-          v-model="queryParams.department"
-          placeholder="请输入管理部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+        <div style="display:inline-block; width: 183px;">
+          <treeselect
+                v-model="queryParams.department"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择管理部门"
+              />
+        </div>
+      </el-form-item>
       <el-form-item label="责任人" prop="responsiblePerson">
         <el-input
           v-model="queryParams.responsiblePerson"
@@ -102,21 +106,21 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="启用日期" prop="commissioningDate">
-        <el-date-picker clearable
+          <el-date-picker clearable
           v-model="queryParams.commissioningDate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择启用日期">
-        </el-date-picker>
+          </el-date-picker>  
       </el-form-item>
-      <!-- <el-form-item label="原值" prop="originalValue">
+      <el-form-item label="原值" prop="originalValue">
         <el-input
           v-model="queryParams.originalValue"
           placeholder="请输入原值"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="使用年限" prop="durableYears">
         <el-input
           v-model="queryParams.durableYears"
@@ -125,30 +129,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="净值" prop="netValue">
+      <el-form-item label="净值" prop="netValue">
         <el-input
           v-model="queryParams.netValue"
           placeholder="请输入净值"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="残值" prop="residualValue">
+      </el-form-item>
+      <el-form-item label="残值" prop="residualValue">
         <el-input
           v-model="queryParams.residualValue"
           placeholder="请输入残值"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="累计折旧" prop="accumulatedDepreciation">
+      </el-form-item>
+      <el-form-item label="累计折旧" prop="accumulatedDepreciation">
         <el-input
           v-model="queryParams.accumulatedDepreciation"
           placeholder="请输入累计折旧"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="最近折旧日期" prop="lastDepreciationDate">
         <el-date-picker clearable
           v-model="queryParams.lastDepreciationDate"
@@ -205,30 +209,32 @@
           placeholder="请选择维保到期日期">
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="维修电话" prop="maintenanceTel">
+      <el-form-item label="维修电话" prop="maintenanceTel">
         <el-input
           v-model="queryParams.maintenanceTel"
           placeholder="请输入维修电话"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="维修人员" prop="maintenanceUser">
+      </el-form-item>
+      <el-form-item label="维修人员" prop="maintenanceUser">
         <el-input
           v-model="queryParams.maintenanceUser"
           placeholder="请输入维修人员"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <!-- <el-form-item label="所属公司" prop="corporation">
-        <el-input
-          v-model="queryParams.corporation"
-          placeholder="请输入所属公司"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item label="所属公司" prop="corporation">
+        <div style="display:inline-block; width: 183px;">
+          <treeselect
+                v-model="queryParams.corporation"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择所属公司"
+              />
+        </div>
+      </el-form-item>
       <el-form-item label="记录状态" prop="recordStatus">
         <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
           <el-option

ruoyi-ui/src/views/asset/location/index.vue

@@ -7,14 +7,16 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="所属公司" prop="company">
-              <treeselect
-                v-model="form.company"
+      <el-form-item label="所属公司" prop="company">
+        <div style="display:inline-block; width: 250px;">
+          <treeselect
+                v-model="queryParams.company"
                 :options="deptOptions"
                 :normalizer="normalizer"
                 placeholder="选择所属公司"
               />
-      </el-form-item> -->
+        </div>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -273,3 +275,9 @@ export default {
   },
 }
 </script>
+
+<style>
+.a{
+  
+}
+</style>