From 8eb9652d17fcfa3f4efe8cd861d328f315d875b6 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 12:07:15 +0800 Subject: [PATCH] feat: There is no way the, BUG #52130 --- .../pages/creatProcess/qbrk-product/step1.vue | 29 +++++++++----- .../creatProcess/qbrk-product/step13.vue | 29 +++++++++----- .../pages/creatProcess/qbrk-product/step3.vue | 29 +++++++++----- .../pages/creatProcess/qbrk-product/step6.vue | 29 +++++++++----- .../creatProcess/qbrk-product/stepC3.vue | 29 +++++++++----- .../creatProcess/qbrk-product/stepC6.vue | 39 ++++++++++++++----- .../pages/creatProcess/qbrk/step1.vue | 32 ++++++++++----- .../pages/creatProcess/qbrk/step12.vue | 38 ++++++++++++------ .../pages/creatProcess/qbrk/step13.vue | 32 ++++++++++----- .../pages/creatProcess/qbrk/step3.vue | 32 ++++++++++----- .../pages/creatProcess/qbrk/step6.vue | 32 ++++++++++----- .../pages/creatProcess/qbrk/stepC3.vue | 32 ++++++++++----- .../pages/creatProcess/qbrk/stepC6.vue | 32 ++++++++++----- 13 files changed, 293 insertions(+), 121 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 6deb04cef..7ad6212d3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -775,8 +775,7 @@ { let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + if(item.standCode !== null && item.standCode !== ''){ + texts = item.standCode + }else { + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } } textArr2.push(item.standNumber) textArr.push(texts) @@ -2450,20 +2453,28 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - this.form.DTQBBHBUSS = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(textArr.join(',')) }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ - this.form.BDTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.join(',') + this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() }, + filterSetData(data){ + const arr=new Set() + let permission = data.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + return Array.from(arr).join(','); + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 2619f9700..6a5a35efb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -323,8 +323,7 @@ { let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + if(item.standCode !== null && item.standCode !== ''){ + texts = item.standCode + }else { + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } } textArr2.push(item.standNumber) textArr.push(texts) @@ -1879,14 +1882,14 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - this.form.DTQBBHBUSS = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(textArr.join(',')) }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ - this.form.BDTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.join(',') + this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -1894,6 +1897,14 @@ this.$refs.selections.clearSelection() this.formKey++ }, + filterSetData(data){ + const arr=new Set() + let permission = data.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + return Array.from(arr).join(','); + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 3150ce4f5..57b5e648f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -365,8 +365,7 @@ { let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + if(item.standCode !== null && item.standCode !== ''){ + texts = item.standCode + }else { + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } } textArr2.push(item.standNumber) textArr.push(texts) @@ -1938,14 +1941,14 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - this.form.DTQBBHBUSS = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(textArr.join(',')) }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ - this.form.BDTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.join(',') + this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -1953,6 +1956,14 @@ this.$refs.selections.clearSelection() this.formKey++ }, + filterSetData(data){ + const arr=new Set() + let permission = data.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + return Array.from(arr).join(','); + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index e8d6c89b0..697c77896 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -435,8 +435,7 @@ { let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + if(item.standCode !== null && item.standCode !== ''){ + texts = item.standCode + }else { + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } } textArr2.push(item.standNumber) textArr.push(texts) @@ -2030,14 +2033,14 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - this.form.DTQBBHBUSS = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(textArr.join(',')) }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ - this.form.BDTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.join(',') + this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -2045,6 +2048,14 @@ this.$refs.selections.clearSelection() this.formKey++ }, + filterSetData(data){ + const arr=new Set() + let permission = data.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + return Array.from(arr).join(','); + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 21f3920fc..5f14880be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -365,8 +365,7 @@ { let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + if(item.standCode !== null && item.standCode !== ''){ + texts = item.standCode + }else { + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } } textArr2.push(item.standNumber) textArr.push(texts) @@ -1939,14 +1942,14 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - this.form.DTQBBHBUSS = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(textArr.join(',')) }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ - this.form.BDTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.join(',') + this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -1954,6 +1957,14 @@ this.$refs.selections.clearSelection() this.formKey++ }, + filterSetData(data){ + const arr=new Set() + let permission = data.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + return Array.from(arr).join(','); + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index f08384699..e470b5976 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -696,14 +696,21 @@