diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index 2c57ec53..2e7f23e9 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -169,7 +169,7 @@ + + + + @@ -443,7 +456,8 @@ export default { fromCorp: null, keyWords: null, inoutPrintStatus: null, - + confirmStarTime:null, //发票确认起始日期 + confirmEndTime:null, }, printMap: { @@ -464,9 +478,13 @@ export default { orderSelection: [], showSup: false, customerId: this.$store.getters.customerId, + map:{ + "actDateRange" : this.actDateRange, + "confirmDateRange" : this.confirmDateRange, + }, actDateRange: [], + confirmDateRange:[], actionType: null, - auditDateRange: [], pickerOptions: { shortcuts: [ @@ -535,6 +553,13 @@ export default { this.filterQuery.startAduditTime = null; this.filterQuery.endAduditTime = null; } + if (this.confirmDateRange!== null) { + this.filterQuery.confirmStarTime = this.confirmDateRange[0]; + this.filterQuery.confirmEndTime = this.confirmDateRange[1]; + } else { + this.filterQuery.confirmStarTime = null; + this.filterQuery.confirmEndTime = null; + } this.filterQuery.page = 1; this.getList(); @@ -626,6 +651,8 @@ export default { let printParams = { startAduditTime :this.filterQuery.startAduditTime, endAduditTime: this.filterQuery.endAduditTime, + confirmStarTime : this.filterQuery.confirmStarTime , + confirmEndTime : this.filterQuery.confirmEndTime , employeeName: this.$store.getters.user.employeeName, locInvName:this.$store.getters.locInvName, templateId: res.data, @@ -689,6 +716,13 @@ export default { printParams.startAduditTime = null; printParams.endAduditTime = null; } + if (this.confirmDateRange!== null) { + printParams.confirmStarTime = this.confirmDateRange[0]; + printParams.confirmEndTime = this.confirmDateRange[1]; + } else { + printParams.confirmStarTime = null; + printParams.confirmEndTime = null; + } printOrder(printParams).then((response) => { //将pdf文件转换为url。 const binaryData = []; @@ -777,6 +811,13 @@ export default { printParams.startAduditTime = null; printParams.endAduditTime = null; } + if (this.confirmDateRange!== null) { + printParams.confirmStarTime = this.confirmDateRange[0]; + printParams.confirmEndTime = this.confirmDateRange[1]; + } else { + printParams.confirmStarTime = null; + printParams.confirmEndTime = null; + } excelInoutImport(printParams).then((response) => { let blob = new Blob([response], {type: "application/vnd.ms-excel"}); let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象