Merge remote-tracking branch 'origin/develop' into develop

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("请完善基础信息");
             }
           });

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("请完善基础信息");
             }
           });

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