From c31e4e0b637db975c06c6bf5c76bcc16db9e0d06 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Tue, 11 Oct 2022 15:49:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB=E4=B8=AD=E5=B8=A6=E6=9C=89?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=EF=BC=8C=E5=88=99=E6=8B=BC=E6=8E=A5=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E7=9A=84Code=E6=97=B6=E4=B8=8D=E5=86=8D=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E7=A9=BA=E6=A0=BC=EF=BC=8C=E4=BA=A7=E5=93=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8C=E6=A0=B7=E5=A6=82=E6=AD=A4=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E5=85=B6=E4=BB=96=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E7=9A=84=E9=9C=80=E8=A6=81=E5=86=8D=E6=8B=BC=E4=B8=8A=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 3 ++- .../components/EnterpriseStandardDatabase.vue | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 85a5fe84c..abf142a94 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -1012,7 +1012,7 @@ export default { }, res => { if (res.success) { resolve() - this.$message.success(res.message); + // this.$message.success(res.message); if (this.bpnId !== undefined && this.bpnId !== '') { let taskId = { id: this.bpnId @@ -1048,6 +1048,7 @@ export default { }) } if (finishCount === jsonData.length) { + this.$message.success("提交成功"); this.isSubmit = false this.$router.push('/processCenter') } diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 559f7b206..243d6b4ac 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4123,8 +4123,16 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - //此处因企标编号中带有空格所以此处不再补充添加空格 - nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(nowstandinfo.standSort)){ + nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + }else if(nowstandinfo.standSort === 'Q/QCBFC'){ + nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + }else { + nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + } + // if (nowstandinfo.standSort === 'Q/QCBFC'){ // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) // }else{