From 9fc79f9c08b80bb553357c89a107de384ac10b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 12 Apr 2023 18:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=90=8E=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E4=BB=BB=E5=8A=A1=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/detailsTableColumns/index.js | 74 ++++++++++++-------- fe/PC/src/utils/tableColumns/index.js | 21 ++++-- fe/PC/src/utils/tabsDesTions/index.js | 18 ++--- 3 files changed, 69 insertions(+), 44 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 61729ce42..611bc1f90 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -913,58 +913,60 @@ export const beforeGroundingReturnNote = [ // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, // ----------------------------------------------------------------------- ] -// 上架后退货申请 已调整 +// 上架后退货申请 20230412 export const PurchaseReturnRequest = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, { label: "箱码", prop: "packingCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "退货库位", prop: "locationCode" }, { label: "ERP库位", prop: "locationErpCode" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, + { label: "单据号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate' }, { label: "生产时间", prop: 'produceDate' }, { label: "过期时间", prop: 'expireDate' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "库位组", prop: 'locationGroup' }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "仓库代码", prop: 'warehouseCode' }, { label: "库区", prop: 'locationArea' }, { label: "status", prop: 'status' }, { label: "订单行", prop: 'poLine' }, + { label: "事务ID", prop: "tenantId" }, + { label: "主表ID", prop: "masterID" }, + { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] -// 上架后退货任务 已调整 +// 上架后退货任务 20230412 export const PurchaseReturnJob = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - // 上架后退货任务先都用【recommend】信息，已跟后端确定 - { label: "数量", prop: "recommendQty" }, - { label: "单位", prop: "recommendUom" }, - { label: "批次", prop: 'recommendLot' }, - { label: "箱码", prop: "recommendPackingCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "退货原因代码", prop: 'reason' }, { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, - { label: "退货库位", prop: "recommendLocationCode" }, - { label: "ERP库位", prop: "recommendLocationErpCode" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, // ----------------------------------------------------------------------- + { label: "计量单位", prop: "uom" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, @@ -978,19 +980,35 @@ export const PurchaseReturnJob = [ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, - { label: "推荐库位", prop: 'recommendLocationCode' }, - { label: "实际库位", prop: 'handledLocationCode' }, - { label: "推荐库区", prop: 'recommendLocationArea' }, - { label: "实际库区", prop: 'handledLocationArea' }, - { label: "推荐库位组", prop: 'recommendLocationGroup' }, - { label: "实际库位组", prop: 'handledLocationGroup' }, - { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - { label: "推荐计量单位", prop: 'recommendUom' }, - { label: "实际计量单位", prop: 'handledUom' }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际数量", prop: 'handledQty' }, { label: "订单行", prop: 'poLine' }, + { label: "事务ID", prop: "tenantId" }, + { label: "status", prop: 'status' }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "退货库位", prop: "recommendLocationCode" }, + // { label: "实际库位", prop: 'handledLocationCode' }, + // { label: "推荐库区", prop: 'recommendLocationArea' }, + // { label: "实际库区", prop: 'handledLocationArea' }, + // { label: "推荐库位组", prop: 'recommendLocationGroup' }, + // { label: "实际库位组", prop: 'handledLocationGroup' }, + // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, + // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, + // { label: "推荐计量单位", prop: 'recommendUom' }, + // { label: "实际计量单位", prop: 'handledUom' }, // ----------------------------------------------------------------------- ] // 上架后退货记录 已调整 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 643bd1fb3..a788daea5 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1853,7 +1853,7 @@ export const beforeGroundingReturnNote = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 上架后退货申请 已调整 +// 上架后退货申请 20230412 export const PurchaseReturnRequest = [ { label: "退货申请单号", prop: "number", @@ -1863,16 +1863,17 @@ export const PurchaseReturnRequest = [ }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, @@ -1880,9 +1881,12 @@ export const PurchaseReturnRequest = [ { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "收货单号", prop: 'rpNumber' }, { label: "returnType", prop: 'returnType' }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 上架后退货任务 已调整 +// 上架后退货任务 20230412 export const PurchaseReturnJob = [ { label: "退货任务编号", @@ -1892,7 +1896,6 @@ export const PurchaseReturnJob = [ width: orderWidth }, { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "退货申请单号", prop: "purchaseReturnRequestNumber",width: orderWidth }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, @@ -1901,11 +1904,13 @@ export const PurchaseReturnJob = [ { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type:"dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "供应商代码", prop: "supplierCode" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, { label: "任务类型", prop: 'jobType' }, { label: "优先级", prop: 'priority' }, @@ -1920,6 +1925,8 @@ export const PurchaseReturnJob = [ { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, { label: "收货单号", prop: 'rpNumber' }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 上架后退货记录 已调整 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 0bbe28d2b..8a19b6a31 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1301,40 +1301,39 @@ export const beforeGroundingReturnNote = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 上架后退货申请 已调整 1 +// 上架后退货申请 20230412 export const PurchaseReturnRequest = [ { label: "退货申请单号", prop: "number" }, { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, { label: "供应商代码", prop: "supplierCode" }, { label: "退货时间", prop: "returnTime",type:"dateTime" }, - { label: "操作员", prop: "woker" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- + { label: "操作员", prop: 'worker' }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "公司", prop: 'company' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "收货单号", prop: 'rpNumber' }, { label: "returnType", prop: 'returnType' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 上架后退货任务 已调整 1 +// 上架后退货任务 20230412 export const PurchaseReturnJob = [ { label: "退货任务单号", prop: "number" }, { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, - { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "退货申请单号", prop: 'purchaseReturnRequestNumber' }, { label: "发货单号", prop: "asnNumber" }, { label: "订单号", prop: "poNumber" }, @@ -1346,12 +1345,12 @@ export const PurchaseReturnJob = [ { label: "完成用户", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, // ----------------------------------------------------------------------- - { label: "供应商代码", prop: "supplierCode" }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "创建者ID", prop: "creatorId" }, + { label: "供应商代码", prop: "supplierCode" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "事务ID", prop: "tenantId" }, { label: "操作员", prop: 'worker' }, { label: "仓库", prop: 'warehouseCode' }, @@ -1366,6 +1365,7 @@ export const PurchaseReturnJob = [ { label: "收货单号", prop: 'rpNumber' }, { label: "任务描述", prop: 'jobDescription' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 上架后退货记录 已调整 1