设备增加搜索条件

src/views/inventory/DeviceInspectMyTake.vue

@@ -3,13 +3,46 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="140px" v-show="showSearch">
         <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true"
+                         @change="deptChange"
+                         style="width: 90%"
+              >
+                <el-option
+                    v-for="item in deptList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                    v-for="item in invList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="任务编号:">
               <el-input v-model="filterQuery.orderId" placeholder="请输入任务编号" style="width: 90%"
                         clearable></el-input>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="资产编码:">
               <el-input v-model="filterQuery.code" placeholder="请输入资产编码" style="width: 90%"
@@ -25,8 +58,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="任务状态:" class="query-form-item">
               <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
@@ -35,6 +66,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="预计结束时间:">
               <el-date-picker
@@ -51,8 +84,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -70,6 +103,8 @@
                 highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="任务编号" prop="orderId"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="资产编码" prop="code"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></el-table-column>
         <el-table-column label="任务类型" prop="repairType">

src/views/inventory/DeviceInspectPlanNew.vue

@@ -112,8 +112,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="计划单号" prop="orderId"></el-table-column>
-<!--        <el-table-column label="部门" prop="deptName"></el-table-column>-->
-<!--        <el-table-column label="仓库" prop="invName"></el-table-column>-->
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></el-table-column>
         <el-table-column label="资产编码" prop="code"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh"></el-table-column>

src/views/inventory/DeviceInspectTake.vue

@@ -3,38 +3,38 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="140px" v-show="showSearch">
         <el-row>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="部门:">-->
-<!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true"-->
-<!--                         @change="deptChange"-->
-<!--                         style="width: 90%"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in deptList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true"
+                         @change="deptChange"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="8">
             <el-form-item class="query-form-item" label="任务单号:">
@@ -42,6 +42,8 @@
                         clearable></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="资产编码:">
               <el-input v-model="filterQuery.code" placeholder="请输入资产编码" style="width: 90%"
@@ -57,8 +59,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="预计结束时间:">
               <el-date-picker
@@ -75,6 +75,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="开始时间:">
               <el-date-picker
@@ -107,8 +109,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="任务类型:" class="query-form-item">
               <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择任务类型" clearable>
@@ -119,6 +119,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -134,6 +135,9 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail"   highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="任务编号" prop="orderId"></el-table-column>
+
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="资产编码" prop="code"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></el-table-column>
         <el-table-column label="任务类型" prop="repairType">