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" },