From b8a3ada25682829e8f1120be246b4f8f6ad5fc35 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 13 Jan 2022 09:49:30 +0800 Subject: [PATCH 1/2] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 6 +++++- .../processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 94b0ec32c..930e18aa2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -838,7 +838,11 @@ bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) - mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) + if (mes.form.date) { + mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) + } else { + mes.form.date = '' + } this.form = mes.form this.roleForm = mes.roleForm this.commentText1 = mes.commentText1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 944f7f125..142a2f9e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -659,7 +659,11 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) - mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) + if (mes.form.endTime) { + mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) + } else { + mes.form.endTime = '' + } this.form = mes.form this.roleForm = mes.roleForm this.commentText1 = mes.commentText1 || '' From 2dcbf1a0d5b8dfcf0ea1c2d16fce7fe1ba13ae4c Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 13 Jan 2022 10:27:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 6bac0ad17..51493bb8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1622,10 +1622,10 @@ export default { {required: true, message: '请输入标准中文名称', trigger: 'blur'}, {min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'} ], - standEnName: [ + /*standEnName: [ {required: false, message: '请输入标准英文名称', trigger: 'blur'}, {min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur'} - ], + ],*/ standNature: [ {required: true, message: '请选择标准性质', trigger: 'change'} ], diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 6c8b066c6..d7e5d2236 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1520,10 +1520,10 @@ export default { { required: true, message: '请输入标准名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], - standEnName: [ + /* standEnName: [ { required: false, message: '请输入标准英文名称', trigger: 'blur' }, { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' } - ], + ],*/ /*standNature: [ { required: true, message: '请选择标准性质', trigger: 'change' } ],*/ diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index f7b94cc3b..ec974d0bd 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2287,11 +2287,11 @@ export default { synopsis: [ {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'} ], - standEnName: [ + /* standEnName: [ {required: true, message: '英文名称不能为空', trigger: 'change'}, // {validator: this.verify.valiateEnName, trigger: 'blur'}, {type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'} - ], + ],*/ standName: [ {required: false, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}