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

src/components/knowledgeExtra/DiagBaseGroup.vue

@@ -4,6 +4,7 @@
         <!--<el-form ref="form" class="add-new-form" label-width="140px" :model="data" :rules="rules">-->
             <DiagBaseItem v-for="(rules,i) in data.klDiagnoseDetail"
                            ref="group"
+                           :key="i"
                            :groupData="rules"
                            :ind="i"
                            :inx="inx"
@@ -12,6 +13,10 @@
                            :baseTypes="diagTypeList"
                            @changeVal="handleInput"
                            @delRule="delRule"></DiagBaseItem>
+            <div class="inner-oper">
+                <span>新增基础依据：</span>
+                <span class="add-btn" @click="addRule"><img src="../../images/add.png" alt="新增基础依据"></span>
+            </div>
             <el-form-item label="符合条件的数量：" :prop="'klDiagnoseTypeVO.'+parInx+'.groupVO.'+inx+'.fitNo'" class="diag-num">
                 <el-select v-model="data.fitNo"
                            placeholder="请选择"
@@ -24,10 +29,6 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <div class="inner-oper">
-                <span>新增基础依据：</span>
-                <span class="add-btn" @click="addRule"><img src="../../images/add.png" alt="新增基础依据"></span>
-            </div>
         </div>
         <div class="group-oper">
             <el-button size="small" @click="addGroup">+新增分组</el-button>

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -3,10 +3,10 @@
         <!--<el-form ref="groupData" label-width="150px" class="sub-condition-form" :model="groupData" :rules="rules">-->
         <div class="sub-condition-form">
         <span v-if="!hideDel" class="del-btn"  @click="delRule">删除</span><!--:class="isLast?'disable del-btn':'del-btn'"-->
-            <el-form-item label="基础依据名称：" :prop="ruleLine+ind+'.basDescription'">
+            <el-form-item label="基础依据名称：" :key="0" :prop="ruleLine+ind+'.basDescription'">
                 <el-input v-model.trim = "groupData.basDescription"></el-input>
             </el-form-item>
-            <el-form-item label="基础依据类型：" :prop="ruleLine+ind+'.basType'">
+            <el-form-item label="基础依据类型：" :key="1" :prop="ruleLine+ind+'.basType'">
                 <el-select v-model="groupData.basType"
                            id="basTypeRef"
                            placeholder="请选择"
@@ -20,7 +20,7 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="!showRegx" label="基础依据术语类型：" :prop="ruleLine+ind+'.basLibType'">
+            <el-form-item v-if="!showRegx" :key="2" label="基础依据术语类型：" :prop="ruleLine+ind+'.basLibType'">
                 <el-select v-model="groupData.basLibType"
                            placeholder="请选择"
                            size="small"
@@ -33,10 +33,10 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="showRegx" label="基础依据术语类型：" class="is-required">
+            <el-form-item v-if="showRegx" :key="3" label="基础依据术语类型：" class="is-required">
                 <el-input disabled v-model="basTypeName"></el-input>
             </el-form-item>
-            <el-form-item v-if="!showRegx" class="addDepartFormItem" label="医学标准术语：" :prop="ruleLine+ind+'.basConceptId'">
+            <el-form-item v-if="!showRegx" :key="4" class="addDepartFormItem" label="医学标准术语：" :prop="ruleLine+ind+'.basConceptId'">
                 <el-select clearable remote filterable :remote-method="searchConcept" v-model.trim="groupData.basConceptId">
                     <el-option
                             v-for="item in conceptList"
@@ -46,7 +46,7 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="groupData.basType===2&&!onlyNum&&!onlyTxt" label="选择类型：" :prop="ruleLine+ind+'.dataType'">
+            <el-form-item :key="5" v-if="groupData.basType===2&&!onlyNum&&!onlyTxt" label="选择类型：" :prop="ruleLine+ind+'.dataType'">
                 <el-select v-model="groupData.dataType"
                            placeholder="请选择"
                            size="small" @change="dataTypeChange">
@@ -58,7 +58,7 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item class="min-margin" v-if="groupData.dataType==='1'||onlyNum" label="最大值：">
+            <el-form-item class="min-margin" :key="6" v-if="(!showRegx&&groupData.dataType==='1')||onlyNum" label="最大值：">
                 <div class="select-item clearfix">
                     <el-col :span="3">
                         <el-form-item :prop="ruleLine+ind+'.maxOperator'">
@@ -86,7 +86,7 @@
                     </el-col>
                 </div>
             </el-form-item>
-            <el-form-item class="min-margin" v-if="groupData.dataType==='1'||onlyNum" label="最小值：">
+            <el-form-item class="min-margin" v-if="(!showRegx&&groupData.dataType==='1')||onlyNum" label="最小值：">
                 <div class="select-item clearfix">
                     <el-col :span="3">
                         <el-form-item :prop="ruleLine+ind+'.minOperator'">
@@ -192,9 +192,6 @@
             showRegx:function(){
               return this.groupData.basType===3||this.groupData.basType===4;
             },
-            textName:function(){
-                return this.showRegx?'正则表达式':'医学内容';
-            },
         },
         methods:{
             dataTypeChange(val){
@@ -203,7 +200,7 @@
                 delete this.groupData.dataType;     //触发更新
                 this.$set(this.groupData,'dataType',val);
             },
-            basTypeChange(val){        //基础规则类型修改
+            basTypeChange(val){        //基础依据类型修改
                 if(!val){
                     this.baseTermTypeList =[];
                     return;
@@ -214,7 +211,7 @@
                 const obj = this.baseTypes.find((it)=>it.type===val);
                 this.baseTermTypeList = obj.subMenuList;
             },
-            subCodeChange(val){        //基础规则术语类型修改
+            subCodeChange(val){        //基础依据术语类型修改
                 this.groupData.basLibType=val;
                 if((this.numTypes+',').indexOf(val+',')>-1){
                     this.groupData.dataType='1';