From 605e30efe5341508fece7c32f7ac2385d0db3f31 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 13:17:22 +0800 Subject: [PATCH 01/14] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/InputForStandards.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 13cd59906..9a5278cba 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -120,7 +120,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 + 取消 提交
From ebf1c00dbb1d7192977f1ee65eea38affaaa96c2 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:01:31 +0800 Subject: [PATCH 02/14] =?UTF-8?q?bug=EF=BC=9A=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=A0=87=E5=87=86=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E8=BE=93=E5=85=A5?= =?UTF-8?q?@=E6=B2=A1=E6=9C=89=E5=87=BA=E7=8E=B0=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=92=8C=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7419e3753..abc7e6b24 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1433,10 +1433,10 @@ export default { assemClassOptions: [], // 总成分类下拉框 qcdwOptions: [], // 起草单位 nylxOptions: [], // 能源类型 - sycpxOptions: [], // 适用产品线 + // sycpxOptions: [], // 适用产品线 syzrOptions: [], // 适用认证 - zrbmOptions: [], // 责任部门 - zrgcsOptions: [], // 责任工程师 + // zrbmOptions: [], // 责任部门 + // zrgcsOptions: [], // 责任工程师 standAttributeList: [], sarStandardsSearch: { page: 1, @@ -1466,7 +1466,7 @@ export default { standNature: '', // 标准性质 putTime: '', // 实施日期 isRelateAccess: '', // 是否纳入标准清单 - nameShow: '', // 我司参与深度 + // nameShow: '', // 我司参与深度 qcdw: '', // 起草单位 nameShow: '', // 归口管理部门 ZCCTime: '', // 在产车实施日期 @@ -1772,10 +1772,10 @@ export default { {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} ], - // standEnName: [ - // {required: true, message: '英文名称不能为空', trigger: 'change'}, - // {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} - // ], + standEnName: [ + {required: false, message: '英文名称不能为空', trigger: 'change'}, + {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} + ], // isRelateAccess: [ // { required: true, message: '重要度不能为空', trigger: 'change' } // ], @@ -1793,7 +1793,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'} + { validator: this.verify.validateStandardItem, trigger: 'change'} ], standYear: [ {required: true, message: '标准年份不能为空', trigger: 'change'}, @@ -1805,7 +1805,7 @@ export default { {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'} ], standEnName: [ - {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'}, + {type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'}, {validator: this.verify.valiateEnName, trigger: 'blur'} ], synopsis: [ @@ -2266,6 +2266,7 @@ export default { this.$nextTick(() => { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values + console.log(this.formFieldList, 'assssssssssss') const formFieldList = this.formFieldList this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) if(this.sarStandardsInfoEO.standSystem){ @@ -4110,10 +4111,14 @@ export default { rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}] } if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { - rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) + if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') { + rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'}) + } else { + rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) + } } if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') { - rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}) + rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'}) } if (rule.length > 0) { rules[item.attrField] = rule From 7c8c50ca6c04fed98edf9ace05b24281d6760813 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:09:09 +0800 Subject: [PATCH 03/14] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BC=96=E8=BE=91-=E6=A0=87=E5=87=86=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E9=9C=80=E4=BF=AE=E6=94=B9=E5=8F=AA=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97,=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E7=AC=A6100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/verify/index.js | 9 +++++++++ .../domesticStandardsAndRegulations/index.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/verify/index.js b/src/common/verify/index.js index acb0272ba..2f030082a 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -457,6 +457,15 @@ export default { callback() } }, + // 验证输入数字和英文 + testNumberCode (rule, value, callback) { + let reg = /[0-9\-]/ + if (value !== '' && !value.match(reg)) { + return callback(new Error('只能输入数字')) + } else { + callback() + } + }, validUrl (rule, value, callback) { let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm if (!value.match(reg)) { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index abc7e6b24..732e58cb5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1765,8 +1765,8 @@ export default { ], standYear: [ {required: true, message: '标准年份不能为空', trigger: 'change'}, - {validator: this.verify.testItemCode, trigger: 'change'}, - {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'} + {validator: this.verify.testNumberCode, trigger: 'change'}, + {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} ], standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, From eae877d7959c0951b188b4b57605f2b7e0aa6a48 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:19:00 +0800 Subject: [PATCH 04/14] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E5=85=A5=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandards.vue | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 9a5278cba..249090656 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -336,20 +336,28 @@ export default { standNum = item.standSort + ' ' + item.standNumber } // 验证标准号在系统中是否存在 - this.$http.post('lawss/sarTestItem/validateStandNumber', { - standnumber: standNum - }, { - _this: this - }, res => { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.id, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + // this.$http.post('lawss/sarTestItem/validateStandNumber', { + // standnumber: standNum + // }, { + // _this: this + // }, res => { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.id, + // pageType: 'INLAND_STAND' + // } + // }) + // window.open(routeUrl.href, '_blank') + // }) + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: 'INLAND_STAND' + } }) + window.open(routeUrl.href, '_blank') }, getResetLawsNumRow () { this.replacePage = 1 From 74a795eadb5a9407628b0970dd87a3b517a0482d Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:37:48 +0800 Subject: [PATCH 05/14] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/DatePicker.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index 19fbd067e..c5ea683dc 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -11,6 +11,8 @@ :class="{'form-item-disabled': disabled}" > Date: Fri, 23 Jul 2021 14:48:11 +0800 Subject: [PATCH 06/14] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=9A=84=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 60d989f4a..27deb03e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -940,7 +940,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 + 取消 提交
@@ -987,7 +987,7 @@ v-model="standardSearchForm.standType" placeholder="请选择标准来源"> - + From f2551eb8816d7cee60e9592a2a59ae0805926b72 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 15:03:14 +0800 Subject: [PATCH 07/14] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E9=99=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0d47b1ac6..179e7af34 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -47,7 +47,7 @@

{{ sarStandardsInfoEO.standYear || '-' }}

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

-

{{ sarStandardsInfoEO.standNature || '-' }}

+

{{ standMap[sarStandardsInfoEO.standNature] || '-' }}