diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index 95088748c..ce29268a8 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/fe/PC/src/mixins/printMixin.js @@ -251,6 +251,7 @@ const printEnumOption = { dataUrl: url || 'ccc', jsonData: JSON.stringify(_printData) }; + console.log(254,_printData) return data } diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index a90f55569..9c3e39bbd 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -126,6 +126,8 @@ export default { } } let data = initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); + // todo:打印单据更改 + // let data = initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option); this.Print(data) }) } diff --git a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue index eb4dfe000..455466733 100644 --- a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue +++ b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue @@ -94,6 +94,8 @@ export default { fromLot:'toLot' } } + // todo:打印单据更改 + // let _data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,_option); let _data = initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option); this.Print(_data) } diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue index 4061b96f5..e3e9f041e 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue @@ -102,6 +102,8 @@ export default { //抽屉常用按钮 drawerbutton (val) { if(val == 'print'){ + // todo:打印单据更改 + // let data = initPrintAllData(this.tableDataDetails,'cwdbd.rdlx'); let data = initPrintAllData(this.tableDataDetails,'lineSideWarehouse.rdlx'); this.Print(data) } diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue index 425d81e8a..71e81bf2c 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.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" @@ -49,6 +49,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"; import { drawerMixins } from "@/mixins/drawerMixins"; import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; import { mixins } from "@/mixins/mixins"; +import {initPrintAllData} from "@/mixins/printMixin" export default { name: "materialsAdjustment", mixins: [ @@ -68,11 +69,49 @@ export default { this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 ], + // todo:打印单据更改 + DrawerButtonData: [ + // { + // type: 'info', + // icon: 'el-icon-printer', + // label: '打印', + // hide: false, + // name: "print", + // size: 'mini' + // }, + ] }; }, mounted() { this.paging(); }, + methods: { + //抽屉常用按钮 + drawerbutton (val) { + // 打印 + if(val == 'print'){ + // 特殊字段处理 + // todo:打印单据更改 + // let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) + // _propsData.details.forEach(item=>{ + // item.recommendLot = item.recommendLot + " " + // }) + // let _option = { + // details:{ + // fromLocationCode:"recommendLocationCode", + // qty:"handledQty", + // uom:"recommendUom", + // fromLot:"recommendLot", + // toLocationErpCode:"locationErpCode", + // fromLocationErpCode:"recommendLocationErpCode", + // } + // } + // let data = initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option); + let data = initPrintAllData(this.tableDataDetails,'tzd.rdlx','AdjustmentReason'); + this.Print(data) + } + }, + }, };