From 0feb4d9231078ff034feb16ad7ece4ad7df4d6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 17 Apr 2023 14:16:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86+=E6=B1=87=E6=80=BB=E8=A1=A8?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E9=9A=90=E8=97=8F=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=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 | 1032 ++++++------------ fe/PC/src/utils/summaryTableColumns/index.js | 33 +- 2 files changed, 360 insertions(+), 705 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 718f06e1f..b88ee462b 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -15,9 +15,11 @@ export const Dict = [ { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "主表ID", prop: 'masterId' }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: 'masterId' }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 原料管理 @@ -45,18 +47,18 @@ export const SupplierAsn = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "标包数量", prop: 'stdPackQty' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, { label: "供应商包装计量单位", prop: 'supplierPackUom' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "转换率", prop: 'convertRate' }, { label: "筹措员代码", prop: 'planUserCode' }, { label: "备注", prop: 'remark' }, - { label: "ID", prop: 'id' }, { label: "创建者ID", prop: 'creatorId' }, - { label: "主表ID", prop: 'masterID' }, { label: "事务ID", prop: "tenantId" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: 'masterID' }, + // ************** 确定隐藏 ************************ ] // 采购订单信息 20230404 @@ -92,13 +94,14 @@ export const PurchaseOrder = [ { label: "备注", prop: 'remark' }, { label: "订单备注", prop: 'orderRemark' }, { label: "事务ID", prop: "tenantId" }, - { label: "lineStatus", prop: 'lineStatus' }, - { label: "ID", prop: 'id' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建者ID", prop: 'creatorId' }, - { label: "主表ID", prop: 'masterID' }, // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "lineStatus", prop: 'lineStatus' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: 'masterID' }, + // ************** 确定隐藏 ************************ ] // 到货请求 20230404 export const PurchaseReceiptRequest = [ @@ -116,28 +119,25 @@ export const PurchaseReceiptRequest = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type:'dateTime' }, { label: "创建者ID", prop: "creatorId" }, - // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth }, + // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },//使用主表信息 { label: "订单号", prop:'poNumber', width: orderWidth }, // ----------------------------------------------------------------------- { label: "单据号", prop:'number', width: orderWidth }, { label: "备注", prop:'remark'}, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "公司", prop: 'company' }, { label: "供应商批次", prop: 'supplierBatch' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "订单行", prop: 'poLine' }, { label: "供应商包装计量单位", prop:'supplierPackUom' }, { label: "供应商包装数量", prop:'supplierPackQty' }, { label: "转换率", prop: 'convertRate' }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: 'masterID' }, - // { label: "项目编号", prop: "projectCode" }, // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: 'masterID' }, + // ************** 确定隐藏 ************************ ] // 采购收货任务 20230404 export const PurchaseReceiptJob = [ @@ -155,7 +155,6 @@ export const PurchaseReceiptJob = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "主表ID", prop: 'masterID' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "实际箱码", prop: 'handledPackingCode' }, @@ -187,27 +186,14 @@ export const PurchaseReceiptJob = [ { label: "到货时间", prop: 'arriveDate',type: "dateTime" }, { label: "供应商包装计量单位", prop: 'supplierPackUom' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "ID", prop: "id" }, - { label: "status", prop: 'status' }, { label: "创建者ID", prop: "creatorId" }, { label: "事务ID", prop: "tenantId" }, - // { label: "推荐箱码", prop: 'recommendPackingCode' }, - // { label: "实际库位", prop: 'handledLocationCode' }, - // { label: "推荐库位组", prop: 'recommendLocationGroup' }, - // { label: "实际库位组", prop: 'handledLocationGroup' }, - // { label: "推荐库区", prop: 'recommendLocationArea' }, - // { label: "实际库区", prop: 'handledLocationArea' }, - // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - // { label: "推荐计量单位", prop: 'recommendUom' }, - // { label: "实际计量单位", prop: 'handledUom' }, - // { label: "推荐数量", prop: 'recommendQty' }, - // { label: "仓库", prop: 'warehouseCode' }, // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" }, - // { label: "推荐库位", prop: 'recommendLocationCode' }, - // { label: "物品单位", prop: "recommendUom" }, - // { label: "ERP库位", prop: "recommendErpCode" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: "id" }, + // { label: "主表ID", prop: 'masterID' }, + // ************** 确定隐藏 ************************ ] // 报检单 20230410 export const InspectRequest = [ @@ -243,9 +229,7 @@ export const InspectRequest = [ { label: "检验数量", prop: 'inspectQty' }, { label: "AbcClass类别", prop: 'abcClass' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, - { label: "ID", prop: "id" }, { label: "不合格原因代码", prop: 'failedReason' }, { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, { label: "破坏数量", prop: 'crackQty' }, @@ -258,16 +242,10 @@ export const InspectRequest = [ { label: "重量", prop: 'weight' }, { label: "其他属性", prop: 'otherPropertyJson' }, // { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" }, - // { label: "检验人姓名", prop: 'inspectUserName' }, - // { label: "检验人电话", prop: 'inspectUserPhone' }, - // { label: "检验人邮件", prop: 'inspectUserEmail' }, - // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, - // { label: "供应商包装数量", prop: 'supplierPackQty' }, - // { label: "物品单位", prop: "receiveUom" }, - // { label: "附加属性", prop: "attributes" }, - // { label: "完成时间", prop: "completeTime",type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: "id" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 检验记录 20230407 export const InspectNote = [ @@ -309,24 +287,16 @@ export const InspectNote = [ { label: "检验数量", prop: 'inspectQty' }, { label: "AbcClass类别", prop: 'abcClass' }, { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, - { label: "ID", prop: "id" }, { label: "其他属性", prop: 'otherPropertyJson' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "检验人邮件", prop: 'inspectUserEmail' }, - // { label: "检验人姓名", prop: 'inspectUserName' }, - // { label: "检验人电话", prop: 'inspectUserPhone' }, - // { label: "其他详情", fixed: "left", type: "button" }, - // { label: "物品单位", prop: "receiveUom" }, - // { label: "外观", prop: 'appearance' }, - // { label: "尺寸", prop: 'volume' }, - // { label: "重量", prop: 'weight' }, // { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, // { label: "不合格原因代码", prop: 'failedReason' }, // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: "id" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 不合格转合格记录 已调整 20230407 @@ -344,8 +314,6 @@ export const unqualifiedToQualifiedNote = [ { label: "ERP库位", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- { label: "转合格单号", prop: "number",width: orderWidth }, - // { label: "发货单号", prop: "asnNumber",width: orderWidth }, - // { label: "标包单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "来源批次", prop: 'fromLot' }, @@ -360,22 +328,18 @@ export const unqualifiedToQualifiedNote = [ { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, - // { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth }, - // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, - // { label: "订单号", prop: 'poNumber',width: orderWidth }, - // { label: "供应商代码", prop: 'supplierCode' }, { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "检验完成时间", prop: "completeTime",type: "dateTime" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 采购上架记录 20230410 export const PutawayNote = [ @@ -439,26 +403,12 @@ export const PutawayNote = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 人工叫料申请 20230411 export const IssueRequest = [ @@ -486,21 +436,13 @@ export const IssueRequest = [ { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "请求未发", prop: 'toBeIssuedQty' }, { label: "已发未收", prop: 'toBeReceivedQty' }, { label: "请求未收", prop: 'notFinishQty' }, - // { label: "目标库区", prop: 'toLocationArea' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "目标库位组", prop: 'toLocationGroup' }, - // { label: "在途库位", prop: 'onTheWayLocationCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // 批次占位 - // 箱码占位 - // 来源库位占位 - // 来源ERP库位 - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 人工发料任务 20230411 export const IssueJob = [ @@ -553,34 +495,17 @@ export const IssueJob = [ { label: "工作中心", prop: 'workStation' }, { label: "过期时间", prop: 'expiredTime' }, { label: "工序", prop: 'operation' }, - { label: "distributionType", prop: 'distributionType' }, - { label: "truncType", prop: 'truncType' }, { label: "取整后数量", prop: 'roundedQty' }, - { label: "plannedSplitRule", prop: 'plannedSplitRule' }, { label: "计划开始时间", prop: 'planBeginTime' }, { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: "masterID" }, - { label: "事务ID", prop: "tenantId" }, - // { label: "单位", prop: "recommendUom" }, - // { label: "标包单位", prop: "stdPackUom" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "状态", prop: 'status' }, - // { label: "库位组", prop: 'locationGroup' }, - // { label: "库区", prop: 'locationArea' }, - // { label: "ERP库位", prop: 'locationErpCode' }, - // { label: "推荐库位", prop: "recommendLocationCode" }, - // { label: "实际库位", prop: "handledLocationCode" }, - // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "推荐库位组", prop: 'recommendLocationGroup' }, - // { label: "实际库位组", prop: 'handledLocationGroup' }, - // { label: "推荐库区", prop: 'recommendLocationArea' }, - // { label: "实际库区", prop: 'handledLocationArea' }, - // { label: "推荐计量单位", prop: 'recommendUom' }, - // { label: "实际计量单位", prop: 'handledUom' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "distributionType", prop: 'distributionType' }, + // { label: "plannedSplitRule", prop: 'plannedSplitRule' }, + // { label: "truncType", prop: 'truncType' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 人工发料记录 20230411 export const IssueNote = [ @@ -618,13 +543,9 @@ export const IssueNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, @@ -649,11 +570,12 @@ export const IssueNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 自动叫料申请 20230411 export const automaticCallApply = [ @@ -681,21 +603,13 @@ export const automaticCallApply = [ { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "请求未发", prop: 'toBeIssuedQty' }, { label: "已发未收", prop: 'toBeReceivedQty' }, { label: "请求未收", prop: 'notFinishQty' }, - // { label: "目标库区", prop: 'toLocationArea' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "目标库位组", prop: 'toLocationGroup' }, - // { label: "在途库位", prop: 'onTheWayLocationCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // 批次占位 - // 箱码占位 - // 来源库位占位 - // 来源ERP库位 - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 自动发料任务 20230411 export const automaticCallJob = [ @@ -748,34 +662,17 @@ export const automaticCallJob = [ { label: "工作中心", prop: 'workStation' }, { label: "过期时间", prop: 'expiredTime' }, { label: "工序", prop: 'operation' }, - { label: "distributionType", prop: 'distributionType' }, - { label: "truncType", prop: 'truncType' }, { label: "取整后数量", prop: 'roundedQty' }, - { label: "plannedSplitRule", prop: 'plannedSplitRule' }, { label: "计划开始时间", prop: 'planBeginTime' }, { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: "masterID" }, - { label: "事务ID", prop: "tenantId" }, - // { label: "单位", prop: "recommendUom" }, - // { label: "标包单位", prop: "stdPackUom" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "状态", prop: 'status' }, - // { label: "库位组", prop: 'locationGroup' }, - // { label: "库区", prop: 'locationArea' }, - // { label: "ERP库位", prop: 'locationErpCode' }, - // { label: "推荐库位", prop: "recommendLocationCode" }, - // { label: "实际库位", prop: "handledLocationCode" }, - // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "推荐库位组", prop: 'recommendLocationGroup' }, - // { label: "实际库位组", prop: 'handledLocationGroup' }, - // { label: "推荐库区", prop: 'recommendLocationArea' }, - // { label: "实际库区", prop: 'handledLocationArea' }, - // { label: "推荐计量单位", prop: 'recommendUom' }, - // { label: "实际计量单位", prop: 'handledUom' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "plannedSplitRule", prop: 'plannedSplitRule' }, + // { label: "distributionType", prop: 'distributionType' }, + // { label: "truncType", prop: 'truncType' }, + // ************** 确定隐藏 ************************ ] // 自动发料记录 20230411 export const automaticCallNote = [ @@ -813,13 +710,9 @@ export const automaticCallNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, @@ -844,10 +737,12 @@ export const automaticCallNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ // ----------------------------------------------------------------------- ] // 上架前退货记录 20230412 @@ -883,10 +778,7 @@ export const beforeGroundingReturnNote = [ { label: "库位组", prop: 'locationGroup' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, - { label: "status", prop: 'status' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -909,9 +801,11 @@ export const beforeGroundingReturnNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 上架后退货申请 20230412 export const PurchaseReturnRequest = [ @@ -941,14 +835,13 @@ export const PurchaseReturnRequest = [ { label: "库位组", prop: 'locationGroup' }, { 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' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 上架后退货任务 20230412 export const PurchaseReturnJob = [ @@ -984,9 +877,6 @@ export const PurchaseReturnJob = [ { 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' }, @@ -997,19 +887,11 @@ export const PurchaseReturnJob = [ { 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' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 上架后退货记录 20230412 export const PurchaseReturnNote = [ @@ -1044,10 +926,7 @@ export const PurchaseReturnNote = [ { label: "库位组", prop: 'locationGroup' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, - { label: "status", prop: 'status' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, { label: "实际库位", prop: 'handledFromLocationCode' }, @@ -1070,9 +949,11 @@ export const PurchaseReturnNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 原料报废记录 20230412 export const ScrapNote = [ @@ -1110,16 +991,13 @@ export const ScrapNote = [ { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { 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' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 原料直发客户记录 20230412 export const materialDirectSendNote = [ @@ -1155,11 +1033,7 @@ export const materialDirectSendNote = [ { label: "目标库位组", prop: 'toLocationGroup' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, @@ -1184,14 +1058,12 @@ export const materialDirectSendNote = [ { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "发料时间", prop: 'issueTime', type: "dateTime" }, - // { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, - // { label: "生产线", prop: 'prodLine' }, - // { label: "工作中心", prop: 'workStation' }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 直接发料记录 20230413 export const directIssueNote = [ @@ -1229,13 +1101,9 @@ export const directIssueNote = [ { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "发料时间", prop: 'issueTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "ID", prop: 'id' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, { label: "推荐数量", prop: 'recommendQty' }, { label: "实际批次", prop: "handledLot" }, @@ -1260,11 +1128,12 @@ export const directIssueNote = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 成品管理 @@ -1298,13 +1167,11 @@ export const ProductReceiptRequest = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "Bom版本", prop: 'bomVersion' }, { label: "仓库", prop: "warehouseCode" }, - { label: "ID", prop: "id" }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - // { label: "库区", prop: 'areaCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "公司", prop: 'company' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: "id" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 完工收货缴库记录 20230413 export const ProductReceiptNote = [ @@ -1363,12 +1230,11 @@ export const ProductReceiptNote = [ { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "原料库位", prop: 'rawLocation' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 完工收货报废申请 20230412 export const ProductReceiptScrapRequest = [ @@ -1380,7 +1246,7 @@ export const ProductReceiptScrapRequest = [ { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, { label: "库位", prop:"locationCode" }, - { label: "Erp库位", prop: 'locationErpCode' }, + { label: "ERP库位", prop: 'locationErpCode' }, { label: "库位组", prop: 'locationGroup' }, { label: "报废原因代码", prop:"reasonCode" }, { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" }, @@ -1393,11 +1259,11 @@ export const ProductReceiptScrapRequest = [ { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "仓库代码", prop: "warehouseCode" }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 完工收货报废记录 20230412 export const ProductReceiptScrapNote = [ @@ -1435,16 +1301,13 @@ export const ProductReceiptScrapNote = [ { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { 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' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 半成品上架记录 20230415 export const partiallyPreparedProductsNote = [ @@ -1508,26 +1371,12 @@ export const partiallyPreparedProductsNote = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 成品发货申请 20230414 export const DeliverRequest = [ @@ -1546,11 +1395,11 @@ export const DeliverRequest = [ { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 成品发货任务 20230414 export const DeliverJob = [ @@ -1581,9 +1430,6 @@ export const DeliverJob = [ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "status", prop: 'status' }, - { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, @@ -1601,22 +1447,11 @@ export const DeliverJob = [ { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标库位组", prop: 'toLocationGroup' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "单位", prop: "recommendUom" }, - // { label: "出货库区", prop: "recommendLocationArea" }, - // { label: "ERP库位", prop: "recommendLocationErpCode" }, - // { label: "推荐库位", prop: 'recommendLocationCode' }, - // { label: "实际库位", prop: 'handledLocationCode' }, - // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - // { label: "推荐库区", prop: 'recommendLocationArea' }, - // { label: "实际库区", prop: 'handledLocationArea' }, - // { label: "推荐库位组", prop: 'recommendLocationGroup' }, - // { label: "实际库位组", prop: 'handledLocationGroup' }, - // { label: "推荐计量单位", prop: 'recommendUom' }, - // { label: "实际计量单位", prop: 'handledUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "status", prop: 'status' }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 成品发货记录 20230414 export const DeliverNote = [ @@ -1650,8 +1485,6 @@ export const DeliverNote = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, // ----------------------------------------------------------------------- { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, @@ -1669,8 +1502,6 @@ export const DeliverNote = [ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, { label: "推荐分组", prop: 'recommendFromLocationGroup' }, @@ -1681,13 +1512,12 @@ export const DeliverNote = [ { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - // { label: "客户代码", showProp:"customerCode", type:"outerMainFilter", width: orderWidth }, - // { label: "客户地址", showProp:"customerAddressCode", type:"outerMainFilter", width: orderWidth }, - // { label: "来源ERP库位", prop: 'fromLocationErpCode' }, - // { label: "来源库位", prop: 'fromLocationCode' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // FIS发货申请 20230414 export const FISDeliverRequest = [ @@ -1706,13 +1536,12 @@ export const FISDeliverRequest = [ { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' }, - // { label: "截止底盘号",prop: 'extraProperties',type:"object", showProp: 'ToVinCode' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // FIS发货记录 20230415 export const FISDeliverNote = [ @@ -1746,8 +1575,6 @@ export const FISDeliverNote = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, // ----------------------------------------------------------------------- { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, @@ -1765,8 +1592,6 @@ export const FISDeliverNote = [ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "推荐区域", prop: 'recommendFromLocationArea' }, { label: "推荐分组", prop: 'recommendFromLocationGroup' }, @@ -1777,13 +1602,12 @@ export const FISDeliverNote = [ { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - // { label: "客户代码", showProp:"customerCode", type:"outerMainFilter", width: orderWidth }, - // { label: "客户地址", showProp:"customerAddressCode", type:"outerMainFilter", width: orderWidth }, - // { label: "来源ERP库位", prop: 'fromLocationErpCode' }, - // { label: "来源库位", prop: 'fromLocationCode' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 客户退拆申请 20230415 export const customerDismantle = [ @@ -1811,14 +1635,11 @@ export const customerDismantle = [ { label: "原料库区", prop: 'rawLocationArea' }, { label: "原料仓库", prop: 'rawWarehouseCode' }, { label: "仓库代码", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, - // { label: "转移工时", prop: "workHour" }, - // { label: "转移料号（子零件号）", prop: 'rawItemCode' }, - // { label: "转移量（子零件）", prop: 'rawQty' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 生产退库申请 20230415 export const productionReturnRequest = [ @@ -1855,19 +1676,13 @@ export const productionReturnRequest = [ { label: "来源库区", prop: 'fromLocationArea' }, { 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: "status", prop: 'status' }, - // { label: "库区", prop: 'locationArea' }, - // { label: "库位组", prop: 'locationGroup' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "数量", prop: 'qty' }, - // { label: "箱码", prop: 'packingCode' }, - // { label: "来源库位", prop: 'locationCode' }, - // { label: "来源ERP库位", prop: 'locationErpCode' }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 生产退库任务 20230415 export const productionReturnJob = [ @@ -1914,29 +1729,12 @@ export const productionReturnJob = [ { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "status", prop: 'status' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, - // { label: "采购订单号", prop: 'poNumber',width:orderWidth }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "单位", prop: 'recommendUom' }, - // { label: "来源库位", prop: 'recommendLocationCode' }, - // { label: "目标库位", prop: 'toLocationCode' }, - // { label: "来源ERP库位", prop: 'recommendLocationErpCode' }, - // { label: "目标ERP库位", prop: 'toLocationErpCode' }, - // { label: "推荐批次", prop: 'recommendLot' }, - // { label: "实际库位", prop: 'handledLocationCode' }, - // { label: "推荐库区", prop: 'recommendLocationArea' }, - // { label: "实际库区", prop: 'handledLocationArea' }, - // { label: "推荐库位组", prop: 'recommendLocationGroup' }, - // { label: "实际库位组", prop: 'handledLocationGroup' }, - // { label: "推荐计量单位", prop: 'recommendUom' }, - // { label: "实际计量单位", prop: 'handledUom' }, - // { label: "推荐数量", prop: 'recommendQty' }, - // { label: "到库位组", prop: 'toLocationGroup' }, - // { label: "到库区", prop: 'toLocationArea' }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // ************** 确定隐藏 ************************ ] // 生产退库记录 20230413 export const productionReturnNote = [ @@ -1997,14 +1795,13 @@ export const productionReturnNote = [ { label: "实际仓库", prop: "handledToWarehouseCode" }, { label: "推荐数量", prop: "recommendQty" }, { label: "实际数量", prop: "handledQty" }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "采购订单号", prop: 'poNumber', width:orderWidth }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 库存管理 @@ -2036,18 +1833,12 @@ export const pickingRequest = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "主表ID", prop: "masterID" }, - { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "ID", prop: 'id' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 非生产领料审批 20230417 export const pickingApproval = [ @@ -2076,18 +1867,12 @@ export const pickingApproval = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "主表ID", prop: "masterID" }, - { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "ID", prop: 'id' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 非生产领料记录 20230417 export const pickingNote = [ @@ -2141,19 +1926,12 @@ export const pickingNote = [ { label: "实际分组", prop: 'handledFromLocationGroup' }, { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "库位代码", prop: 'locationCode' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 非生产退料申请 20230417 export const materialReturnRequest = [ @@ -2181,20 +1959,12 @@ export const pickingNote = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - // ----------------------------------------------------------------------- - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "库位代码", prop: 'locationCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 非生产退料审批 20230417 export const materialReturnApproval = [ @@ -2222,20 +1992,12 @@ export const materialReturnApproval = [ { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - // ----------------------------------------------------------------------- - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "库位代码", prop: 'locationCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 非生产退料记录 20230417 export const materialReturnNote = [ @@ -2289,19 +2051,12 @@ export const materialReturnNote = [ { label: "推荐仓库", prop: "recommendToWarehouseCode" }, { label: "实际仓库", prop: "handledToWarehouseCode" }, { label: "备注", prop: 'remark' }, - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, - { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' }, - // { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' }, - // { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' }, - // { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' }, - // { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' }, - // { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' }, - // { label: "库位代码", prop: 'locationCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 回收料收货记录 20230415 export const recycledMaterialsReceipt = [ @@ -2331,12 +2086,12 @@ export const recycledMaterialsReceipt = [ { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "原因代码", prop: 'reasonCode' }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "status", prop: 'status' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 回收料调整申请 20230415 export const recycledMaterialsAdjustmentApply = [ @@ -2383,18 +2138,13 @@ export const recycledMaterialsAdjustmentApply = [ { 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" }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "ID", prop: "id" }, + // { label: "fromStatus", prop: "fromStatus" }, + // { label: "toStatus", prop: "toStatus" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 回收料调整记录 20230415 export const materialsAdjustment = [ @@ -2442,17 +2192,13 @@ export const materialsAdjustment = [ { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { 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: "来源单位", prop: "fromUom" }, - // { label: "目标单位", prop: "toUom" }, - // { label: "从仓库", prop: "warehouseCode" }, + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "ID", prop: "id" }, + // { label: "fromStatus", prop: "fromStatus" }, + // { label: "toStatus", prop: "toStatus" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 线边仓调拨申请 20230417 export const lineSideWarehouseAllocationRequest = [ @@ -2489,19 +2235,13 @@ export const lineSideWarehouseAllocationRequest = [ { 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: 'stdPackUom' }, - // { label: "在途库位", prop: "inTransitLocation" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "正厂编码", prop: "supllierItemCode" }, - // { label: "部门代号", prop: "departmentCode" }, - // { label: "交易码", prop: "transactioncode" }, - // { label: "次交易码", prop: "secondaryTransactioncode" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 线边仓调拨确认 20230417 export const lineSideWarehouseAllocationConfirm = [ @@ -2538,19 +2278,14 @@ export const lineSideWarehouseAllocationConfirm = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 线边仓调拨记录 20230417 export const lineSideWarehouseAllocationNote = [ @@ -2587,19 +2322,14 @@ export const lineSideWarehouseAllocationNote = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 储位调拨记录 20230417 export const interStorageAllocationNote = [ @@ -2636,19 +2366,14 @@ export const interStorageAllocationNote = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 客户储位调拨申请 20230410 export const customerStorageAllocationRequest = [ @@ -2685,19 +2410,13 @@ export const customerStorageAllocationRequest = [ { 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: 'stdPackUom' }, - // { label: "在途库位", prop: "inTransitLocation" }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "正厂编码", prop: "supllierItemCode" }, - // { label: "部门代号", prop: "departmentCode" }, - // { label: "交易码", prop: "transactioncode" }, - // { label: "次交易码", prop: "secondaryTransactioncode" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 客户储位调拨确认 20230410 export const customerStorageAllocationConfirm = [ @@ -2734,19 +2453,14 @@ export const customerStorageAllocationConfirm = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 客户储位调拨记录 20230410 export const customerStorageAllocationNote = [ @@ -2783,19 +2497,14 @@ export const customerStorageAllocationNote = [ { 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" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 储位内移库记录 20230410 export const intraStorageTransferNote = [ @@ -2832,15 +2541,14 @@ export const intraStorageTransferNote = [ { 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: 'stdPackUom' }, - // { label: "仓库", prop: 'warehouseCode' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 线边仓缴库申请 20230415 export const lineSideWarehousePaymentRequest = [ @@ -2871,13 +2579,11 @@ export const lineSideWarehousePaymentRequest = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "Bom版本", prop: 'bomVersion' }, { label: "仓库", prop: "warehouseCode" }, - { label: "ID", prop: "id" }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - // { label: "库区", prop: 'areaCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "公司", prop: 'company' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: "id" }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 线边仓缴库记录 20230415 export const lineSideWarehousePaymentNote = [ @@ -2936,12 +2642,11 @@ export const lineSideWarehousePaymentNote = [ { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "status", prop: 'status' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "原料库位", prop: 'rawLocation' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "status", prop: 'status' }, + // ************** 确定隐藏 ************************ ] // 线边仓报废申请 20230412 export const lineSideWarehouseScrappingRequest = [ @@ -2953,7 +2658,7 @@ export const lineSideWarehouseScrappingRequest = [ { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, { label: "库位", prop:"locationCode" }, - { label: "Erp库位", prop: 'locationErpCode' }, + { label: "ERP库位", prop: 'locationErpCode' }, { label: "库位组", prop: 'locationGroup' }, { label: "报废原因代码", prop:"reasonCode" }, { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" }, @@ -2966,11 +2671,11 @@ export const lineSideWarehouseScrappingRequest = [ { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "仓库代码", prop: "warehouseCode" }, - { label: "主表ID", prop: "masterID" }, { label: "事务ID", prop: "tenantId" }, - { label: "ID", prop: 'id' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 线边仓报废记录 20230412 export const lineSideWarehouseScrappingNote = [ @@ -3008,16 +2713,13 @@ export const lineSideWarehouseScrappingNote = [ { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { 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' }, - // ----------------------------------------------------------------------- + { label: "事务ID", prop: "tenantId" }, + // ************** 确定隐藏 ************************ + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // ************** 确定隐藏 ************************ ] // 线边仓调整申请 20230417 export const lineSideWarehouseAdjustmentSheetRequest = [ @@ -3055,19 +2757,13 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "库区", prop: "locationArea" }, - // { label: "库位组", prop: 'locationGroup' }, - // { label: "调整库位", prop: 'locationCode' }, - // { label: "ERP库位", prop:"locationErpCode" }, - // ----------------------------------------------------------------------- - + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 确定隐藏 ************************ ] // 线边仓调整记录 20230417 export const lineSideWarehouseAdjustmentSheetNote = [ @@ -3106,31 +2802,17 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "事务ID", prop: "tenantId" }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: 'id' }, - // ************** 临时隐藏 ************************ + { label: "事务ID", prop: "tenantId" }, + // { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + // { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: 'id' }, // { label: "标包数量", prop: 'stdPackQty' }, // { label: "fromStatus", prop: 'fromStatus' }, // { label: "toStatus", prop: 'toStatus' }, - // ************** 临时隐藏 ************************ - // { label: "仓库", prop: 'warehouseCode' }, - // { label: "盘点标签", prop: "containerCode" }, - // { label: "盘点数量", prop: "countQty" }, - // { label: "箱码", prop: "packingCode" }, - // { label: "库区", prop: "locationArea" }, - // { label: "库位组", prop: 'locationGroup' }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "批次", prop: "lot" }, - // { label: "库存数量", prop: "inventoryQty" }, - // { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, - // { label: "数量", prop: "adjustQty" }, - // { label: "单位", prop: "inventoryUom" }, - // { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, - // { label: "调整库位", prop: 'locationCode' }, - // { label: "ERP库位", prop:"locationErpCode" }, - // ----------------------------------------------------------------------- -] + // ************** 确定隐藏 ************************ + ] // 库存初始化记录 export const InventoryInitialNote = [ { label: "单据号", prop: "number" }, @@ -3163,9 +2845,10 @@ export const InventoryInitialNote = [ { label: "监盘操作员", prop: 'auditCountOperator' }, { label: "监盘描述", prop: 'auditCountDescription' }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 盘点计划 20240415 export const CountPlan = [ @@ -3212,13 +2895,12 @@ export const CountPlan = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - { label: "status", prop: "status" }, - // { label: "包装单位", prop: "stdPackUom" }, - // { label: "库存单位", prop: "inventoryUom" }, // { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // { label: "status", prop: "status" }, + // ************** 确定隐藏 ************************ ] // 盘点任务 20230415 export const CountJob = [ @@ -3255,13 +2937,10 @@ export const CountJob = [ { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "盘点标签", prop: "countLabel" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "库存单位", prop: "inventoryUom" }, - // { label: "包装单位", prop: "stdPackUom" }, - // { label: "监盘操作员", prop: 'auditCountOperator' }, - // { label: "监盘描述", prop: 'auditCountDescription' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 盘点记录 20230415 export const CountNote = [ @@ -3311,12 +2990,10 @@ export const CountNote = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "库存单位", prop: "inventoryUom" }, - // { label: "盘点描述", prop: "countDescription" }, - // { label: "包装单位", prop: "stdPackUom" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 盘点调整申请 20230415 export const CountPlanAdjust = [ @@ -3351,11 +3028,10 @@ export const CountPlanAdjust = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "包装单位", prop: "stdPackUom" }, - // { label: "库存单位", prop: "inventoryUom" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] // 盘点调整记录 20230415 export const CountAdjustNote = [ @@ -3393,12 +3069,8 @@ export const CountPlanAdjust = [ { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "盘点标签", prop: "countLabel" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "主表ID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "库存单位", prop: "inventoryUom" }, - // { label: "生产日期", prop: "produceDate",type:"dateTime" }, - // { label: "操作员", showProp:"worker",type:"outerMainFilter" }, - // { label: "包装单位", prop: "stdPackUom" }, - // { label: "供应商批次", prop: "supplierBatch" }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "主表ID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] \ No newline at end of file diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index 463d74838..ff7ccf4e1 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -23,7 +23,6 @@ export const InspectRequest = [ { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "主表ID", prop: "masterID" }, { label: "备注", prop: 'remark' }, { label: "计量单位", prop: 'uom' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -39,19 +38,12 @@ export const InspectRequest = [ { label: "检验报告", prop: 'inspectReport' }, { 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: 'supplierPackUom' }, - // { label: "供应商包装数量", prop: 'supplierPackQty' }, - // { label: "物品单位", prop: "receiveUom" }, - // { label: "完成时间", prop: "completeTime",type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "ID", prop: 'id' }, + // { label: "主表ID", prop: "masterID" }, + // ************** 确定隐藏 ************************ ] // 检验记录 字段需要确定 export const InspectNote = [ @@ -87,17 +79,8 @@ export const InspectNote = [ { label: "最终不合格数量", prop: 'notPassedQty' }, { label: "事务ID", prop: "tenantId" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, - { label: "masterID", prop: "masterID" }, - { label: "ID", prop: "id" }, - // { label: "物品描述2", prop: "itemDesc2" }, - // { label: "创建时间", prop: "completeTime",type: "dateTime" }, - // { label: "标包计量单位", prop: 'stdPackUom' }, - // { label: "检验人邮件", prop: 'inspectUserEmail' }, - // { label: "检验人姓名", prop: 'inspectUserName' }, - // { label: "检验人电话", prop: 'inspectUserPhone' }, - // { label: "物品单位", prop: 'receiveUom' }, - // { label: "外观", prop: 'appearance' }, - // { label: "尺寸", prop: 'volume' }, - // { label: "重量", prop: 'weight' }, - // ----------------------------------------------------------------------- + // ************** 确定隐藏 ************************ + // { label: "masterID", prop: "masterID" }, + // { label: "ID", prop: "id" }, + // ************** 确定隐藏 ************************ ] \ No newline at end of file