From 9300da49889b5a96c67fd95d4b2828b696a989dc Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925259474@qq.com>
Date: Sun, 23 Nov 2025 19:16:48 +0800
Subject: [PATCH] no message

---
 src/views/inventory/InventoryList.vue |  3 +--
 src/views/receive/asn/Asn.data.ts     | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/inventory/InventoryList.vue b/src/views/inventory/InventoryList.vue
index 96f028c..be96ba1 100644
--- a/src/views/inventory/InventoryList.vue
+++ b/src/views/inventory/InventoryList.vue
@@ -54,8 +54,7 @@
           <a-col :lg="6">
             <a-form-item name="status">
               <template #label><span title="库存状态">库存状态</span></template>
-              <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="inventory
-              _status" allowClear />
+              <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="inventory_status" allowClear />
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/receive/asn/Asn.data.ts b/src/views/receive/asn/Asn.data.ts
index 1440f41..05e27ff 100644
--- a/src/views/receive/asn/Asn.data.ts
+++ b/src/views/receive/asn/Asn.data.ts
@@ -23,11 +23,12 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'status_dictText',
     customRender: ({ text }) => {
-      //入库状态:1.已创建;2.部分收货;3.收货完成;4.已取消。
+      //入库状态:1.已创建;2.部分收货;3.收货完成;4.已关闭,5.已取消。
       const statusColorMap = {
         已创建: 'orange',
         部分收货: 'blue',
         收货完成: 'green',
+        已关闭: 'green',
         已取消: 'red',
       };
       const color = statusColorMap[text] || 'red';
@@ -167,18 +168,21 @@ export const asnDetailColumns: JVxeColumn[] = [
     width: '120px',
     defaultValue: '1',
     formatter: ({ cellValue }) => {
-      //入库状态:1.已创建;2.部分收货;3.收货完成;4.已取消。
+      //入库状态:1.已创建;2.部分收货;3.收货完成;4.已关闭,5.已取消。
       const statusMap = {
         1: '已创建',
         2: '部分收货',
         3: '收货完成',
-        4: '已取消',
+        4: '已关闭',
+        5: '已取消',
+
       };
       // 状态颜色映射
       const statusColorMap = {
         已创建: 'orange',
         部分收货: 'blue',
         收货完成: 'green',
+        已关闭: 'green',
         已取消: 'red',
       };
       const text = statusMap[cellValue] || '未知状态';