diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 5bb36c1f7..8440e0701 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -209,7 +209,7 @@ export const PurchaseReceiptJob = [ // { label: "ERP库位", prop: "recommendErpCode" }, // ----------------------------------------------------------------------- ] -// 报检单 20230407 +// 报检单 20230410 export const InspectRequest = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName", width: orderWidth }, @@ -245,27 +245,28 @@ export const InspectRequest = [ { label: "AbcClass类别", prop: 'abcClass' }, { label: "事务ID", prop: "tenantId" }, { label: "主表ID", prop: "masterID" }, - { label: "附加属性", prop: "attributes" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "ID", prop: "id" }, - // { label: "完成时间", prop: "completeTime",type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "不合格原因代码", prop: 'failedReason' }, - // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, - // { label: "破坏数量", prop: 'crackQty' }, + { label: "不合格原因代码", prop: 'failedReason' }, + { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, + { label: "破坏数量", prop: 'crackQty' }, + { label: "最终不合格数量", prop: 'notPassedQty' }, + { label: "检验人", prop: 'inspectUser' }, + { label: "合格数量", prop: 'goodQty' }, + { label: "不合格数量", prop: 'failedQty' }, + { label: "外观", prop: 'appearance' }, + { label: "尺寸", prop: 'volume' }, + { label: "重量", prop: 'weight' }, + { label: "其他属性", prop: 'otherPropertyJson' }, // { label: "检验人姓名", prop: 'inspectUserName' }, // { label: "检验人电话", prop: 'inspectUserPhone' }, // { label: "检验人邮件", prop: 'inspectUserEmail' }, - // { label: "最终不合格数量", prop: 'notPassedQty' }, // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, // { label: "供应商包装数量", prop: 'supplierPackQty' }, // { label: "物品单位", prop: "receiveUom" }, - // { label: "合格数量", prop: 'goodQty' }, - // { label: "不合格数量", prop: 'failedQty' }, - // { label: "外观", prop: 'appearance' }, - // { label: "尺寸", prop: 'volume' }, - // { label: "重量", prop: 'weight' }, - // { label: "其他属性", prop: 'otherPropertyJson' }, + // { label: "附加属性", prop: "attributes" }, + // { label: "完成时间", prop: "completeTime",type: "dateTime" }, + // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] // 检验记录 20230407 @@ -376,39 +377,31 @@ export const unqualifiedToQualifiedNote = [ // { label: "检验完成时间", prop: "completeTime",type: "dateTime" }, // ----------------------------------------------------------------------- ] -// 采购上架记录 已调整 +// 采购上架记录 20230410 export const PutawayNote = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty" }, - { label: "到货数", prop: 'shippedQty' }, { label: "单位", prop: "uom" }, - { label: "批次", prop: "toLot" }, - { label: "箱码", prop: "toPackingCode" }, { label: "来源库位", prop: "fromLocationCode" }, { label: "目标库位", prop: "toLocationCode" }, - { label: "ERP库位", prop: "toLocationErpCode" }, - { label: "操作员", prop: 'worker' }, - { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth }, - { label: "发货单号", prop: "asnNumber",width: orderWidth }, - { label: "检验单号", prop: "inspectNumber",width: orderWidth }, - { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' }, - { label: "筹措员代码", prop: 'planUserCode' }, - { label: "收货单号", prop: "receiptNumber",width: orderWidth }, - { label: "供应商代码", prop: "supplierCode" }, - { label: "供应商描述", prop: "supplierSimpleName" }, + { label: "供应商批次", prop: 'supplierBatch' }, // ----------------------------------------------------------------------- - { label: "完工收货单号", prop: 'productReceiptNumber',width: orderWidth }, - { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, + { label: "单据号", prop: 'number' }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "完成时间", prop: 'arriveDate' }, - { label: "生产时间", prop: 'produceDate' }, - { label: "过期时间", prop: 'expireDate' }, + { label: "完成时间", prop: 'arriveDate', type: "dateTime" }, + { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "来源库位组", prop: 'fromLocationGroup' }, @@ -418,12 +411,53 @@ export const PutawayNote = [ { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "订单行", prop: 'poLine' }, - { label: "标包单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商包装单位", prop: 'supplierPackUom' }, - { label: "供应商包装数量", prop: 'supplierPackQty' }, { label: "任务编号", prop: 'jobNumber' }, + { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + { label: "实际供应商批次", prop: "handledSupplierBatch" }, + { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + { label: "推荐批次", prop: "recommendLot" }, + { label: "实际批次", prop: "handledLot" }, + { label: "推荐库位", prop: "recommendToLocationCode" }, + { label: "实际库位", prop: "handledToLocationCode" }, + { label: "推荐库区", prop: "recommendToLocationArea" }, + { label: "实际库区", prop: "handledToLocationArea" }, + { label: "推荐库位组", prop: "recommendToLocationGroup" }, + { label: "实际库位组", prop: "handledToLocationGroup" }, + { label: "推荐ERP库位", prop: "recommendToLocationErpCode" }, + { label: "实际ERP库位", prop: "handledToLocationErpCode" }, + { label: "推荐仓库", prop: "recommendToWarehouseCode" }, + { label: "实际仓库", prop: "handledToWarehouseCode" }, + { label: "推荐数量", prop: "recommendQty" }, + { label: "实际数量", prop: "handledQty" }, + { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + { label: "fromStatus", prop: 'fromStatus' }, + { label: "toStatus", prop: 'toStatus' }, + // { label: "完工收货单号", prop: 'productReceiptNumber',width: orderWidth }, + // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, + // { label: "标包单位", prop: 'stdPackUom' }, + // { label: "供应商包装单位", prop: 'supplierPackUom' }, + // { label: "供应商包装数量", prop: 'supplierPackQty' }, + // { label: "到货数", prop: 'shippedQty' }, + // { label: "操作员", prop: 'worker' }, + // { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth }, + // { label: "发货单号", prop: "asnNumber",width: orderWidth }, + // { label: "检验单号", prop: "inspectNumber",width: orderWidth }, + // { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' }, + // { label: "筹措员代码", prop: 'planUserCode' }, + // { label: "收货单号", prop: "receiptNumber",width: orderWidth }, + // { label: "供应商代码", prop: "supplierCode" }, + // { label: "供应商描述", prop: "supplierSimpleName" }, // ----------------------------------------------------------------------- ] // 人工叫料申请 待确认 @@ -1966,29 +2000,24 @@ export const customerStorageAllocationRequest = [ { label: "原因", prop: 'reason' }, // ----------------------------------------------------------------------- ] -// 客户储位调拨确认 已调整 +// 客户储位调拨确认 20230410 export const customerStorageAllocationConfirm = [ { 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: "fromPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, // ----------------------------------------------------------------------- - { label: "正厂编码", prop: "supllierItemCode" }, - { label: "部门代号", prop: "departmentCode" }, - { label: "交易码", prop: "transactioncode" }, - { label: "次交易码", prop: "secondaryTransactioncode" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -2009,47 +2038,84 @@ export const customerStorageAllocationConfirm = [ { 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" }, // ----------------------------------------------------------------------- ] -// 客户储位调拨记录 已调整 +// 客户储位调拨记录 20230410 export const customerStorageAllocationNote = [ { 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: "toPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, // ----------------------------------------------------------------------- - { label: "正厂编码", prop: "supllierItemCode" }, - { label: "部门代号", prop: "departmentCode" }, - { label: "交易码", prop: "transactioncode" }, - { label: "次交易码", prop: "secondaryTransactioncode" }, - { label: "标包数量", prop: "stdPackQty" }, + { 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" }, // ----------------------------------------------------------------------- ] -// 储位内移库记录 已调整 +// 储位内移库记录 20230410 export const intraStorageTransferNote = [ { 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: 'toPackingCode' }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, - { label: "ERP库位", prop: "toLocationErpCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // ----------------------------------------------------------------------- + { label: "在途库位", prop: "onTheWayLocationCode" }, + { 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' }, @@ -2065,12 +2131,16 @@ export const intraStorageTransferNote = [ { 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: 'stdPackUom' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 线边仓缴库申请 待确认 diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index c898e4a55..463d74838 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -3,7 +3,7 @@ const orderWidth = 180 // 原料管理 /**/ -// 报检单 20230407 +// 报检单 20230410 export const InspectRequest = [ { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, @@ -15,6 +15,7 @@ export const InspectRequest = [ { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, // ----------------------------------------------------------------------- + { label: "检验人", prop: 'inspectUser' }, { label: "检验单号", prop: "number" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, @@ -39,12 +40,12 @@ export const InspectRequest = [ { label: "事务ID", prop: "tenantId" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "ID", prop: 'id' }, + { label: "不合格原因代码", prop: 'failedReason' }, + { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, // { label: "检验详情", fixed: "left", type: "button" }, // { label: "检验人姓名", prop: 'inspectUserName' }, // { label: "检验人电话", prop: 'inspectUserPhone' }, // { label: "检验人邮件", prop: 'inspectUserEmail' }, - // { label: "不合格原因代码", prop: 'failedReason' }, - // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, // { label: "供应商包装数量", prop: 'supplierPackQty' }, // { label: "物品单位", prop: "receiveUom" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 16d3115c0..4479da16f 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1437,7 +1437,7 @@ export const lackMaterialsInfo = [ { label: "供应商包装数量", prop: "supplierPackQty" }, { label: "status", prop: 'status' }, ] -// 报检单 20230407 +// 报检单 20230410 export const InspectRequest = [ { label: "检验单号", @@ -1446,7 +1446,6 @@ export const InspectRequest = [ type: "name", width: orderWidth }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, @@ -1458,35 +1457,36 @@ export const InspectRequest = [ { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "生效日期", prop: "activeDate",type: "dateTime" }, - { 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: 'purchaseReceiptRequestNumber' }, { label: "仓库", prop: 'warehouseCode' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "事务ID", prop: "tenantId" }, - // { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "上游任务编号", prop: 'upStreamJobNumber' }, + { label: "任务类型", prop: 'jobType' }, + { label: "优先级", prop: 'priority' }, + { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "工作组", prop: 'workGroupCode' }, + { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + { label: "承接者ID", prop: 'acceptUserId' }, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者", prop: 'completeUserId' }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "任务描述", prop: 'jobDescription' }, + { label: "检验单号", prop: 'inspectNumber' }, + { label: "nextAction", prop: 'nextAction' }, // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth }, // { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" }, // { label: "发货日期", prop: "shipDate",type: "dateTime" }, - // { label: "上游任务编号", prop: 'upStreamJobNumber' }, - // { label: "任务类型", prop: 'jobType' }, - // { label: "优先级", prop: 'priority' }, - // { label: "优先级增量", prop: 'priorityIncrement' }, - // { label: "工作组", prop: 'workGroupCode' }, - // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - // { label: "承接者ID", prop: 'acceptUserId' }, - // { label: "承接者用户名", prop: 'acceptUserName' }, - // { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - // { label: "完成者", prop: 'completeUserId' }, - // { label: "完成者用户名", prop: 'completeUserName' }, - // { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - // { label: "任务描述", prop: 'jobDescription' }, - // { label: "检验单号", prop: 'inspectNumber' }, - // { label: "nextAction", prop: 'nextAction' }, + // { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, + // { label: "生效日期", prop: "activeDate",type: "dateTime" }, + // { 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" }, // ----------------------------------------------------------------------- ] // 检验记录 20230407 @@ -1582,7 +1582,7 @@ export const unqualifiedToQualifiedNote = [ { label: "生效日期", prop: 'activeDate', type: "dateTime" }, // ----------------------------------------------------------------------- ] -// 采购上架记录 已调整 +// 采购上架记录 20230410 export const PutawayNote = [ { label: "上架记录单号", @@ -1595,14 +1595,23 @@ export const PutawayNote = [ { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- + { label: "备注", prop: 'remark' }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, + { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "检验单号", prop: 'inspectNumber' }, { label: "收货单号", prop: 'receiptNumber' }, - { label: "到货单号", prop: 'arriveNoticeNumber' }, { label: "发货单号", prop: 'asnNumber' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "完工收货单号", prop: 'productReceiptNumber' }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "事务ID", prop: "tenantId" }, + { label: "type", prop: "type" }, + // { label: "到货单号", prop: 'arriveNoticeNumber' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 人工叫料申请 已调整 @@ -3058,7 +3067,7 @@ export const customerStorageAllocationRequest = [ { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- ] -// 客户储位调拨确认 已调整 +// 客户储位调拨确认 20230410 export const customerStorageAllocationConfirm = [ { label: "调拨确认单号", @@ -3073,15 +3082,20 @@ export const customerStorageAllocationConfirm = [ { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', 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: "warehouseCode" }, + // { label: "公司", prop: 'company',}, // ----------------------------------------------------------------------- ] -// 客户储位调拨记录 已调整 +// 客户储位调拨记录 20230410 export const customerStorageAllocationNote = [ { label: "调拨确认单号", @@ -3090,13 +3104,26 @@ export const customerStorageAllocationNote = [ 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: "上次修改者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',}, + // ----------------------------------------------------------------------- ] -// 储位内移库记录 已调整 +// 储位内移库记录 20230410 export const intraStorageTransferNote = [ { label: "移库单号", @@ -3108,13 +3135,23 @@ export const intraStorageTransferNote = [ { label: "移库时间", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "确认时间", prop: "confirmTime",type:"dateTime" }, + { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, { 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: "type", prop: 'type' }, + // { label: "transferType", prop: "transferType" }, + // { label: "供应商代码", prop: 'supplierCode' }, + // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + // { 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 7006a7904..540ca3a41 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -983,10 +983,9 @@ export const PurchaseReceiptNote = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 报检单 20230407 +// 报检单 20230410 export const InspectRequest = [ { label: "检验单号", prop: "number" }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "采购订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, @@ -994,13 +993,7 @@ export const InspectRequest = [ { label: "供应商代码", prop: "supplierCode" }, { label: "操作员", prop: 'worker' }, { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: "activeDate",type: "dateTime" }, // ----------------------------------------------------------------------- - { 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: 'purchaseReceiptRequestNumber' }, { label: "仓库", prop: 'warehouseCode' }, { label: "要货计划单号", prop: 'rpNumber' }, @@ -1009,26 +1002,33 @@ export const InspectRequest = [ { label: "事务ID", prop: "tenantId" }, { label: "创建者ID", prop: "creatorId" }, { label: "ID", prop: 'id' }, + { label: "承接用户", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成用户", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "上游任务编号", prop: 'upStreamJobNumber' }, + { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, + { label: "优先级", prop: 'priority' }, + { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "工作组", prop: 'workGroupCode' }, + { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + { label: "承接者ID", prop: 'acceptUserId' }, + { label: "完成者ID", prop: 'completeUserId' }, + { label: "任务描述", prop: 'jobDescription' }, + { label: "检验单号", prop: 'inspectNumber' }, + { label: "nextAction", prop: 'nextAction' }, + { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, + // { 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: "arriveNoticeNumber" }, - // { label: "承接用户", prop: 'acceptUserName' }, - // { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - // { label: "完成用户", prop: 'completeUserName' }, - // { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - // { label: "上游任务编号", prop: 'upStreamJobNumber' }, - // { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, - // { label: "优先级", prop: 'priority' }, - // { label: "优先级增量", prop: 'priorityIncrement' }, - // { label: "工作组", prop: 'workGroupCode' }, - // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - // { label: "承接者ID", prop: 'acceptUserId' }, - // { label: "完成者ID", prop: 'completeUserId' }, - // { label: "任务描述", prop: 'jobDescription' }, - // { label: "检验单号", prop: 'inspectNumber' }, - // { label: "要货计划单号", prop: 'rpNumber' }, - // { label: "nextAction", prop: 'nextAction' }, + // { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, + // { label: "生效日期", prop: "activeDate",type: "dateTime" }, // { label: "仓库", prop: 'warehouseCode' }, // { label: "公司", prop: 'company' }, - // { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, + // { label: "要货计划单号", prop: 'rpNumber' }, // ----------------------------------------------------------------------- ] // 检验记录 20230407 @@ -1074,10 +1074,11 @@ export const unqualifiedToQualifiedNote = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 采购上架记录 已调整 20221220 +// 采购上架记录 20230410 export const PutawayNote = [ { label: "上架记录单号", prop: 'number' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- { label: "备注", prop: 'remark' }, @@ -1090,14 +1091,14 @@ export const PutawayNote = [ { label: "供应商代码", prop: 'supplierCode' }, { label: "检验单号", prop: 'inspectNumber' }, { label: "收货单号", prop: 'receiptNumber' }, - { label: "到货单号", prop: 'arriveNoticeNumber' }, { label: "发货单号", prop: 'asnNumber' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "完工收货单号", prop: 'productReceiptNumber' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, { label: "type", prop: 'type' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, + // { label: "到货单号", prop: 'arriveNoticeNumber' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 人工叫料申请 已调整 20221220 @@ -2495,7 +2496,7 @@ export const customerStorageAllocationRequest = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 客户储位调拨确认 已调整 1 +// 客户储位调拨确认 20230410 export const customerStorageAllocationConfirm = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, @@ -2511,14 +2512,14 @@ export const customerStorageAllocationConfirm = [ { label: "上次修改者ID", prop: "lastModifierId" }, { 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 +// 客户储位调拨记录 20230410 export const customerStorageAllocationNote = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, @@ -2526,22 +2527,22 @@ export const customerStorageAllocationNote = [ { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, + { 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: "任务ID", prop: 'jobNumber' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "事务ID", prop: "tenantId" }, { label: "调拨类型", prop: 'type' }, - { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "公司", prop: 'company' }, { label: "ID", prop: 'id' }, + { label: "备注", prop: 'remark' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: "warehouseCode" }, // ----------------------------------------------------------------------- ] -// 储位内移库记录 已调整 1 +// 储位内移库记录 20230410 export const intraStorageTransferNote = [ { label: "移库单号", prop: "number" }, { label: "移库时间", prop: "activeDate",type:"dateTime" }, @@ -2556,12 +2557,12 @@ export const intraStorageTransferNote = [ { label: "申请单号", prop: 'requestNumber' }, { label: "事务ID", prop: "tenantId" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "仓库", prop: "warehouseCode" }, - { label: "公司", prop: 'company' }, { label: "备注", prop: 'remark' }, { label: "任务ID", prop: 'jobNumber' }, - { label: "类型", prop: 'type' }, + { label: "type", prop: 'type' }, { label: "ID", prop: 'id' }, + // { label: "仓库", prop: "warehouseCode" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 线边仓缴库申请 已调整 1