From f399d23c94ac1828f3ad2697732e1311ec615737 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Fri, 24 Dec 2021 13:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedate/m100Online/RepetitionMB.vue | 28 +++++++++++++++++-- .../basedate/m100Online/RepetitionZHB.vue | 26 +++++++++++++++-- .../pg-fis/basedate/m100Online/ScrapMB.vue | 26 +++++++++++++++-- .../pg-fis/basedate/m100Online/ScrapZHB.vue | 21 ++++++++++++-- .../basedate/m100Online/normalPritIndex.vue | 12 ++++---- 5 files changed, 99 insertions(+), 14 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue index cb254ea2..b17f9a03 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -387,6 +387,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -424,8 +426,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -524,8 +531,25 @@ export default { this.listQuery ) .then((response) => { + + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; + setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue index 2a6856c1..83226746 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue @@ -342,6 +342,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -379,8 +381,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -480,6 +487,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 3f2b7d7b..445fd29f 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -361,6 +361,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -398,8 +400,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -499,6 +506,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index e84caa89..02335f75 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -373,6 +373,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -410,12 +412,12 @@ export default { }); tempsTabs.push({ - label: "起底盘号", + label: "起始底盘号", prop: "beginVin", width: 160, }); tempsTabs.push({ - label: "止底盘号", + label: "结束底盘号", prop: "endVin", width: 160, }); @@ -515,6 +517,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 336bc746..3912ce51 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -546,7 +546,7 @@ export default { dialogFormVisible: false, formTitle: "", isEdit: false, - formLoading: false, + formLoading: false, //关闭窗口 tableHeight: document.documentElement.clientHeight - 335, detailTableHeight: 250, details: [], //修改子表数据源 @@ -1277,7 +1277,7 @@ export default { this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); if (this.listQuery.productType === 1) { - //门板-打印 + //柱护板-打印 this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.productLine = this.listQuery.productLine; @@ -1467,7 +1467,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1514,7 +1514,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1973,7 +1973,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -2012,7 +2012,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => {