From 14b1b29947943f9d85dea7879df6af8c311df074 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Thu, 23 Dec 2021 09:51:31 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedate/m100Online/RepetitionMB.vue | 2 +- .../basedate/m100Online/RepetitionZHB.vue | 2 +- .../pg-fis/basedate/m100Online/ScrapMB.vue | 2 +- .../pg-fis/basedate/m100Online/ScrapZHB.vue | 2 +- .../pg-fis/basedate/m100Online/detail.vue | 2 +- .../pg-fis/basedate/m100Online/detailMB.vue | 2 +- .../pg-fis/basedate/m100Online/detailZHB.vue | 2 +- .../basedate/m100Online/normalPritIndex.vue | 141 ++++++++++++++++-- .../basedate/unknownAssembly/index copy.vue | 2 +- 9 files changed, 138 insertions(+), 19 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue index 0f10550b..ec16916e 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -777,7 +777,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue index ea70478e..bfb7c2f2 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue @@ -678,7 +678,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 01e54664..3f2b7d7b 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -721,7 +721,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index d8685266..e84caa89 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -739,7 +739,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/vue/src/views/pg-fis/basedate/m100Online/detail.vue index 8f84588e..97d3fd13 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/detail.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/detail.vue @@ -340,7 +340,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue index 7028fe86..149c09da 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue @@ -735,7 +735,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue index daa9a919..9133f4b4 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue @@ -716,7 +716,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index a34a533f..97cf7b95 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -494,7 +494,7 @@ export default { ProductLine: undefined, BillStatus: undefined, CanNotPrint: false, - ZHBBillStatus:undefined, + ZHBBillStatus: undefined, }, listExportQuery: { erpAssemblyCode: undefined, @@ -1020,7 +1020,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, @@ -1085,6 +1085,7 @@ export default { //柱护板 this.hostSNQuery.isZhuHuBan = "1"; console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); + this.$axios .gets( "/api/newjit/bill-m100/get-print-start-hostsn2", @@ -1278,7 +1279,7 @@ export default { this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.productLine = this.listQuery.productLine; - + console.log("检查柱护板-hostCheckQuery"+JSON.stringify(this.hostCheckQuery)); this.$axios .posts( "/api/newjit/bill-m100/check-mb-hostsn-break-num", @@ -1395,18 +1396,18 @@ export default { } }); } else if (this.listQuery.productType === 2) { - //柱护板 - - this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); + //柱门板 + this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.productLine = this.listQuery.productLine; + this.$axios .posts( "/api/newjit/bill-m100/check-zhb-hostsn-break-num", this.hostCheckQuery ) .then((response) => { - console.log("检查柱护板-大众顺序号是否断号"); + console.log("检查门板-大众顺序号是否断号"); if (response.item.length > 0) { //有断号 this.$confirm( @@ -1453,14 +1454,18 @@ export default { .then((response) => { console.log("获取文件base64编码"); console.log(response); + this.formLoading = false; this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; }); } }); }) .catch(() => {}); - } //无断号 - else { + } else { + //无断号 //门板 //传递大众顺序号起止 this.$axios @@ -1494,7 +1499,11 @@ export default { .then((response) => { console.log("获取文件base64编码"); console.log(response); + this.formLoading = false; this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; }); } }) @@ -1507,6 +1516,118 @@ export default { }); } }); + //柱护板 + + // this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); + // this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); + // this.hostCheckQuery.productLine = this.listQuery.productLine; + // this.$axios + // .posts( + // "/api/newjit/bill-m100/check-zhb-hostsn-break-num", + // this.hostCheckQuery + // ) + // .then((response) => { + // console.log("检查柱护板-大众顺序号是否断号"); + // if (response.item.length > 0) { + // //有断号 + // this.$confirm( + // "本次打印存在断号是否继续?" + response.item, + // "提示", + // { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // } + // ) + // .then(() => { + // //门板 + // //传递大众顺序号起止 + // this.$axios + // .posts( + // "/api/newjit/bill-m100/print-zhuhuban-packing-list", + // this.hostPrintQuery + // ) + // .then((response) => { + // console.log("打印门板装箱单"); + // console.log(response); + // console.log(response.status); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // //传给grid++接口json数据，得到返回的文件base64 + // //this.fileQuery.report = "menban"; + // this.fileQuery.dataname = JSON.stringify( + // response.item + // ); + // //this.fileQuery.dataname = ""; + // console.log("打印json"); + // console.log(this.fileQuery.dataname); + // this.$axios + // .posts( + // "/Handlers/Handler1.ashx?report=menban", + // qs.stringify(this.fileQuery) + // ) + // .then((response) => { + // console.log("获取文件base64编码"); + // console.log(response); + // this.printpdf(response); //打印我文件流 + // }); + // } + // }); + // }) + // .catch(() => {}); + // } //无断号 + // else { + // //门板 + // //传递大众顺序号起止 + // this.$axios + // .posts( + // "/api/newjit/bill-m100/print-zhuhuban-packing-list", + // this.hostPrintQuery + // ) + // .then((response) => { + // console.log("打印门板装箱单"); + // console.log(response); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // //传给grid++接口json数据，得到返回的文件base64 + // //this.fileQuery.report = "menban"; + // this.fileQuery.dataname = JSON.stringify( + // response.item + // ); + // //this.fileQuery.dataname = ""; + // console.log("打印json"); + // console.log(this.fileQuery.dataname); + // this.$axios + // .posts( + // "/Handlers/Handler1.ashx?report=menban", + // qs.stringify(this.fileQuery) + // ) + // .then((response) => { + // console.log("获取文件base64编码"); + // console.log(response); + // this.printpdf(response); //打印我文件流 + // }); + // } + // }) + // .catch(() => { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // }); + // } + // }); } } else { /**接口1获取打印数据，接口2获得grid++模板的base64编码 */ @@ -2038,10 +2159,8 @@ export default { } if (this.listQuery.productType === 2) { this.listQueryList.ZHBBillStatus = 2; - } else { this.listQueryList.ZHBBillStatus = 0; - } }, /*单据状态变更 */ diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue index 9993db2b..9e29ae2d 100644 --- a/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue +++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue @@ -940,7 +940,7 @@ export default { if(this.data2.length !==0) { this.$message({ - message: "还有结算价代码尚未匹配", + message: "还有件代码尚未匹配", type: "error", }); return;