From 32b8dec3abff86774339a967cb9ebc82f4939d8c Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 27 Feb 2024 09:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=20?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=B2=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点 去除已删除
---
 .../heli/controller/admin/material/vo/MaterialRespVO.java   | 3 +++
 .../mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue | 1 -
 .../mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
index 5b0b4006..58380b30 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
@@ -27,6 +27,9 @@ public class MaterialRespVO {
     @ExcelProperty("物料名称")
     private String name;
 
+    @Schema(description = "物料名称和编码")
+    private String codeAndName;
+
     @Schema(description = "品牌")
     @ExcelProperty("品牌")
     private String brand;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
index 1e0b2341..11c71d5e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
@@ -361,7 +361,6 @@ const formData = ref({
   purchaseNo:undefined,
   supplierId:undefined,
   contractNo:undefined,
-  purchaseNo:undefined,
   projectMaterialPlanNo: undefined,
   projectMaterialPlanId: undefined,
   goodsType: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index 8d19529c..8ebd2b11 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="单据状态" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS).filter(item=> item.value !==3)" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -95,11 +95,11 @@
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="center" min-width="140">
         <template #default="scope">
-          <el-button link type="primary" @click="openDetail('update', scope.row.id)">
+          <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status == 1">
             编辑
           </el-button>
           <el-button link type="primary" @click="openDetail('review', scope.row.id)">
-            查看
+            查看详情
           </el-button>
         </template>
       </el-table-column>