模拟修复

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

@@ -126,7 +126,8 @@ export default {
         loanState: '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,'柜子外的数据demo2')
       });
     },
     // 初始化Konva舞台

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

@@ -127,10 +127,12 @@ export default {
       const data = {
         current: 1,
         size: -1,
-        materialsCabinetId: '0'
+        loanState:'0'
+        // materialsCabinetId: '0',
       }
       return listMaterials(data).then((res) => {
-        this.listOutOfCabinet = res.data.records
+        this.listOutOfCabinet = res.data.records;
+        console.log(this.listOutOfCabinet,'柜子外的数据demo3')
       })
     },
     // 初始化Konva舞台

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

@@ -172,8 +172,8 @@ export default {
       // 解析 value 对应的 status 和 reason
       const mapping = {
         1: { status: 0, reason: 0 }, // 正常
-        2: { status: 1, reason: 1 }, // 过期
-        3: { status: 1, reason: 2 }, // 损坏
+        2: { status: 1, reason: 2 }, // 过期
+        3: { status: 1, reason: 1 }, // 损坏
       };
 
       row.status = mapping[row.value].status;

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

@@ -63,6 +63,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="原RFID" prop="oldMaterialsRfid">
         <el-input
           v-model="queryParams.oldMaterialsRfid"
@@ -162,10 +163,14 @@
       </el-table-column>
       <el-table-column label="原物资编号" align="center" prop="oldMaterialsId">
       </el-table-column>
+      <el-table-column label="原物资名称" align="center" prop="oldMaterialsName">
+      </el-table-column>
       <el-table-column label="原RFID" align="center" prop="oldMaterialsRfid">
       </el-table-column>
       <el-table-column label="新物资编号" align="center" prop="newMaterialsId">
       </el-table-column>
+      <el-table-column label="新物资名称" align="center" prop="newMaterialsName">
+      </el-table-column>
       <el-table-column label="新RFID" align="center" prop="newMaterialsRfid">
       </el-table-column>
       <el-table-column