From 2270d99702620f111c57d1e599df1bfd70850de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 12 Dec 2024 13:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90agv-pc=E3=80=91=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js |  6 +++---
 fe/PC/src/utils/tabsDesTions/index.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 48ca3f0e8..5cff35235 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2199,11 +2199,11 @@ export const InventoryBalance = [
   { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
   { label: "箱码", prop: "packingCode" },
   { label: _Names.locationErpCode, prop: "locationErpCode" },
-  // { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
   // { label: "创建时间", prop: "creationTime",type: "dateTime" },
   // { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
-  // { label: "入库时间", prop: "putInTime", type: "dateTime" },
-  // { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
   // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
   // { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
   // { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index abe0c0dc8..f7ddae988 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1402,17 +1402,17 @@ export const InventoryInitialNote = [
   { label: "库存状态", prop: "status",type: "filter",  filters: "inventoryStage" },
   { label: "箱码", prop: 'packingCode' },
   { label: _Names.locationErpCode, prop: "locationErpCode" },
-  // { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  { label: _Names.itemDesc1, prop: "itemDesc1" },
+  { label: _Names.itemDesc2, prop: "itemDesc2" },
+  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
   // { label: "创建时间", prop: "creationTime",type: "dateTime" },
   // { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
-  // { label: "入库时间", prop: "putInTime", type: "dateTime" },
-  // { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
   // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
   // { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
   // { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
   // { label: "最后盘点标签号", prop: "lastCountLabel" },
-  { label: _Names.itemDesc1, prop: "itemDesc1" },
-  { label: _Names.itemDesc2, prop: "itemDesc2" },
   // { label: "标包数量", prop: 'stdPackQty' },
   // { label: "标准成本单价", prop: "stdCostPrice" },
   // { label: "标准成本金额", prop: "stdCost" },