Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!249

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -20,6 +20,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会名称:" prop="comityName">
                   <el-select
+                    clearable
                     @change="comityChange"
                     v-model="rh_pageData.comityName"
                     placeholder="请选择标委会">
@@ -34,6 +35,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
                   <el-select
+                    clearable
                     @change="comityChangeOne"
                     v-model="rh_pageData.comityNameOne"
                     placeholder="请选择分标委">
@@ -48,6 +50,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityNameTwo"
                     placeholder="请选择工作组">
                     <el-option

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

@@ -1574,9 +1574,9 @@
                     { required: false, message: '请输入标准英文名称', trigger: 'blur' },
                     { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
                   ],
-                    /*standNature: [
+                    standNature: [
                         { required: true, message: '请选择标准性质', trigger: 'change' }
-                    ],*/
+                    ],
                     textStatus: [
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ]