From 757533548a57023ea46c302c5958b9f0ea94b2b2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 25 Dec 2021 13:51:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 1cf1bbf63..a0b51bf52 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -373,7 +373,7 @@ @click="exportTestItem">提交 - + - + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel">

@@ -1632,9 +1632,9 @@ import MechanismTree from '@/components/mechanismTree' import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2' import {interfaceUrl} from "@/sysConfig"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; -import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import store from "@/store"; import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' +import treeSelectModule from "@/components/treeSelect/treeSelectModule"; export default { @@ -1658,7 +1658,7 @@ export default { MechanismTree, CustomDatePickWithText2, TreeSelect, - TreeSelectNew, + treeSelectModule, ProcessTitle }, data() { From cd9a47e60d522952c800d93fe3bf92866dfc4a8d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Dec 2021 16:44:40 +0800 Subject: [PATCH 2/6] feat: There is no way the, --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step10.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step11.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step12.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step14.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step2.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step4.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step5.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step7.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step8.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step9.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- .../pages/creatProcess/qbrk-product/stepDetail.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step10.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step11.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk/stepDetail.vue | 2 +- src/pages/processCenter/pages/creatProcess/zcrk/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/zcrk/step3.vue | 2 +- src/pages/processCenter/pages/newProcess/index.vue | 2 +- .../components/EnterpriseStandardDatabase.vue | 2 +- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 4 ++-- 36 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index dbccea007..e4524af2b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1330,7 +1330,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 56b62e5dc..6d042d53c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 00ce5e7d1..a850d1ef6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 804c28069..39ab3e71e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 0a16da727..b509579d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1001,7 +1001,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index 8a1fbf833..a8096d977 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -1001,7 +1001,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 707f8770b..3f987bda5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -923,7 +923,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 19e362079..73ad99dda 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -986,7 +986,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index f73db12da..b626ad27e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 24b5c7ff7..089efc835 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -940,7 +940,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 5c93b1bb8..1e2d38fcc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -987,7 +987,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 0dc8568ac..54bcc37df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -1014,7 +1014,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index a7b591e0e..3981fc135 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index b4e677629..494f38bce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -920,7 +920,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index a8d12be8a..f1d38f49d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -978,7 +978,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index edcad9083..f3c896278 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -987,7 +987,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index 0a465070e..146e654ce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -916,7 +916,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index a36f16b39..b4720bf4d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -934,7 +934,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 296fcdf79..75ee3ac5d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -933,7 +933,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 6fda9044e..f41974199 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -923,7 +923,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e982921b6..e4ffa494f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -924,7 +924,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 9e3343ac1..f2513b18e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -986,7 +986,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 84268fca0..ef1825681 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -929,7 +929,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 60dcc9e92..4897217d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1044,7 +1044,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 374baffca..c1bfecd8b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1028,7 +1028,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index b92f7ccad..5a8d24104 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1060,7 +1060,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 1be01628c..0e4c94e6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -1063,7 +1063,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 72f34a058..12b0c479f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1063,7 +1063,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 6247e964b..d689029d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -985,7 +985,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 2ae773d3e..063e8ed6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1028,7 +1028,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 6c9481940..0d84b0fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -918,7 +918,7 @@ standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index aa845207d..769dc0c58 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -1252,7 +1252,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue index 82969e214..ebe06b6b8 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue @@ -1302,7 +1302,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 153e7102c..84af9e5d8 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -190,7 +190,7 @@

企业标准相关流程

- +
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c8d3c6477..9acb042fd 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1918,7 +1918,7 @@ export default { standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ {required: true, message: '英文名称不能为空', trigger: 'change'}, diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 05f834799..d72dbab57 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -1817,7 +1817,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, @@ -1859,7 +1859,7 @@ lawsName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], lawsEnName: [ {required: false, message: '英文名称不能为空', trigger: 'change'}, From 14fb2224601fe4efc9592241f0f96a1e4e5fd80f Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:34:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 32df2bcfe..41b11df2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -69,7 +69,7 @@ 批量编辑
{ this.zxIdList.push(item.id) }) + console.log(this.zxIdList) }, getData() { return new Promise((resolve, reject) => { From 642f431c441a1d13416fe38489cb30bd366ee2f3 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:34:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 41b11df2e..45d840009 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -476,7 +476,6 @@ val.forEach( item => { this.zxIdList.push(item.id) }) - console.log(this.zxIdList) }, getData() { return new Promise((resolve, reject) => { From aa9bf648790d6d19c117ac09cd81e7919af7520a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:42:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E9=80=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 730458af1..b8e1bec22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -395,7 +395,7 @@ this.roleForm.presidentUserName = data[0].name } }, - choiceZRRS () { + choiceZRRS (type) { this.type2 = type this.nodeList2 = [] if (type === '1') { From 8849004b05d377f70ce8f19d5e58023d124181bb Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 30 Dec 2021 17:46:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E6=A1=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c8d3c6477..08ca7b061 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -285,8 +285,9 @@ fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange" > + +