入库必填项

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -126,7 +126,7 @@
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
-                  <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess.length>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
+                  <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
                 <el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
@@ -1840,10 +1840,14 @@ export default {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
+        this.rules.standYear[0].required = false;
+        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
+        this.rules.standYear[0].required = true;
+        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
       //切换清空表单
@@ -2996,6 +3000,7 @@ export default {
 
     },
     handleSubmit() {
+
       // this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {
@@ -3045,6 +3050,8 @@ export default {
                       }
                       // 流程提交之后，应该流转至待办任务页面
                       this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                      this.isSubmit = false
                     }
                   })
                 }

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -55,14 +55,14 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                <el-form-item label="标准年份" v-show="form.standInData === '0'" prop="standYear" class="add-form-item form-item-disabled">
                   <el-input
                           v-model="form.standYear"
                           placeholder="请输入标准标准年份"
                           clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-form-item label="标准中文名称"v-show="form.standInData === '0'"  prop="standName" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.standName"
                       placeholder="请输入标准中文名称"
@@ -1686,12 +1686,16 @@ export default {
       // 国内英文名称不必填 国外必填 ，标准性质国内不体现
       if (val === '1') {
         this.rules.standName[0].required = false
-        this.rules.standNature[0].required = false
         this.rules.standEnName[0].required = true;
+        this.rules.standNature[0].required = false
+        this.rules.standYear[0].required = false;
+        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
+        this.rules.standYear[0].required = true;
+        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
     },

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -251,7 +251,6 @@
             </el-table-column>
             <el-table-column
                 prop="SSRQ"
-                sortable="custom"
                 width="120"
                 label="实施日期">
               <template slot-scope="scope">
@@ -266,7 +265,6 @@
 
             <el-table-column
                 prop="XCXSSRQ"
-                sortable="custom"
                 width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
@@ -278,7 +276,6 @@
             </el-table-column>
             <el-table-column
                 prop="ZCCSSRQ"
-                sortable="custom"
                 width="150"
                 label="在产车实施日期">
               <template slot-scope="scope">