1

src/views/template/outcomeWmsApply.vue

@@ -407,9 +407,9 @@
               {{ scope.row.location || '-' }}
             </template>
           </el-table-column>
-          <el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
+          <el-table-column label="保质期" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              {{ scope.row.lot || '-' }}
+              {{ formatCheBzq(scope.row.cheBzq) }}({{ scope.row.lot }})
             </template>
           </el-table-column>
           <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
@@ -688,6 +688,7 @@ export default {
         remarks: undefined,
         pn: undefined,
         qty: undefined,
+        dateRange: undefined,
         whId: this.warehouseList[0].dictValue,
         ptype: '2',
         dealStatus: '0',
@@ -700,6 +701,7 @@ export default {
         qty2: undefined,
         qty3: undefined,
         qty4: undefined,
+        dateRange: undefined,
         whId: this.warehouseList[0].dictValue,
         ptype: '2',
         dealStatus: '0',
@@ -728,6 +730,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = []
       this.queryParams = {
         page: 1,
         rows: 10,
@@ -737,7 +740,8 @@ export default {
         ptype: undefined,
         dealStatus: undefined,
         sureStatus: undefined,
-        flag: ''
+        flag: '',
+        dateRange: undefined
       }
       this.handleQuery()
     },
@@ -947,7 +951,9 @@ export default {
         }
       })
     },
-
+    formatCheBzq(date) {
+      return date ? date.split(' ')[0] : ''
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.businessId