diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index c149eca02..e1b628e0d 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -2454,11 +2454,12 @@ export const materialsAdjustment = [ // { label: "目标单位", prop: "toUom" }, // { label: "从仓库", prop: "warehouseCode" }, ] -// 线边仓调拨申请 已调整 +// 线边仓调拨申请 20230417 export const lineSideWarehouseAllocationRequest = [ { 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: "fromLot" }, @@ -2467,17 +2468,16 @@ export const lineSideWarehouseAllocationRequest = [ { label: "调入库位", prop: "toLocationCode" }, { 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: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, { 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: 'fromLocationGroup' }, @@ -2486,72 +2486,90 @@ export const lineSideWarehouseAllocationRequest = [ { label: "目标库区", prop: 'toLocationArea' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, + { label: "原因", prop: 'reason' }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, - { label: "原因", prop: 'reason' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "在途库位", prop: "inTransitLocation" }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "正厂编码", prop: "supllierItemCode" }, + // { label: "部门代号", prop: "departmentCode" }, + // { label: "交易码", prop: "transactioncode" }, + // { label: "次交易码", prop: "secondaryTransactioncode" }, // ----------------------------------------------------------------------- ] -// 线边仓调拨确认 已调整 +// 线边仓调拨确认 20230417 export const lineSideWarehouseAllocationConfirm = [ { 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: "fromLot" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - // ----------------------------------------------------------------------- - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, - { label: "标包数量", prop: "stdPackQty" }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { 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: "原因", prop: 'reason' }, - // ----------------------------------------------------------------------- -] -// 线边仓调拨记录 已调整 + { label: "创建者ID", prop: 'creatorId' }, + // ----------------------------------------------------------------------- + { label: "上次修改者ID", prop: 'lastModifierId' }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "任务编号", prop: 'number' }, + { label: "备注", prop: 'remark' }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "来源箱码", prop: 'fromPackingCode' }, + { label: "目标箱码", prop: 'toPackingCode' }, + { label: "来源批次", prop: 'fromLot' }, + { label: "目标批次", prop: 'toLot' }, + { label: "供应商批次", prop: 'supplierBatch' }, + { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + { label: "来源库位组", prop: 'fromLocationGroup' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "来源库区", prop: 'fromLocationArea' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "来源ERP库位", prop: 'fromLocationErpCode' }, + { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "来源仓库", prop: 'fromWarehouseCode' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, + { label: "fromStatus", prop: 'fromStatus' }, + { label: "toStatus", prop: 'toStatus' }, + { label: "原因", prop: 'reason' }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "正厂编码", prop: "supllierItemCode" }, + // { label: "部门代号", prop: "departmentCode" }, + // { label: "交易码", prop: "transactioncode" }, + // { label: "次交易码", prop: "secondaryTransactioncode" }, + // ----------------------------------------------------------------------- +] +// 线边仓调拨记录 20230417 export const lineSideWarehouseAllocationNote = [ { 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: "toLot" }, - { label: "箱码", prop: "fromPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, // ----------------------------------------------------------------------- + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -2567,12 +2585,20 @@ export const lineSideWarehouseAllocationNote = [ { 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: "原因", prop: 'reason' }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "正厂编码", prop: "supllierItemCode" }, + // { label: "部门代号", prop: "departmentCode" }, + // { label: "交易码", prop: "transactioncode" }, + // { label: "次交易码", prop: "secondaryTransactioncode" }, // ----------------------------------------------------------------------- ] // 储位调拨记录 已调整 @@ -2627,19 +2653,13 @@ export const customerStorageAllocationRequest = [ { label: "箱码", prop: "fromPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, - // { label: "在途库位", prop: "inTransitLocation" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // ----------------------------------------------------------------------- { label: "创建者ID", prop: "creatorId" }, - // { label: "正厂编码", prop: "supllierItemCode" }, - // { label: "部门代号", prop: "departmentCode" }, - // { label: "交易码", prop: "transactioncode" }, - // { label: "次交易码", prop: "secondaryTransactioncode" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "目标箱码", prop: 'toPackingCode' }, { label: "目标批次", prop: 'toLot' }, @@ -2653,7 +2673,6 @@ export const customerStorageAllocationRequest = [ { label: "目标库区", prop: 'toLocationArea' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, - // { label: "仓库", prop: 'warehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "原因", prop: 'reason' }, @@ -2662,6 +2681,13 @@ export const customerStorageAllocationRequest = [ { label: "事务ID", prop: "tenantId" }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "在途库位", prop: "inTransitLocation" }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "正厂编码", prop: "supllierItemCode" }, + // { label: "部门代号", prop: "departmentCode" }, + // { label: "交易码", prop: "transactioncode" }, + // { label: "次交易码", prop: "secondaryTransactioncode" }, // ----------------------------------------------------------------------- ] // 客户储位调拨确认 20230410 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index fc31dfb44..fdf698856 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3190,7 +3190,7 @@ export const materialsAdjustment = [ // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 线边仓调拨申请 已调整 +// 线边仓调拨申请 20230417 export const lineSideWarehouseAllocationRequest = [ { label: "调拨申请单号", @@ -3199,13 +3199,12 @@ export const lineSideWarehouseAllocationRequest = [ type: "name", width: orderWidth }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "申请日期", prop: "activeDate", type:"dateTime" }, + { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, + { label: "生效日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "公司", prop: 'company',}, { label: "备注", prop: 'remark' }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"}, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot"}, @@ -3213,10 +3212,11 @@ export const lineSideWarehouseAllocationRequest = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot"}, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot"}, { label: "调拨类型", prop: 'type' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ----------------------------------------------------------------------- + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // { label: "仓库代码", prop: "warehouseCode" }, + // { label: "公司", prop: 'company',}, ] -// 线边仓调拨确认 已调整 +// 线边仓调拨确认 20230417 export const lineSideWarehouseAllocationConfirm = [ { label: "调拨确认单号", @@ -3225,22 +3225,26 @@ export const lineSideWarehouseAllocationConfirm = [ type: "name", width: orderWidth }, - { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, + { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + { label: "事务ID", prop: "tenantId" }, { label: "调拨类型", prop: 'type' }, - { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // { label: "仓库代码", prop: "warehouseCode" }, + // { label: "公司", prop: 'company',}, // ----------------------------------------------------------------------- ] -// 线边仓调拨记录 已调整 +// 线边仓调拨记录 20230417 export const lineSideWarehouseAllocationNote = [ { label: "调拨确认单号", @@ -3249,20 +3253,23 @@ export const lineSideWarehouseAllocationNote = [ type: "name", width: orderWidth }, - { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: "remark" }, - { label: "公司", prop: "company" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "任务ID", prop: "jobNumber" }, - { label: "调拨类型", prop: "type" }, - { label: "使用中间库", prop: "useOnTheWayLocation", type: "filter", filters: "whetherOrNot" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "备注", prop: 'remark' }, + { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + { label: "事务ID", prop: "tenantId" }, + { label: "调拨类型", prop: 'type' }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // { 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 544444218..f1595107f 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2378,32 +2378,32 @@ export const materialsAdjustment = [ // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 线边仓调拨申请 已调整 1 +// 线边仓调拨申请 20230417 export const lineSideWarehouseAllocationRequest = [ { label: "调拨申请单号", prop: "number" }, - { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "申请日期", prop: "activeDate", type:"dateTime" }, + { label: "状态", type: "filter", filters: "requestStatus", prop: "requestStatus" }, + { label: "生效日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, { 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: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "事务ID", prop: "tenantId" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "公司", prop: 'company' }, { label: "备注", prop: 'remark' }, { label: "调拨类型", prop: 'type' }, { label: "ID", prop: 'id' }, + // { label: "仓库代码", prop: "warehouseCode" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 线边仓调拨确认 已调整 1 +// 线边仓调拨确认 20230417 export const lineSideWarehouseAllocationConfirm = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, @@ -2411,42 +2411,42 @@ export const lineSideWarehouseAllocationConfirm = [ { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, + { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务单号", prop: "jobNumber" }, + { label: "任务ID", prop: 'jobNumber' }, { label: "事务ID", prop: "tenantId" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "公司", prop: 'company' }, - { label: "备注", prop: 'remark' }, { label: "调拨类型", prop: 'type' }, { label: "ID", prop: 'id' }, + { label: "备注", prop: 'remark' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 线边仓调拨记录 已调整 1 +// 线边仓调拨记录 20230417 export const lineSideWarehouseAllocationNote = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, - { label: "确认时间", prop: "confirmTime", type: "dateTime" }, + { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用在途库", prop: "useOnTheWayLocation",type: "filter", filters: "whetherOrNot" }, + { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: "remark" }, + { label: "任务ID", prop: 'jobNumber' }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: "company" }, - { label: "仓库代码", prop: "warehouseCode" }, - { label: "任务ID", prop: "jobNumber" }, - { label: "调拨类型", prop: "type" }, + { label: "调拨类型", prop: 'type' }, { label: "ID", prop: 'id' }, + { label: "备注", prop: 'remark' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库代码", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] // 储位调拨记录 已调整 1 diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue index 146375133..e1b877c92 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue @@ -62,7 +62,7 @@ export default { data () { return { // URL: 'wms/store/count-adjust-note', - URL: 'wms/store/wip-adjust-note', + URL: 'wms/store/wip-warehouse-adjust-note', //常用按钮数据 currenButtonData: [ this.defaultExportBtn(),//导出 diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue index d422046fd..534a5de09 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue @@ -75,7 +75,7 @@ export default { data () { return { // URL: 'wms/store/count-adjust-request', - URL: 'wms/store/wip-adjust-request', + URL: 'wms/store/wip-warehouse-adjust-request', //常用按钮数据 currenButtonData: [ this.defaultImportBtn(),//导入