异常原因归还修复

src/views/mes/material/Exception/index.vue

@@ -38,7 +38,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="领取时间">
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.material_exception_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="异常发生时间">
         <el-date-picker
           style="width: 215px"
           :default-time="['00:00:00', '23:59:59']"
@@ -53,15 +63,21 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.material_exception_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+
+      <el-form-item label="异常解除时间">
+        <el-date-picker
+          style="width: 215px"
+          :default-time="['00:00:00', '23:59:59']"
+          v-model="handleTime"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right"
+          @change="handleClearTime2"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -89,16 +105,10 @@
       :data="ExceptionList"
 
     >
-
       <el-table-column label="编号" align="center" prop="exceptionId">
       </el-table-column>
-      <el-table-column label="物资所属柜" align="center" prop="loanFromName" />
-      <el-table-column
-        label="领取时间"
-        align="center"
-        prop="loanTime"
-      >
-      </el-table-column>
+      <el-table-column label="物资柜" align="center" prop="loanFromName" />
+
       <el-table-column label="物资名称" align="center" prop="materialsName">
       </el-table-column>
       <el-table-column label="归还柜" align="center" prop="restitutionToName">
@@ -110,7 +120,13 @@
           <dict-tag :options="dict.type.material_exception_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="实际归还时间" align="center" prop="actualRestitutionTime">
+      <el-table-column
+        label="异常发生时间"
+        align="center"
+        prop="occurTime"
+      >
+      </el-table-column>
+      <el-table-column label="异常解除时间" align="center" prop="handleTime">
       </el-table-column>
     </el-table>
     <pagination
@@ -162,6 +178,7 @@ export default {
       open: false,
       // 查询参数
       createTime: '',
+      handleTime:'',
       queryParams: {
         current: 1,
         size: 10,
@@ -171,6 +188,8 @@ export default {
         status:'',
         startTime:'',
         endTime:'',
+        handleStartTime:"",
+        handleEndTime:'',
       },
       title:'',
       // 表单参数
@@ -234,6 +253,10 @@ export default {
         this.queryParams.startTime = this.formatDate(this.createTime[0])
         this.queryParams.endTime = this.formatDate(this.createTime[1])
       }
+      if(Array.isArray(this.handleTime) && this.handleTime.length === 2) {
+        this.queryParams.handleStartTime=this.formatDate(this.handleTime[0])
+        this.queryParams.handleEndTime=this.formatDate(this.handleTime[1])
+      }
       const data={
         ...this.queryParams,
       }
@@ -279,6 +302,9 @@ export default {
       this.queryParams.startTime = ''
       this.queryParams.endTime = ''
       this.createTime = ''
+      this.handleTime = ''
+      this.queryParams.handleStartTime = ''
+      this.queryParams.handleEndTime = ''
       this.resetForm('queryForm')
       this.handleQuery()
     },
@@ -288,6 +314,12 @@ export default {
         this.queryParams.endTime=null
       }
     },
+    handleClearTime2(value){
+      if(value==null){
+        this.queryParams.handleStartTime=null
+        this.queryParams.handleEndTime=null
+      }
+    },
 
 
 

src/views/mes/material/Lending/demo3.vue

@@ -131,7 +131,7 @@ export default {
         // materialsCabinetId: '0',
       }
       return listMaterials(data).then((res) => {
-        this.listOutOfCabinet = res.data.records;
+        this.listOutOfCabinet = res.data.records.filter((item) => {return item.materialsCabinetId == null || item.materialsCabinetId == '0'});
         console.log(this.listOutOfCabinet,'柜子外的数据demo3')
       })
     },

src/views/mes/material/lockers/index.vue

@@ -126,6 +126,7 @@
                 v-model="queryParams.cabinetId"
                 placeholder="请输入物资柜编号"
                 clearable
+                oninput="value=value.replace(/[^\d.]/g,'')"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -137,16 +138,16 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="物资柜状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="物资柜状态">
-                <el-option
-                  v-for="dict in dict.type.cabinet_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="物资柜状态" prop="status">-->
+<!--              <el-select v-model="queryParams.status" placeholder="物资柜状态">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.cabinet_status"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button
                 v-no-more-click
@@ -221,7 +222,14 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="异常原因" prop="cabinetName" width="100" />
+          <el-table-column label="异常原因" prop="exReason" width="100" >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.exception_reason"
+                :value="scope.row.exReason"
+              />
+            </template>
+          </el-table-column>
           <el-table-column label="物资柜详情" align="center">
             <template slot-scope="scope">
               <el-button
@@ -362,7 +370,7 @@ export default {
   components: {
     Treeselect,
   },
-  dicts: ["material_status", "cabinet_status"],
+  dicts: ["material_status", "cabinet_status",'exception_reason'],
   data() {
     return {
       //自动生成编码