From 75c5109ada2f2ff0dce82e505b85569f1482980f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 21:30:51 +0800 Subject: [PATCH 01/49] feat: There is no way the, BUG #52106 --- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 2d970258b..c92fee91e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2261,7 +2261,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index f0b8a7d9d..c6d8057d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -2356,7 +2356,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 39a7eabd1..5cb251cf4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -2448,7 +2448,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index c963f5382..ee2d13f83 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -2357,7 +2357,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 5ba8f9c27..09f5cb3d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -2456,7 +2456,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index baecad96c..70352ab68 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2315,7 +2315,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1e2bb4588..595c84e96 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2317,7 +2317,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index fcac4678e..3d8940ec7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -2403,7 +2403,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index c25dbe6fd..defe9ba39 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2749,7 +2749,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 80fe39d99..71199974e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2461,7 +2461,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index d517925c2..813647347 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -2403,7 +2403,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index b07082266..979a855de 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2747,7 +2747,7 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } - + this.fileInfoHandle() this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') From 9fa5f729390c86e67d05bf5f680197fe6401dbe9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 21:39:10 +0800 Subject: [PATCH 02/49] feat: There is no way the, BUG #52096 --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 96f42c757..348f61fc1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1008,7 +1008,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index c92fee91e..9093b4a44 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -561,7 +561,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index c6d8057d4..e9ed0fc58 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -604,7 +604,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 5cb251cf4..9c25acd42 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -674,7 +674,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index ee2d13f83..479c12ca0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -604,7 +604,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 09f5cb3d1..cfb785401 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -675,7 +675,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 791ad7d00..98aa4988c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1050,7 +1050,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 70352ab68..8747f129c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -562,7 +562,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 595c84e96..9e01786df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -563,7 +563,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index defe9ba39..d52a42cbc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -810,7 +810,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 71199974e..677c97393 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -684,7 +684,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 979a855de..d8a5a593f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -810,7 +810,7 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" From bb293260a1c5ac5d67c01ef71c94be14ebf40d2e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 21:50:03 +0800 Subject: [PATCH 03/49] feat: There is no way the, BUG #52109 --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 348f61fc1..e672610a4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2541,7 +2541,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 9093b4a44..b5d85a4a1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1973,7 +1973,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index e9ed0fc58..c7af8e52c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -2035,7 +2035,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 9c25acd42..a2384873e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -2127,7 +2127,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 479c12ca0..bd46efcdb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -2036,7 +2036,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index cfb785401..d77dcf9a0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -2135,7 +2135,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 98aa4988c..300bb4b50 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2501,7 +2501,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 8747f129c..37538886d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2006,7 +2006,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 9e01786df..6645ab551 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2013,7 +2013,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 3d8940ec7..357ea14d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -2066,7 +2066,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index d52a42cbc..a14200cb8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2415,7 +2415,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 677c97393..356307dd8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2191,7 +2191,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 813647347..64c3c9f1a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -2066,7 +2066,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index d8a5a593f..5aabe0186 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2413,7 +2413,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false From 4c0a0b2a77351f024aa443a3ed441a012d5fd8f6 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 22:23:49 +0800 Subject: [PATCH 04/49] feat: There is no way the, --- .../processCenter/pages/creatProcess/qbrk-product/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index b130f6d1e..4fbc17ca2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -1830,7 +1830,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 0cd8d1ae5..92dd8fdec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -2088,7 +2088,7 @@ // this.$message.error('文件限制只可上传一个') // return false // } - if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false From 0c6589eea94170122f670d832d455bc0fdbb91ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 09:45:55 +0800 Subject: [PATCH 05/49] =?UTF-8?q?=E6=88=91=E5=8F=B8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d2fbca014..fa49035fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -790,7 +790,7 @@ > - + @@ -2530,7 +2530,18 @@ export default { }, choiceWSSMR(type, title, id) { this.nodeList3 = [] - this.nodeList.push(id) + if(id){ + let nameId = id.split(',') + let idList = [] + nameId.forEach(item => { + let a, b + a = item.substring(item.indexOf('(') +1) + b = a.substring(0, a.lastIndexOf(')')) + idList.push(b) + }) + idList = idList.join(',') + this.nodeList3.push(idList) + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag5 = true From 88c935f7a1c7c817f0009e0c4306dfbba8903f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 11:06:19 +0800 Subject: [PATCH 06/49] =?UTF-8?q?=E7=A6=85=E9=81=93bug=2051958=20=2051993?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 80 +++++++++---------- .../domesticStandardsAndRegulations/index.vue | 47 ++++++++++- 2 files changed, 86 insertions(+), 41 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fa49035fe..c25feaa1a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1896,46 +1896,46 @@ export default { this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1' }, },*/ - 'form.standNumber': { - handler: function () { - this.standardSearchForm.standNumber = this.form.standNumber - }, - }, - 'standardSearchForm.standNumber': { - handler: function () { - this.form.standNumber = this.standardSearchForm.standNumber - }, - }, - 'form.standSort': { - handler: function () { - this.standardSearchForm.standSort = this.form.standSort - }, - }, - 'standardSearchForm.standSort': { - handler: function () { - this.form.standSort = this.standardSearchForm.standSort - }, - }, - 'form.standName': { - handler: function () { - this.standardSearchForm.standName = this.form.standName - }, - }, - 'standardSearchForm.standName': { - handler: function () { - this.form.standName = this.standardSearchForm.standName - }, - }, - 'form.standEnName': { - handler: function () { - this.standardSearchForm.standEnName = this.form.standEnName - }, - }, - 'standardSearchForm.standEnName': { - handler: function () { - this.form.standEnName = this.standardSearchForm.standEnName - }, - }, + // 'form.standNumber': { + // handler: function () { + // this.standardSearchForm.standNumber = this.form.standNumber + // }, + // }, + // 'standardSearchForm.standNumber': { + // handler: function () { + // this.form.standNumber = this.standardSearchForm.standNumber + // }, + // }, + // 'form.standSort': { + // handler: function () { + // this.standardSearchForm.standSort = this.form.standSort + // }, + // }, + // 'standardSearchForm.standSort': { + // handler: function () { + // this.form.standSort = this.standardSearchForm.standSort + // }, + // }, + // 'form.standName': { + // handler: function () { + // this.standardSearchForm.standName = this.form.standName + // }, + // }, + // 'standardSearchForm.standName': { + // handler: function () { + // this.form.standName = this.standardSearchForm.standName + // }, + // }, + // 'form.standEnName': { + // handler: function () { + // this.standardSearchForm.standEnName = this.form.standEnName + // }, + // }, + // 'standardSearchForm.standEnName': { + // handler: function () { + // this.form.standEnName = this.standardSearchForm.standEnName + // }, + // }, }, methods: { // 标准来源改变事件 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7f760d98e..d4d8f97c3 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3718,6 +3718,43 @@ export default { }, // 搜索 getDomesticStandardTableBtn(item) { + // // 自定义属性字段高级搜索处理 + //advanceSearchVOStr + const advanceSearchVOList = []; + for (let key in this.advanceSearchMapping) { + const value = this.advanceSearchMapping[key]; + if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) { + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'regexp', + value: value.join(',') + }); + } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'between', + value: value.join(',') + }); + } else if (value !== null && value !== '' && (key === 'BARQ')) { + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'equals', + value: value + }); + } else if (value !== null && value !== '' && (key === 'TXLBName')) { + } else if (value !== null && value !== '') { + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'like', + value: value + }); + } + } + item.advanceSearchVOStr = advanceSearchVOList sessionStorage.setItem('tableFlag', JSON.stringify(item)) this.tableFlag = item item.page = 1 @@ -4575,7 +4612,15 @@ export default { }); } } - formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + if(item.advanceSearchVOStr){ + advanceSearchVOList.push({ + connect: item.advanceSearchVOStr[0].connect, + field: item.advanceSearchVOStr[0].field, + type: item.advanceSearchVOStr[0].type, + value: item.advanceSearchVOStr[0].value, + }) + } + formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) this.SarExportSearchEo = formData formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null From f28a12a67687f6fa519a99588e4daf4b6b9fb375 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 11:23:31 +0800 Subject: [PATCH 07/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052185=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=AE=8C=E6=B2=A1=E5=8F=8D=E5=BA=94=EF=BC=8C=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=B2=A1=E7=9C=8B=E8=A7=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 7c1f2fcc1..9e1fb8f91 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -621,14 +621,14 @@ export default { const advanceSearchVOList = []; for (let key in formData) { const value = formData[key]; - if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) { + if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SYRZ' || key === 'CLLX')) { advanceSearchVOList.push({ connect: "and", field: key || '', type: 'regexp', value: value.join(',') }); - } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { + } else if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { advanceSearchVOList.push({ connect: "and", field: key || '', From 49e654d9630d07384eccd39831ffdf5120ee4568 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 28 Mar 2022 11:28:01 +0800 Subject: [PATCH 08/49] feat: There is no way the, BUG #52111 --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index e672610a4..da7eb9b61 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -773,14 +773,14 @@ align="center"> + label="企标编号"> + label="企标名称"> + label="企标编号"> + label="企标名称"> + label="企标编号"> + label="企标名称"> + label="企标编号"> + label="企标名称"> + label="企标编号"> + label="企标名称"> + label="企标编号">