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

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -138,11 +138,11 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if='required'>*</span>
                 <span class="title-text-text"
                       :title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}</span>
                 </div>
-                <a-form-model-item class="itemModel-multi" prop="certCategory">
+                <a-form-model-item class="itemModel-multi" :prop="required?certCategory:''">
                   <j-multi-select-tag-only-rz class="box-input" v-model="formInline.certCategory"
                                       @change='Onchange'
                                       v-on:changelabel='Onchangelabel'
@@ -370,6 +370,7 @@ export default {
       certCategoryParamsInfoEOList: [], // 认证类别得tab栏
       formInline: {},
       confirmLoading: false,
+      required:true,
       visible: false,
       rules: {
         nioNumber:[
@@ -470,6 +471,11 @@ export default {
     },
     controlTypeChange(value){
          this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues'])
+      if(value == 11){
+        this.required = false
+      }else {
+        this.required = true
+      }
     },
     uploadSuccess(data) {
       let attIdList = []
@@ -663,7 +669,7 @@ export default {
       this.$refs['ruleForm'].resetFields()
     },
     handleSubmit() {
-      if(this.formInline.certCategory == undefined) {
+      if(this.formInline.certCategory == undefined && this.formInline.controlType != 11) {
         this.$message.warning(this.$t('certificationCategory')+this.$t('cannotEmpty'))
         return
       }