diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue index d8288bd70..374bcd921 100644 --- a/fe/PC/src/components/commonTabel-drawer/index.vue +++ b/fe/PC/src/components/commonTabel-drawer/index.vue @@ -29,6 +29,24 @@ @tableButtonClick="tableButtonClick" > @@ -70,42 +72,71 @@ export default { this.defaultFilterBtn(),//筛选 ], DrawerButtonData: [ + // { + // type: 'info', + // icon: 'el-icon-printer', + // label: '打印', + // hide: false, + // name: "print", + // size: 'mini' + // }, + ], + // 选择尺寸打印 + dropdownButtonData:[ { - type: 'info', - icon: 'el-icon-printer', - label: '打印', - hide: false, - name: "print", - size: 'mini' - }, - ] + show:true, + fatherName:'打印', + fatherProp:'print', + list:null + } + ], }; }, mounted() { this.paging(); }, methods: { - //抽屉常用按钮 - async drawerbutton (val) { - // 打印 - if(val == 'print'){ - // 特殊字段处理 - // todo:打印单据更改 - let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) - _propsData.details.forEach(item=>{ - item.reasonStr = "" - item.recommendLot = item.recommendLot + " " - }) - let _option = { - details:{ - locationCode:"toLocationCode", - qty:"toQty", - } + inlineDialogCallback(){ + let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) + _propsData.details.forEach(item=>{ + item.reasonStr = "" + item.recommendLot = item.recommendLot + " " + }) + let _option = { + details:{ + locationCode:"toLocationCode", + qty:"toQty", } - let data = await initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option); - this.Print(data) } + let _list = [ + {label:'A4',name:'A4',printData:_propsData,rdlxName:"tzd_A4.rdlx",enumOption:'AdjustmentReason',options:_option}, + {label:'三联',name:'tree',printData:_propsData,rdlxName:"tzd.rdlx",enumOption:'AdjustmentReason',options:_option}, + ] + + this.$set(this.dropdownButtonData[0],"list",_list) + this.Loading.DrawerLoading = false }, + //抽屉常用按钮 + // async drawerbutton (val) { + // // 打印 + // if(val == 'print'){ + // // 特殊字段处理 + // // todo:打印单据更改 + // let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) + // _propsData.details.forEach(item=>{ + // item.reasonStr = "" + // item.recommendLot = item.recommendLot + " " + // }) + // let _option = { + // details:{ + // locationCode:"toLocationCode", + // qty:"toQty", + // } + // } + // let data = await initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option); + // this.Print(data) + // } + // }, }, }; diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue index a82c59baa..83eb880d4 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue @@ -40,6 +40,8 @@ :MaxResultCount="MaxResultCountDetails" @alterResultCountDetails="alterResultCountDetails" @alertoldSkipCountDetails="alertoldSkipCountDetails" + :dropdownButtonData="dropdownButtonData" + @dropdownButtonHandle="dropdownButtonHandle" > @@ -70,15 +72,27 @@ export default { this.defaultFilterBtn(),//筛选 ], DrawerButtonData: [ + // { + // type: 'info', + // icon: 'el-icon-printer', + // label: '打印', + // hide: false, + // name: "print", + // size: 'mini' + // }, + ], + // 选择尺寸打印 + dropdownButtonData:[ { - type: 'info', - icon: 'el-icon-printer', - label: '打印', - hide: false, - name: "print", - size: 'mini' - }, - ] + show:true, + fatherName:'打印', + fatherProp:'print', + list:[ + {label:'A4',name:'A4',rdlxName:"hslrkd_A4.rdlx",showDept:true}, + {label:'三联',name:'tree',rdlxName:"hslrkd.rdlx",showDept:true}, + ] + } + ], }; }, mounted() { @@ -86,13 +100,13 @@ export default { }, methods: { //抽屉常用按钮 - async drawerbutton (val) { - // 打印 - if(val == 'print'){ - let data = await initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true); - this.Print(data) - } - }, + // async drawerbutton (val) { + // // 打印 + // if(val == 'print'){ + // let data = await initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true); + // this.Print(data) + // } + // }, }, };