Merge remote-tracking branch 'origin/diagBase6.0' into test

src/components/knowledgeExtra/DiagBaseGroup.vue

@@ -2,18 +2,6 @@
     <div class="sub-groups">
         <div class="group-items">
         <!--<el-form ref="form" class="add-new-form" label-width="140px" :model="data" :rules="rules">-->
-            <el-form-item label="符合条件的数量：" :prop="'klDiagnoseTypeVO.'+parInx+'.groupVO.'+inx+'.fitNo'" class="diag-num">
-                <el-select v-model="data.fitNo"
-                           placeholder="请选择"
-                           size="small">
-                    <el-option
-                            v-for="item in numArr"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
             <DiagBaseItem v-for="(rules,i) in data.klDiagnoseDetail"
                            ref="group"
                            :groupData="rules"
@@ -27,6 +15,18 @@
                            @changeVal="handleInput"
                            @addRule="addRule"
                            @delRule="delRule"></DiagBaseItem>
+            <el-form-item label="符合条件的数量：" :prop="'klDiagnoseTypeVO.'+parInx+'.groupVO.'+inx+'.fitNo'" class="diag-num">
+                <el-select v-model="data.fitNo"
+                           placeholder="请选择"
+                           size="small">
+                    <el-option
+                            v-for="item in numArr"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
         </div>
         <div class="group-oper">
             <el-button size="small" @click="addGroup">+新增分组</el-button>
@@ -43,15 +43,23 @@
         data(){
             return {
                 fitNo:'',
-                numArr:[{id:1,name:1},{id:2,name:2},{id:3,name:3},{id:4,name:4},{id:5,name:5},{id:6,name:6},{id:7,name:7},{id:8,name:8},{id:9,name:9},{id:10,name:10},],
+                //numArr:[{id:1,name:1},{id:2,name:2},{id:3,name:3},{id:4,name:4},{id:5,name:5},{id:6,name:6},{id:7,name:7},{id:8,name:8},{id:9,name:9},{id:10,name:10},],
                 /*rules:{
                     fitNo:[{required: true, message: '请选择符合条件的数量',trigger: ['change']}]}*/
             }
         },
         computed:{
-            baseTypeList:function(){
+            numArr:function(){
+                let arr=[];
+                const len = this.data.klDiagnoseDetail.length;
+                for(let i=0;i<len;i++){
+                    arr.push({id:i+1,name:i+1});
+                }
+                return arr;
+            }
+            /*baseTypeList:function(){
 
-            },
+            },*/
         },
         methods:{
             handleInput(val,i){
@@ -131,7 +139,7 @@
     .diag-num{
         background: #fff;
         padding: 13px 0;
-        border-bottom: 1px solid #E6E6E6;
+        /*border-bottom: 1px solid #E6E6E6;*/
     }
     .group-oper{
         text-align: center;

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -114,7 +114,7 @@
                     </el-col>
                 </div>
             </el-form-item>
-            <el-form-item v-if="groupData.dataType==='2'" label="医学内容：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
+            <el-form-item v-if="!onlyNum&&!showRegx&&groupData.basType===2&&groupData.dataType==='2'" label="医学内容：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
                 <el-input type="textarea" rows="3" placeholder="请输入医学内容" v-model.trim="groupData.eqValue"></el-input>
             </el-form-item>
             <el-form-item v-if="showRegx" label="正则表达式：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">

src/components/knowledgeExtra/DiagBaseType.vue

@@ -100,8 +100,12 @@
                       this.data.groupVO.push(temp);
                       this.$emit('setRules');
                   },
-                  delGroup(){
-                      this.data.groupVO.splice(this.inx,1);
+                  delGroup(i){
+                      if(i===0&&this.data.groupVO.length===1){
+                          this.$emit("delDiag",this.inx);
+                          return;
+                      }
+                      this.data.groupVO.splice(i,1);
                   }
               },
               components:{