Merge branch 'develop' into FOTON

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 || ''

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'}
         ],

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' }
         ],*/

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 || ''

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'}