修改入库模块查询条件

src/views/device/storage/batchWarehousing.vue

@@ -3,7 +3,7 @@
     <h1><i class="el-icon-arrow-left" @click="goBack"></i>批次入库</h1>
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="handleFilter()">
 			<el-form-item label="批次号">
-				<el-input v-model="listQuery.type" placeholder="请输入设备SN" clearable></el-input>
+				<el-input v-model="listQuery.batchNum" placeholder="请输入批次号" clearable></el-input>
 			</el-form-item>
 
 			<div style="float: right;">
@@ -112,9 +112,9 @@ export default {
         index: 1,
         length: 20,
         importance: undefined,
-        sn: '',
         type: undefined,
-        sort: '+id'
+        sort: '',
+        batchNum: ''
       },
     }
   },
@@ -132,6 +132,18 @@ export default {
       this.listQuery.index = 1
       this.getDataList()
     },
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        importance: undefined,
+        type: undefined,
+        sort: '',
+        batchNum: ''
+      }
+      this.getDataList()
+    },
     /**请求列表数据 */
     getDataList() {
       this.loading = true

src/views/device/storage/index.vue

@@ -14,18 +14,11 @@
 				</el-col>
 				<el-col :span="5">
           <el-form-item label="自检">
-            <el-select v-model="listQuery.status">
+            <el-select v-model="listQuery.checkStatus">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>  
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :span="6">
-					<el-form-item label="状态">
-            <el-select v-model="listQuery.status">
-              <el-option v-for="item in statusOptins" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            </el-select>  
-					</el-form-item>
-				</el-col> -->
         <el-col :span="9">
           <el-form-item label="入库时间">
 						<el-date-picker
@@ -117,8 +110,8 @@
 
       <el-table-column align="center" label="操作" width="180">
         <template slot-scope="scope">
-          <el-button @click="edit(scope.row.id)" type="text">已通过</el-button>
-          <el-button @click="edit(scope.row.id)" type="text">未通过</el-button>
+          <el-button v-if="scope.row.checkStatus === 1" @click="edit(scope.row.id)" type="text">已通过</el-button>
+          <el-button v-if="scope.row.checkStatus === 0" @click="edit(scope.row.id)" type="text">未通过</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -151,6 +144,7 @@ export default {
         sn: '',
         status: [1],
         sort: 'id desc',
+        checkStatus: null
       },
       //总条数
       total: 0,
@@ -166,7 +160,7 @@ export default {
       options: [
         {label: '全部', value: null},
         {label: '已通过', value: 1},
-        {label: '未通过', value: 2}
+        {label: '未通过', value: 0}
       ]
     }
   },
@@ -179,6 +173,18 @@ export default {
       this.listQuery.index = 1
       this.getDataList()
     },
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        sn: '',
+        status: [1],
+        sort: 'id desc',
+        checkStatus: null
+      }
+      this.getDataList()
+    },
     /**请求列表数据 */
     getDataList() {
       this.loading = true