diff --git a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue index 0f8330908..3c5aee2c2 100644 --- a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue +++ b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue @@ -89,7 +89,12 @@ export default { // 打印 if(val == 'printer'){ this.propsData.title = "线边仓退料单" - let _data = initPrintAllData(this.propsData,'xbctl.rdlx',); + let _option = { + details:{ + fromLot:'toLot' + } + } + let _data = initPrintAllData(this.propsData,'xbctl.rdlx',false,_option); this.Print(_data) } }, diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue index dcc7760b3..fba44ccdb 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue @@ -471,7 +471,7 @@ export default { let _option = { details:{ fromLocationCode:"recommendLocationCode", - qty:"recommendQty", + qty:"handledQty", uom:"recommendUom", fromLot:"recommendLot", toLocationErpCode:"locationErpCode", diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue index d6805e24f..1d8e69e2b 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue @@ -472,7 +472,7 @@ export default { let _option = { details:{ fromLocationCode:"recommendFromLocationCode", - qty:"recommendQty", + qty:"handledQty", fromLot:"recommendLot", fromLocationErpCode:"recommendFromLocationErpCode", } diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue index 214fed896..a90aaf16d 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue @@ -82,29 +82,6 @@ export default { return this.displayDialog.newDialog || this.displayDialog.editDialog; }, }, - // againHandleRequestLabel: function (val) { - // // console.log(val) - // // return function (val) { - // // let _label = false - // // // let _details = this.propsData ? this.propsData.details : null - // console.log(this.propsData) - // // } - // // val.forEach(key => { - // // if (this.propsData.requestStatus == key) { - // // _label = false - // // } - // // }) - // // return _label - // // return function (val) { - // // let data = true - // // val.forEach(key => { - // // if (this.propsData.requestStatus == key) { - // // data = false - // // } - // // }) - // // return data - // // } - // } }, data () { let _this = this; diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue index 6f572e029..74cda86b2 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue @@ -94,15 +94,15 @@ export default { this.defaultFilterBtn(),//筛选 ], DrawerButtonData: [ - { - type: 'info', - icon: 'el-icon-printer', - label: '打印收货单', - hide: false, - hide: () => { return this.hideButton('hgpshmx') }, - name: "print-shd", - size: 'mini' - }, + // { + // type: 'info', + // icon: 'el-icon-printer', + // label: '打印收货单', + // hide: false, + // hide: () => { return this.hideButton('hgpshmx') }, + // name: "print-shd", + // size: 'mini' + // }, // { // type: 'info', // icon: 'el-icon-printer',