From b6df72eb752cb1a70f7146018cfd928d97142686 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 9 Aug 2022 13:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E9=A2=98=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 530ff93fb..722984cd1 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -134,15 +134,15 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if='required'>
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required" v-if='required'>*</span>
+                <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}</span>
                 </div>
-                <a-form-model-item class="itemModel-multi" :prop="required?certCategory:''">
+                <a-form-model-item class="itemModel-multi" prop="certCategory">
                   <j-multi-select-tag-only-rz class="box-input" v-model="formInline.certCategory"
                                       @change='Onchange'
                                       v-on:changelabel='Onchangelabel'
@@ -248,15 +248,15 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24" v-if='contentList != []'>
+          <a-row :gutter="24" >
+            <a-col :span="24" v-if='required'>
               <a-tabs>
                 <a-tab-pane  v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
-                  <a-row :gutter="24">
+                  <a-row :gutter="24">吧
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                        <span class="Required" v-if='required'>*</span>
+                        <span class="Required">*</span>
                         <span class="title-text-text"
                               :title="$t('ParameterNo')">{{$t('ParameterNo')}}</span>
                         </div>
@@ -271,7 +271,7 @@
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                          <span class="Required" v-if='required'>*</span>
+                          <span class="Required">*</span>
                           <span class="title-text-text" :title="$t('NParameterName')">{{$t('NParameterName')}}</span>
                         </div>
                         <a-form-model-item class="itemModel">
@@ -679,7 +679,6 @@ export default {
         return
       }
       let falg = 1
-      if(this.formInline.controlType != 11){
         this.contentList.forEach((item,index) => {
           let reg = /^[0-9a-zA-Z-/. ]{1,}$/
           // 编号的限制
@@ -715,7 +714,6 @@ export default {
             }
           }
         })
-      }
 
       if(falg === 1) {
         this.$refs.ruleForm.validate(valid => {