From c96b55c9cdbf3f634cf8d18fae95ef182cbb1e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 13 Jul 2023 10:04:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=98=8E=E7=BB=86=E4=B8=AD=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84Configuration=E5=8F=82=E6=95=B0=202=E3=80=81Fis?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- fe/PC/src/mixins/TableMixins.js | 40 +++-------- fe/PC/src/utils/detailsTableColumns/index.js | 66 +++++++++++++++++++ .../deliver/FISDeliverNote-Query.vue | 48 +++++++++++++- 4 files changed, 122 insertions(+), 34 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 8d62484be..bcd541524 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.50" + "version": "1.0.51" } \ No newline at end of file diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 007d9208d..ee340296c 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -217,39 +217,17 @@ export const tableMixins = { _data.condition.filters.push(_filt) }) getPageList(_data, 'basedata/item-basic').then(res => { - console.log(items) this.propsData.details.forEach(item=>{ - let _config = res.items.filters(base=>{ + let _config = res.items.filter(base=>{ return base.code == item.itemCode }) - console.log(225,_config) + if(_config && _config.length > 0)this.$set(item,"configurationFromFE", _config[0].configuration) }) + this.$forceUpdate() this.Loading.DrawerLoading = false }).catch(err => { this.Loading.DrawerLoading = false }) - // if(!this.propsData.supplierCode){ - // this.Loading.DrawerLoading = false - // return - // } - // if(this.tabsDesTions[i].prop == 'supplierName' || this.tabsDesTions[i].prop == "supplierAddress"){ - // let _allSuCode = [this.propsData.supplierCode] - // this.Loading.DrawerLoading = true - // allSupplierByCodes(_allSuCode).then(res => { - // this.Loading.DrawerLoading = false - // if(res.length > 0){ - // this.$set(this.propsData,"supplierName", res[0].name) - // this.$set(this.propsData,"supplierAddress", res[0].address) - // this.$set(this.propsData,"supplierShortName", res[0].shortName) - // } - // }).catch(err => { - // console.log(err) - // this.Loading.DrawerLoading = false - // }) - // return - // }else{ - // this.Loading.DrawerLoading = false - // } }, // 主列表操作列按钮执行方法 /** @@ -258,7 +236,6 @@ export const tableMixins = { * @param {*} label 按钮name */ buttonOperationClick(row, label) { - console.log(label) // 获取当前行数据，赋值给 propsData this.propsData = row @@ -306,12 +283,15 @@ export const tableMixins = { }, // 点击抽屉，获取明细后全局通用操作 inlineDialogCallback(){ - // 插入配置数据 - if(this.showConfiguration){ - // this.getConfigByItemHandle_props() - }else{ + // notShowConfiguration：明细中-不用前端获取物品信息的Configuration参数， + // 如果设置notShowConfiguration，detailsTableColumns.js别忘了删除配置项 + if(this.notShowConfiguration){ this.Loading.DrawerLoading = false } + // 插入配置数据 + else{ + this.getConfigByItemHandle_props() + } // this.getSupplierByCodesHandle_props() } } diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index d0e7ce38b..34b61d845 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -29,6 +29,7 @@ export const SupplierAsn = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, @@ -67,6 +68,7 @@ export const PurchaseOrder = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, @@ -109,6 +111,7 @@ export const PurchaseReceiptRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发货数量", prop: "qty" }, { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, @@ -145,6 +148,7 @@ export const PurchaseReceiptJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, { label: "数量", prop: "recommendQty" }, { label: "质量缺陷", prop: "massDefect" }, @@ -201,6 +205,7 @@ export const InspectRequest = [ { label: "物品名称", prop: "itemName", width: orderWidth }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "收货数量", prop: "receiveQty" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, @@ -253,6 +258,7 @@ export const InspectNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "收货数量", prop: "receiveQty" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, @@ -305,6 +311,7 @@ export const unqualifiedToQualifiedNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -347,6 +354,7 @@ export const PutawayNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "来源库位", prop: "fromLocationCode" }, @@ -416,6 +424,7 @@ export const IssueRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, @@ -450,6 +459,7 @@ export const IssueJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: "handledLot" }, @@ -513,6 +523,7 @@ export const IssueNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -583,6 +594,7 @@ export const automaticCallApply = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, @@ -617,6 +629,7 @@ export const automaticCallJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: "handledLot" }, @@ -680,6 +693,7 @@ export const automaticCallNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -751,6 +765,7 @@ export const beforeGroundingReturnNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -813,6 +828,7 @@ export const PurchaseReturnRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -849,6 +865,7 @@ export const PurchaseReturnJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "退货原因代码", prop: 'reason' }, { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, @@ -899,6 +916,7 @@ export const PurchaseReturnNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -961,6 +979,7 @@ export const ScrapNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "报废数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "报废原因代码", prop: 'reasonCode' }, @@ -1005,6 +1024,7 @@ export const materialDirectSendNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -1071,6 +1091,7 @@ export const directIssueNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -1144,6 +1165,7 @@ export const ProductReceiptRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "返线数量", prop: "returnQty" }, @@ -1179,6 +1201,7 @@ export const ProductReceiptNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -1242,6 +1265,7 @@ export const ProductReceiptScrapRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -1271,6 +1295,7 @@ export const ProductReceiptScrapNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "报废数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "报废原因代码", prop: 'reasonCode' }, @@ -1315,6 +1340,7 @@ export const partiallyPreparedProductsNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "来源库位", prop: "fromLocationCode" }, @@ -1384,6 +1410,7 @@ export const DeliverRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "发货库区", prop: "areaCode" }, @@ -1407,6 +1434,7 @@ export const DeliverJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "单位", prop: "uom" }, { label: "推荐批次", prop: 'recommendLot' }, { label: "实际批次", prop: 'handledLot' }, @@ -1459,6 +1487,7 @@ export const DeliverNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -1525,6 +1554,7 @@ export const FISDeliverRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "出货库区", prop: "areaCode" }, @@ -1551,6 +1581,7 @@ export const FISDeliverNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, @@ -1619,6 +1650,7 @@ export const customerDismantle = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "退拆数量", prop: "qty" }, { label: "单位", prop: 'uom' }, { label: "扣账库位", prop: "locationCode" }, @@ -1651,6 +1683,7 @@ export const productionReturnRequest = [ { label: "物品名称", prop: 'itemName' }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "单位", prop: 'uom' }, { label: "批次", prop: 'lot' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, @@ -1694,6 +1727,7 @@ export const productionReturnJob = [ { label: "物品名称", prop: 'itemName' }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: 'recommendQty' }, { label: "批次", prop: 'recommendLot' }, // ----------------------------------------------------------------------- @@ -1746,6 +1780,7 @@ export const productionReturnNote = [ { label: "物品名称", prop: 'itemName' }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: 'qty' }, { label: "单位", prop: 'uom' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, @@ -1816,6 +1851,7 @@ export const pickingRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1853,6 +1889,7 @@ export const pickingApproval = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1890,6 +1927,7 @@ export const pickingNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1952,6 +1990,7 @@ export const pickingNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1988,6 +2027,7 @@ export const materialReturnApproval = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -2024,6 +2064,7 @@ export const materialReturnNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -2086,6 +2127,7 @@ export const recycledMaterialsReceipt = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -2125,6 +2167,7 @@ export const recycledMaterialsAdjustmentApply = [ { label: "目标物品描述1", prop: "toItemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "目标物品描述2", prop: "toItemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "来源箱标签", prop: "fromPackingCode" }, { label: "目标箱标签", prop: "toPackingCode" }, { label: "单位", prop: "uom" }, @@ -2178,6 +2221,7 @@ export const materialsAdjustment = [ { label: "目标物品描述1", prop: "toItemDesc1" }, { label: "来源物品描述2", prop: "itemDesc2" }, { label: "目标物品描述2", prop: "toItemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "来源箱标签", prop: "fromPackingCode" }, { label: "目标箱标签", prop: "toPackingCode" }, { label: "来源数量", prop: "fromQty" }, @@ -2228,6 +2272,7 @@ export const lineSideWarehouseAllocationRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -2271,6 +2316,7 @@ export const lineSideWarehouseAllocationConfirm = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2315,6 +2361,7 @@ export const lineSideWarehouseAllocationNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2359,6 +2406,7 @@ export const interStorageAllocationNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2403,6 +2451,7 @@ export const customerStorageAllocationRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -2446,6 +2495,7 @@ export const customerStorageAllocationConfirm = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2490,6 +2540,7 @@ export const customerStorageAllocationNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2534,6 +2585,7 @@ export const intraStorageTransferNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, @@ -2578,6 +2630,7 @@ export const lineSideWarehousePaymentRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "返线数量", prop: "returnQty" }, @@ -2613,6 +2666,7 @@ export const lineSideWarehousePaymentNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -2676,6 +2730,7 @@ export const lineSideWarehouseScrappingRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -2705,6 +2760,7 @@ export const lineSideWarehouseScrappingNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "报废数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "报废原因代码", prop: 'reasonCode' }, @@ -2749,6 +2805,7 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调整原因代码", prop:"reasonCode" }, @@ -2793,6 +2850,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "调整原因代码", prop:"reasonCode" }, { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, // ----------------------------------------------------------------------- @@ -2842,6 +2900,7 @@ export const InventoryInitialNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "供应商批次", prop: "supplierBatch" }, @@ -2878,6 +2937,7 @@ export const CountPlan = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "单位", prop: "uom" }, { label: "库存数量", prop: "inventoryQty" }, { label: "初盘数量", prop: "firstCountQty" }, @@ -2930,6 +2990,7 @@ export const CountJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "库存数量", prop: "inventoryQty" }, { label: "盘点数量", prop: "countQty" }, { label: "库存库位", prop: "inventoryLocationCode" }, @@ -2970,6 +3031,7 @@ export const CountNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "库存数量", prop: "inventoryQty" }, { label: "最终盘点数量", prop: "finalCountQty" }, { label: "盘点差异数量", prop: "diffQty" }, @@ -3023,6 +3085,7 @@ export const CountPlanAdjust = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "盘点数量", prop: "countQty" }, { label: "调整数量", prop: "qty" }, { label: "库存数量", prop: "inventoryQty" }, @@ -3061,6 +3124,7 @@ export const CountPlanAdjust = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, // { label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "diffQty" },//20230705 { label: "盘点数量", prop: "countQty" }, @@ -3107,6 +3171,7 @@ export const safetyStockWarning = [ { label: "物品名称", prop: 'itemName' }, { label: "物品描述1", prop: 'itemDesc1' }, { label: "物品描述2", prop: 'itemDesc2' }, + { label: "配置", prop: "configurationFromFE" }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate' ,type:"dateTime" }, { label: "生产时间", prop: 'produceDate' ,type:"dateTime" }, @@ -3149,6 +3214,7 @@ export const splitPackingList = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, + { label: "配置", prop: "configurationFromFE" }, { label: "创建时间", prop: 'creationTime', type:'dateTime' }, { label: "标包数量", prop: "stdPackQty" }, { label: "数量", prop: "qty" }, diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index f3dccae0c..54dddb4d9 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -29,7 +29,7 @@ :DrawerLoading="Loading.DrawerLoading" :drawer="displayDialog.detailsDialog" :propsData="propsData" - :Butttondata="[]" + :Butttondata="DrawerButtonData" :tabsDesTions="tabsDesTions" @drawerShut="(val) => (displayDialog.detailsDialog = val)" @drawerbutton="drawerbutton" @@ -44,12 +44,13 @@