From d25118f6aa0f8fd5076b6cca6c82f1f9846682be Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 3 Sep 2021 15:39:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index f21179876..7f43379ab 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -95,7 +95,7 @@ export default { allowType: { type: Array, default: () => { - return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.jpg','.JPG','.jpeg','.JPEG', '.PNG', '.png', '.xls','.XLS', '.xlsx','.XLSX'] + return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX'] } }, // 栅格比例 From 493c3f53239f9502bb533c00f4efb0e126244188 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 3 Sep 2021 15:48:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandardsForEnterprise.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index a4993dac7..1cce90a58 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -35,17 +35,17 @@
- - - - - - + + + + + + + + + + + From 93a0ca58c109ccfcf1a65451814c8366823eabfe Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 3 Sep 2021 16:09:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c1acaa477..6d8ab71ef 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1935,9 +1935,9 @@ export default { {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} // {validator: this.verify.valiateEnName, trigger: 'blur'} ], - // standState: [ - // {required: true, message: '标准状态不能为空', trigger: 'change'} - // ], + standState: [ + {required: true, message: '文本状态不能为空', trigger: 'change'} + ], replaceStandNum: [ {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'} ], From f81aff8d577b07b070aa729c85e27733e1940d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 3 Sep 2021 16:37:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index dda043f7d..fb9021132 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -731,10 +731,12 @@ export default { } }); } else { + this.isSubmit = false return this.$message.warning("请完善人员信息"); } }); } else { + this.isSubmit = false return this.$message.warning("请完善基础信息"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index db361dfff..df6bed631 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -705,10 +705,12 @@ export default { } }); } else { + this.isSubmit = false; return this.$message.warning("请完善人员信息"); } }); } else { + this.isSubmit = false; return this.$message.warning("请完善基础信息"); } });