From 67c6d4c0d7f87173fa4ce5bbb3c24afa188bb749 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Wed, 12 Oct 2022 12:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A4=9C=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/generationNumber/index.vue | 19 ++++++++++-- .../pages/creatProcess/qbrk-product/step1.vue | 10 ++++++- .../creatProcess/qbrk-product/step13.vue | 30 +++++++++++++++++-- .../pages/creatProcess/qbrk-product/step3.vue | 10 ++++++- .../pages/creatProcess/qbrk-product/step6.vue | 10 ++++++- .../creatProcess/qbrk-product/stepC3.vue | 10 ++++++- .../creatProcess/qbrk-product/stepC6.vue | 10 ++++++- .../pages/creatProcess/qbrk/step12.vue | 20 +++++++++++-- .../pages/creatProcess/qbrk/step13.vue | 30 +++++++++++++++++-- .../pages/creatProcess/qbrk/stepC1.vue | 20 +++++++++++-- 10 files changed, 151 insertions(+), 18 deletions(-) diff --git a/src/components/generationNumber/index.vue b/src/components/generationNumber/index.vue index 16e933212..e27d2080e 100644 --- a/src/components/generationNumber/index.vue +++ b/src/components/generationNumber/index.vue @@ -166,9 +166,22 @@ export default { // 拼接企标编号 let verNum = generationNumberForm.versionNumber.replace(/[^0-9]/ig,""); let verEn= generationNumberForm.versionNumber.replace(/[^A-Z]+/ig,""); - let standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + - generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + - this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + let standCode = '' + if(judgeFn.test(generationNumberForm.standSort)){ + standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + }else if(generationNumberForm.standSort === 'Q/QCBFC'){ + standCode = generationNumberForm.standCode + '' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + }else { + standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + } this.$emit('isOk', standCode, { standCode: standCode, qbCode: this.generationNumberForm.standAttribute, // 标准属性 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 9bfe22583..d064e8acb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2115,7 +2115,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.getStandInfoByReviseStatus() }else { this.form.standStatus = "3" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 2fd742551..450bc0f85 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -620,7 +620,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(nowstandinfo.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { callback(new Error('企标顺序号已存在或已锁定')) } @@ -2711,7 +2719,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" @@ -2729,7 +2745,15 @@ this.form.standNum = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } if(type === '1'){ this.isSubmit = false this.saveLoading = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 4bb710972..78dac3cdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1141,7 +1141,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 4ac222f41..b0f74796c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1219,7 +1219,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 7c32800ba..24d3e29a5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1141,7 +1141,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index be7310122..26a3ce56d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1229,7 +1229,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 1c27298d1..afa81e31e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2678,7 +2678,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, { _this: this @@ -2688,7 +2696,15 @@ this.form.standSn = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }, e => { }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1f7099b5c..179dd94b8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -665,7 +665,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + }else { + this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + } }else { callback(new Error('企标顺序号已存在或已锁定')) } @@ -2782,7 +2790,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { @@ -2794,7 +2810,15 @@ this.form.standNumber = standSn this.form.standNum = standSn this.form.standYear = this.regDate(year) // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index e378edc5a..23dc90fb9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2944,7 +2944,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, { _this: this @@ -2954,7 +2962,15 @@ this.form.standSn = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }, e => { }) }