From 3abb90f4b1839298f72397392dd2efdea7ea6352 Mon Sep 17 00:00:00 2001 From: "yu.wu" Date: Wed, 1 Dec 2021 17:01:57 +0800 Subject: [PATCH] =?UTF-8?q?fis=E9=A1=B5=E9=9D=A2=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/pg-fis/basedate/m100BIll/index.vue | 4 ++-- vue/src/views/pg-fis/basedate/m100Online/index.vue | 7 ++++--- vue/src/views/pg-fis/basedate/r100Online/index.vue | 4 ++-- vue/src/views/pg-fis/basedate/weldingAssembly/index.vue | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue index 5a901123..fbe908a5 100644 --- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue +++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue @@ -1410,7 +1410,7 @@ export default { .then((response) => { //console.log(response); this.PLList = response.item; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList); }) .catch(() => { @@ -1423,7 +1423,7 @@ export default { this.listQuery.productLine = ""; //console.log(this.listQuery.productType); //console.log(this.PLChildList) - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList) //console.log(this.listQuery.productType) //console.log(this.PLChildList) diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 678bc4f1..73bc0076 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -1300,7 +1300,7 @@ export default { else { //传给grid++接口json数据，得到返回的文件base64 - //this.fileQuery.report = "menban"; + //this.fileQuery.report = "zhuhuban"; this.fileQuery.dataname = JSON.stringify(response.item); //this.fileQuery.dataname = ""; console.log("打印json"); @@ -1330,7 +1330,7 @@ export default { .then((response) => { //console.log(response); this.PLList = response.item; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList) }) .catch(() => { @@ -1342,7 +1342,7 @@ export default { this.$forceUpdate(); //console.log(this.listQuery.productType); this.listQuery.productLine = ""; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList) //变更打印按钮文字 if(this.listQuery.productType === 1) @@ -1418,6 +1418,7 @@ export default { document.body.appendChild(ifr) this.doPrint('printPdf' + date) window.URL.revokeObjectURL(ifr.src) // 释放URL 对象 + this.dialogFormVisible = false; }, httpPost(URL, PARAMS) { var temp = document.createElement("form"); diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue index 9175b1db..caccc20d 100644 --- a/vue/src/views/pg-fis/basedate/r100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue @@ -720,7 +720,7 @@ export default { .then((response) => { //console.log(response); this.PLList = response.item; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList) }) .catch(() => { @@ -732,7 +732,7 @@ export default { this.$forceUpdate(); //console.log(this.listQuery.productType); this.listQuery.productLine = ""; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList) }, /*单据状态变更 */ diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue index ba9764ed..37df3875 100644 --- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue +++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue @@ -820,7 +820,7 @@ export default { .then((response) => { //console.log(response); this.PLList = response.item; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); }) .catch(() => { }); @@ -830,7 +830,7 @@ export default { { //console.log(this.listQuery.productType); this.listQuery.productLine = ""; - this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)); + this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode}); //console.log(this.PLList); }, },