From 2ded1f7d6643b5053ead3e666ae01cd9642a2a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 11 Apr 2023 13:15:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 7d3839f11..912326644 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2727,8 +2727,8 @@ export const InventoryTransferLog = [ type: "name", width: orderWidth }, - { label: "从状态", prop: "fromStatus",type: "filter", filters: "requestStatus" }, - { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" }, + { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" }, + { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, From 6b818da520aa8e5ac96027e619401f6d6d5b6b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 11 Apr 2023 14:47:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=AE=A1=E5=85=A5=E9=A2=84?= =?UTF-8?q?=E8=AE=A1=E5=87=BA=E5=AD=97=E6=AE=B5=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 54 +++++++++++++++++++-------- fe/PC/src/utils/tabsDesTions/index.js | 22 +++++------ 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 912326644..d74da78e9 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1266,7 +1266,7 @@ export const qualifiedInfo = [ { label: "箱码", prop: "packingCode" }, { label: "ERP库位", prop: "locationErpCode" }, // { label: "ERP库位", prop: "recommendErpCode" }, - { label: "到货时间", prop: "arriveDate",type: "dateTime" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, // ----------------------------------------------------------------------- { label: "创建时间", prop: "creationTime",type: "dateTime" }, @@ -1279,8 +1279,8 @@ export const qualifiedInfo = [ { label: "实际ERP库位", prop: "handledToLocationErpCode" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" }, - { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" }, + { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, @@ -1333,7 +1333,7 @@ export const unqualifiedInfo = [ { label: "不合格原因代码", prop: 'failedReason' }, { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, { label: "质量缺陷", prop: "massDefect" }, - { label: "到货时间", prop: "arriveDate",type: "dateTime" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" }, // ----------------------------------------------------------------------- @@ -1347,8 +1347,8 @@ export const unqualifiedInfo = [ { label: "实际ERP库位", prop: "handledToLocationErpCode" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" }, - { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" }, + { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, @@ -1402,9 +1402,9 @@ export const lackMaterialsInfo = [ { label: "数量", prop: "qty" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "到货时间", prop: "arriveDate",type: "dateTime" }, - { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" }, - { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, + { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" }, + { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" }, { label: "生产时间", prop: "produceDate",type: "dateTime" }, { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" }, { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" }, @@ -1542,7 +1542,7 @@ export const unqualifiedToQualified = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + { label: "到货日期", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "序号", prop: 'serialNumber' }, @@ -2694,7 +2694,7 @@ export const InventoryTransaction = [ { label: "单据号", prop: "docNumber" }, { label: "库位组", prop: "locationGroup" }, { label: "库区", prop: "locationArea" }, - { label: "到货时间", prop: "arriveDate",type: "dateTime" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "标包数量", prop: "stdPackQty" }, @@ -2768,7 +2768,7 @@ export const InventoryTransferLog = [ { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "到仓库代码", prop: "toWarehouseCode" }, ] -// 预计入库存(+自定义tab页) +// 预计入库存(+自定义tab页) 20230411 export const expectOut = [ { label: "任务编号", @@ -2779,20 +2779,31 @@ export const expectOut = [ }, { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "占用数量", prop: "qty" }, + { label: "计量单位", prop: "uom" }, { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, { label: "供应商批次", prop: "supplierBatch" }, { label: "库区", prop: "locationArea" }, { label: "库位组", prop: "locationGroup" }, { label: "ERP库位", prop: "locationErpCode" }, + { label: "批次", prop: "lot" }, + { label: "到货日期", prop: "arriveDate",type:"dateTime" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, + { label: "过期时间", prop: "expireDate",type:"dateTime" }, + { label: "仓库代码", prop: 'warehouseCode' }, + { label: "序号", prop: "serialNumber" }, + { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, ] -// 预计出库存(+自定义tab页) +// 预计入库存(+自定义tab页) 20230411 export const expectIn = [ { label: "任务编号", @@ -2802,19 +2813,30 @@ export const expectIn = [ width: orderWidth }, { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "占用数量", prop: "qty" }, + { label: "计量单位", prop: "uom" }, { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, + { label: "批次", prop: "lot" }, { label: "供应商批次", prop: "supplierBatch" }, { label: "库区", prop: "locationArea" }, { label: "库位组", prop: "locationGroup" }, { label: "ERP库位", prop: "locationErpCode" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "生产日期", prop: "produceDate",type: "dateTime" }, + { label: "过期时间", prop: "expireDate",type:"dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "仓库代码", prop: 'warehouseCode' }, + { label: "序号", prop: 'serialNumber' }, { label: "备注", prop: 'remark' }, + { label: "事务ID", prop: "tenantId" }, ] // 非生产领料申请 已调整 export const pickingRequest = [ diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 9c4688e30..d1cb1fcb4 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2108,10 +2108,12 @@ export const InventoryTransferLog = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 预计出库存 1 +// 预计入库存 20230411 export const expectIn = [ { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "任务编号", prop: "jobNumber" }, { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, @@ -2123,28 +2125,28 @@ export const expectIn = [ { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "状态", prop: "status", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "序号", prop: "serialNumber" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "仓库代码", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 预计入库存 1 +// 预计入库存 20230411 export const expectOut = [ { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "任务编号", prop: "jobNumber" }, { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, @@ -2156,22 +2158,20 @@ export const expectOut = [ { label: "生产日期", prop: "produceDate", type: "dateTime" }, { label: "状态", prop: "status", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "序号", prop: "serialNumber" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 非生产领料申请 已调整 1