From 94ea5797e7196c68ad08935d60384b4480089c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 6 Dec 2024 17:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90agv-pc=E3=80=91=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=89=B9=E6=AC=A1=E7=AD=89=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 | 92 +++++++++---------- fe/PC/src/utils/summaryTableColumns/index.js | 4 +- fe/PC/src/utils/tableColumns/index.js | 24 ++--- fe/PC/src/utils/tabsDesTions/index.js | 16 ++-- .../Count/CountJob-msQuery.vue | 2 +- .../libraryShiftSearch.vue | 2 +- 6 files changed, 70 insertions(+), 70 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index ef03d3551..636ebfcc5 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -99,7 +99,7 @@ export const SupplierAsn = [ { label: "订单行", prop: 'poLine', width: orderWidth }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "筹措员代码", prop: 'planUserCode' }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, @@ -122,7 +122,7 @@ export const PurchaseReceiptRequest = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "订单号", prop:'poNumber', width: orderWidth }, { label: "单据号", prop:'number', width: orderWidth }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "订单行", prop: 'poLine' }, { label: "供应商包装数量", prop:'supplierPackQty' }, @@ -409,8 +409,8 @@ export const IssueJob = [ { label: "到库区", prop: 'toLocationArea' }, { label: "到库位组", prop: 'toLocationGroup' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -452,7 +452,7 @@ export const IssueNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期日期", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, @@ -476,8 +476,8 @@ export const IssueNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐批次", prop: "recommendLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -546,8 +546,8 @@ export const automaticCallJob = [ { label: "到库区", prop: 'toLocationArea' }, { label: "到库位组", prop: 'toLocationGroup' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -589,7 +589,7 @@ export const automaticCallNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期日期", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, @@ -613,8 +613,8 @@ export const automaticCallNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐批次", prop: "recommendLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -644,7 +644,7 @@ export const beforeGroundingReturnNote = [ { label: "单据号", prop: 'number' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, // { label: "备注", prop: 'remark' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, @@ -821,7 +821,7 @@ export const ScrapNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -902,7 +902,7 @@ export const directIssueNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期日期", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, @@ -926,8 +926,8 @@ export const directIssueNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐批次", prop: "recommendLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -960,7 +960,7 @@ export const ProductReceiptRequest = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "申请编号", prop: 'number' }, { label: "批次", prop: 'lot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "Bom版本", prop: 'bomVersion' }, @@ -1062,7 +1062,7 @@ export const ProductReceiptScrapNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -1085,7 +1085,7 @@ export const partiallyPreparedProductsNote = [ { label: "单位", prop: "uom" }, { label: "来源库位", prop: "fromLocationCode" }, { label: "目标库位", prop: "toLocationCode" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "单据号", prop: 'number' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, @@ -1108,8 +1108,8 @@ export const partiallyPreparedProductsNote = [ { label: "任务编号", prop: 'jobNumber' }, { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, @@ -1167,8 +1167,8 @@ export const DeliverJob = [ { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -1213,7 +1213,7 @@ export const DeliverNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位组", prop: 'toLocationGroup' }, { label: "目标库位", prop: 'toLocationCode' }, @@ -1226,8 +1226,8 @@ export const DeliverNote = [ { label: "实际数量", prop: 'handledQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -1392,8 +1392,8 @@ export const customerDismantleJob = [ { label: "实际库位组", prop: "handledToLocationGroup" }, { label: "推荐库区", prop: "recommendToLocationArea" }, { label: "实际库区", prop: "handledToLocationArea" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, @@ -1425,7 +1425,7 @@ export const productionReturnRequest = [ { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "任务编号", prop: 'number',width:orderWidth }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "目标库位组", prop: 'toLocationGroup' }, { label: "目标库区", prop: 'toLocationArea' }, @@ -1455,8 +1455,8 @@ export const productionReturnJob = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "推荐箱码", prop: 'recommendPackingCode' }, { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, @@ -1801,8 +1801,8 @@ export const recycledMaterialsAdjustmentApply = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "目标数量", prop: "toQty" }, - { label: "从供应商批次", prop: "fromSupplierBatch" }, - { label: "到供应商批次", prop: "toSupplierBatch" }, + // { label: "从供应商批次", prop: "fromSupplierBatch" }, + // { label: "到供应商批次", prop: "toSupplierBatch" }, { label: "从到货时间", prop: "fromArriveDate",type: "dateTime" }, { label: "到到货时间", prop: "toArriveDate" ,type: "dateTime" }, { label: "从生产日期", prop: "fromProduceDate" ,type: "dateTime" }, @@ -2102,7 +2102,7 @@ export const intraStorageTransferNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -2246,7 +2246,7 @@ export const lineSideWarehouseScrappingNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -2378,7 +2378,7 @@ export const CountPlan = [ { label: "监盘操作员", prop: 'auditCountOperator' }, { label: "盘点标签", prop: "countLabel" }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number', width:orderWidth }, { label: "包装数量", prop: "stdPackQty" }, @@ -2413,7 +2413,7 @@ export const CountJob = [ { label: "单据号", prop: 'number', width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "包装数量", prop: "stdPackQty" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -2456,7 +2456,7 @@ export const CountNote = [ { label: "盘点标签", prop: "countLabel" }, { label: "是否已生成盘点调整申请", prop: "adjusted", type: "filter", filters: "whetherOrNot" }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: 'remark' }, { label: "盘点计划单号", prop: "countPlanNumber" }, { label: "单据号", prop: 'number', width:orderWidth }, @@ -2486,7 +2486,7 @@ export const CountPlanAdjust = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "原因代码", prop: "reasonCode", }, { label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number' }, { label: "包装数量", prop: "stdPackQty" }, @@ -2518,7 +2518,7 @@ export const CountPlanAdjust = [ { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "备注", prop: 'remark' }, { label: "单据号", prop: 'number', width:orderWidth }, @@ -2540,7 +2540,7 @@ export const safetyStockWarning = [ { label: _Names.itemDesc1, prop: "itemDesc1" }, { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: _Names.configuration, prop: "item_configurationFromFE" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate' ,type:"dateTime" }, { label: "生产时间", prop: 'produceDate' ,type:"dateTime" }, { label: "过期时间", prop: 'expireDate' ,type:"dateTime" }, @@ -2603,8 +2603,8 @@ export const callEmptyUtensilJob = [ { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: 'handledLot' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "实际库位", prop: 'handledFromLocationCode' }, { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, @@ -3130,8 +3130,8 @@ export const transferLibRequest = [ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + // { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + // { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, { label: "在途库库位", prop: 'onTheWayLocationCode' }, diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index f9b70e09b..505080373 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -28,7 +28,7 @@ export const InspectRequest = [ { label: "备注", prop: 'remark' }, { label: "计量单位", prop: 'uom' }, // { label: "标包数量", prop: 'stdPackQty' },//后期打开 - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -65,7 +65,7 @@ export const InspectNote = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 370f41bab..8b9f19f81 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1110,7 +1110,7 @@ export const qualifiedInfo = [ { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, // { label: "推荐批次排序", prop: "recommendLot" }, // { label: "实际批次排序", prop: "handledLot" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, @@ -1176,7 +1176,7 @@ export const unqualifiedInfo = [ { label: "批次排序", prop: "lot" }, // { label: "推荐批次排序", prop: "recommendLot" }, // { label: "实际批次排序", prop: "handledLot" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, @@ -1228,7 +1228,7 @@ export const lackMaterialsInfo = [ { label: "标包数量", prop: "stdPackQty",isNumber:true }, // { label: "推荐批次排序", prop: "recommendLot" }, // { label: "实际批次排序", prop: "handledLot" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, { label: "备注", prop: 'remark' }, @@ -1304,7 +1304,7 @@ export const unqualifiedToQualified = [ // { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货日期", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, @@ -2148,7 +2148,7 @@ export const labelsList = [ // { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开 // { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, { label: "完整条码文本", prop: "fullBarcodeString" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty',isNumber:true }, // { label: "器具号", prop: 'containerCode' }, // { label: "质量级别", prop: "qLevel" }, @@ -2215,7 +2215,7 @@ export const InventoryBalance = [ // { label: "序号", prop: "serialNumber" }, // { label: "备注", prop: "remark" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "最后事务编号", prop: 'lastTransNumber' }, ] @@ -2256,7 +2256,7 @@ export const InventoryBalanceActive = [ // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: "remark" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "最后事务编号", prop: 'lastTransNumber' }, ] @@ -2297,7 +2297,7 @@ export const InventoryTransaction = [ { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: "remark" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, @@ -2347,7 +2347,7 @@ export const InventoryTransferLog = [ { label: "标包数", prop: "stdPackQty",isNumber:true }, { label: "从排序批次", prop: "fromLot" }, { label: "到排序批次", prop: 'toLot' }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "从箱码", prop: "fromPackingCode" }, { label: "从库位组", prop: "fromLocationGroup" }, { label: "到库位组", prop: 'toLocationGroup' }, @@ -2385,7 +2385,7 @@ export const expectOut = [ { label: "计量单位", prop: "uom" }, { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "库区", prop: "locationArea" }, // { label: "库位组", prop: "locationGroup" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, @@ -2416,7 +2416,7 @@ export const expectIn = [ { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, { label: "批次", prop: "lot" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "库区", prop: "locationArea" }, // { label: "库位组", prop: "locationGroup" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, @@ -3024,7 +3024,7 @@ export const countJobDepDetails = [ { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "库区", prop: "locationArea" }, { label: "库位组", prop: "locationGroup" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "盘点描述", prop: 'countDescription' }, { label: "盘点操作员", prop: 'countOperator' }, { label: "盘点时间", prop: "countTime",type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index b904d98a4..1e4d0c600 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1377,7 +1377,7 @@ export const labelsList = [ // { label: "供应商物品代码", prop: "supplierItemCode" },//后期打开 // { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开 { label: "完整条码文本", prop: "fullBarcodeString" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "标包数量", prop: 'stdPackQty',isNumber:true }, ] @@ -1416,7 +1416,7 @@ export const InventoryInitialNote = [ { label: "标包数量", prop: 'stdPackQty' }, { label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本金额", prop: "stdCost" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, // { label: "序号", prop: "serialNumber" }, // { label: "备注", prop: 'remark' }, { label: "最后事务编号", prop: "lastTransNumber" }, @@ -1450,7 +1450,7 @@ export const InventoryBalanceActive = [ { label: _Names.itemDesc1, prop: "itemDesc1" }, { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, { label: "最后事务编号", prop: "lastTransNumber" }, @@ -1482,7 +1482,7 @@ export const InventoryTransaction = [ { label: "备注", prop: 'remark' }, { label: "计量单位", prop: "uom" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"}, { label: "生效日期", prop: "activeDate",type: "dateTime" }, @@ -1509,7 +1509,7 @@ export const InventorySnapshot = [ { label: "批次", prop: "lot" }, { label: "数量", prop: "qty" }, { label: "计量单位", prop: "uom" }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "库存状态", prop: "status" ,type: "filter", filters: "inventoryStage" }, { label: "库位代码", prop: "locationCode" }, { label: "库位组", prop: "locationGroup" }, @@ -1549,7 +1549,7 @@ export const InventoryTransferLog = [ { label: "从事务编号", prop: "fromTransNumber", }, { label: "任务编号", prop: "jobNumber" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "供应商批次", prop: 'supplierBatch' }, { label: "单据号", prop: "docNumber" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, @@ -1576,7 +1576,7 @@ export const expectIn = [ { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, { label: "占用数量", prop: "qty" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "库区", prop: "locationArea" }, // { label: "库位组", prop: "locationGroup" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, @@ -1602,7 +1602,7 @@ export const expectOut = [ { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, { label: "占用数量", prop: "qty" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, // { label: "库区", prop: "locationArea" }, // { label: "库位组", prop: "locationGroup" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, diff --git a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue index 4bd8075c7..55bd1b7f9 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue @@ -179,7 +179,7 @@ export default { { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", }, { label: _Names.itemCode, prop: "itemCode", }, { label: "物品名称", prop: "itemName" }, - { label: "供应商批次", prop: "supplierBatch", }, + // { label: "供应商批次", prop: "supplierBatch", }, { label: "备注", prop: 'remark', }, ], editOptions: {}, diff --git a/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue b/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue index 1c3ca0df8..5fb98c3a0 100644 --- a/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue +++ b/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue @@ -94,7 +94,7 @@ export default { { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, - { label: "供应商批次", prop: "supplierBatch" }, + // { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: "remark" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },