diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index f73e2134e..8fd5e690b 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1025,25 +1025,25 @@ export const PurchaseReturnNote = [ { label: "订单行", prop: 'poLine' }, // ----------------------------------------------------------------------- ] -// 原料报废记录 已调整 +// 原料报废记录 20230412 export const ScrapNote = [ { 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: 'toLot' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "报废原因代码", prop: 'reasonCode' }, { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" }, { label: "报废库位", prop: "fromLocationCode" }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -1055,17 +1055,21 @@ export const ScrapNote = [ { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: 'toLocationCode' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, - { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, + { label: "事务ID", prop: "tenantId" }, + { label: "主表ID", prop: "masterID" }, + { label: "ID", prop: 'id' }, + // { label: "来源库位", prop: 'fromLocationCode' }, + // { label: "目标ERP库位", prop: 'toLocationErpCode' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] // 原料直发客户记录 已调整 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 59ecb5d1c..72850423e 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1950,7 +1950,7 @@ export const PurchaseReturnNote = [ { label: "status", prop: 'status' }, // ----------------------------------------------------------------------- ] -// 原料报废记录 已调整 +// 原料报废记录 20230412 export const ScrapNote = [ { label: "报废记录单号", @@ -1962,15 +1962,18 @@ export const ScrapNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "任务ID", prop: 'jobNumber' }, { label: "报废类型", prop: 'type' }, { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth }, + { label: "事务ID", prop: "tenantId" }, + // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 原料直发客户记录 已调整 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index d4661c46c..8a5395dad 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1394,7 +1394,7 @@ export const PurchaseReturnNote = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 原料报废记录 已调整 1 +// 原料报废记录 20230412 export const ScrapNote = [ { label: "报废记录单号", prop: "number" }, { label: "报废日期", prop: "activeDate",type: "dateTime" }, @@ -1405,13 +1405,13 @@ export const ScrapNote = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "事务ID", prop: "tenantId" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "任务ID", prop: 'jobNumber' }, { label: "报废类型", prop: 'type' }, { label: "报废请求单号", prop: 'scrapRequestNumber' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 原料直发记录 已调整 1