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

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']
       }
     },
     // 栅格比例

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -35,17 +35,17 @@
       <div class="search-area">
         <div class="left">
           <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
-            <el-form-item label="数据来源" class="search-item">
+<!--            <el-form-item label="数据来源" class="search-item">-->
-              <el-select v-model="replaceLawsNumForm.dataSource" filterable>
+<!--              <el-select v-model="replaceLawsNumForm.dataSource" filterable>-->
-                <el-option
+<!--                <el-option-->
-                  v-for="item in dataSourceOptions"
+<!--                  v-for="item in dataSourceOptions"-->
-                  :key="item.value"
+<!--                  :key="item.value"-->
-                  :value="item.value"
+<!--                  :value="item.value"-->
-                  :label="item.label"
+<!--                  :label="item.label"-->
-                >
+<!--                >-->
-                </el-option>
+<!--                </el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
             <el-form-item label="企标编号/标准名称" class="search-item input-width">
               <el-input
                 v-model="replaceLawsNumForm.numberName"
@@ -125,7 +125,7 @@
         </el-table-column>
         <el-table-column
           prop="standStateShow"
-          label="标准状态"
+          label="文本状态"
           width="130">
         </el-table-column>
       </el-table>

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: [
+        standState: [
-        //   {required: true, message: '标准状态不能为空', trigger: 'change'}
+         {required: true, message: '文本状态不能为空', trigger: 'change'}
-        // ],
+         ],
         replaceStandNum: [
           {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
         ],