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

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'}
         ],
@@ -2196,7 +2196,7 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '文本状态的值')
+      console.log(this.textStatusMap, '外面的文本状态的值')
     },
       busVsFunc(){
           this.$http.get('sarVppsTree/list', '', {