diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index d2214b234..cec79a6cd 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -2215,7 +2215,7 @@ export const materialReturnNote = [ { label: "原因代码", prop: 'reasonCode' },//无 // ----------------------------------------------------------------------- ] -// 回收料收货记录 已调整 +// 回收料收货记录 20230415 export const recycledMaterialsReceipt = [ { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, @@ -2229,7 +2229,10 @@ export const recycledMaterialsReceipt = [ { label: "ERP库位", prop: 'locationErpCode' }, { 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: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -2238,45 +2241,71 @@ export const recycledMaterialsReceipt = [ { label: "仓库代码", prop: 'warehouseCode' }, { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "原因代码", prop: 'reasonCode' },//无 + { label: "原因代码", prop: 'reasonCode' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "status", prop: 'status' }, + { label: "ID", prop: 'id' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] -// 回收料调整申请 已调整 +// 回收料调整申请 20230415 export const recycledMaterialsAdjustmentApply = [ { label: "来源物品代码", prop: "itemCode" }, { label: "目标物品代码", prop: "toItemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "目标物品名称", prop: "toItemName" }, { label: "物品描述1", prop: "itemDesc1" }, + { label: "目标物品描述1", prop: "toItemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "目标物品描述2", prop: "toItemDesc2" }, { label: "来源箱标签", prop: "fromPackingCode" }, { label: "目标箱标签", prop: "toPackingCode" }, + { label: "单位", prop: "uom" }, { label: "调整数量", prop: "fromQty" }, - { label: "来源库位", prop: "locationCode" }, + { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: "toLocationCode" }, { label: "原因", prop: 'reasonCode' },//不是字典,直接显示文本 { label: "批次", prop: "fromLot" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // ----------------------------------------------------------------------- - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, - { label: "操作员", prop: 'worker' }, { label: "来源单位", prop: "fromUom" }, - { label: "目标单位", prop: "toUom" }, + { label: "操作员", prop: 'worker' }, + { label: "目标批次", prop: "toLot" }, + { label: "来源库区", prop: 'fromLocationArea' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "来源库位组", prop: 'fromLocationGroup' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "来源ERP库位", prop: 'fromLocationErpCode' }, + { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "来源仓库", prop: 'fromWarehouseCode' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标数量", prop: "toQty" }, { label: "从供应商批次", prop: "fromSupplierBatch" }, { label: "到供应商批次", prop: "toSupplierBatch" }, - { label: "从仓库", prop: "warehouseCode" }, { label: "从到货时间", prop: "fromArriveDate",type: "dateTime" }, { label: "到到货时间", prop: "toArriveDate" ,type: "dateTime" }, { label: "从生产日期", prop: "fromProduceDate" ,type: "dateTime" }, { label: "到生产日期", prop: "toProduceDate" ,type: "dateTime" }, { label: "从过期时间", prop: "fromExpireDate" ,type: "dateTime" }, { label: "到过期时间", prop: "toExpireDate" ,type: "dateTime" }, - { label: "库位组", prop: "locationGroup" }, - { label: "库区", prop: "locationArea" }, - { label: "ERP库位", prop: "locationErpCode" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, + { label: "fromStatus", prop: "fromStatus" }, + { label: "toStatus", prop: "toStatus" }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: "id" }, + // { label: "来源库位", prop: "locationCode" }, + // { label: "库位组", prop: "locationGroup" }, + // { label: "库区", prop: "locationArea" }, + // { label: "ERP库位", prop: "locationErpCode" }, + // { label: "从仓库", prop: "warehouseCode" }, + // { label: "目标单位", prop: "toUom" }, // ----------------------------------------------------------------------- ] // 回收料调整记录 已调整 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 1bf379e46..6264911fa 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3085,7 +3085,7 @@ export const materialReturnNote = [ { label: "仓库代码", prop: 'warehouseCode',}, // ----------------------------------------------------------------------- ] -// 回收料收货记录 已调整 +// 回收料收货记录 20230415 export const recycledMaterialsReceipt = [ { label: "回收料收货记录单号", @@ -3095,16 +3095,19 @@ export const recycledMaterialsReceipt = [ width: orderWidth }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company',}, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: "warehouseCode" }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company',}, + // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 回收料调整申请 已调整 +// 回收料调整申请 20230415 export const recycledMaterialsAdjustmentApply = [ { label: "回收料调整申请单号", @@ -3117,16 +3120,19 @@ export const recycledMaterialsAdjustmentApply = [ { label: "创建时间", prop: "creationTime" ,type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "公司", prop: 'company' }, { label: "备注", prop: 'remark' }, { 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: "warehouseCode" }, + { label: "事务ID", prop: "tenantId" }, + // { label: "仓库代码", prop: "warehouseCode" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 回收料调整记录 已调整 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index ad89b8026..1230663a2 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2321,7 +2321,7 @@ export const materialReturnNote = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 回收料收货记录 已调整 1 +// 回收料收货记录 20230415 export const recycledMaterialsReceipt = [ { label: "回收料收货记录单号", prop: "number" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -2332,13 +2332,13 @@ export const recycledMaterialsReceipt = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: "warehouseCode" }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 回收料调整申请 已调整 1 +// 回收料调整申请 20230415 export const recycledMaterialsAdjustmentApply = [ { label: "回收料调整申请单号", prop: "number" }, { label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" }, @@ -2355,10 +2355,10 @@ export const recycledMaterialsAdjustmentApply = [ { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: "warehouseCode" }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] // 回收料调整记录 已调整 1