Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/knowledgeExtra/AddDiagBase.vue

@@ -74,7 +74,7 @@
                 },
                 id:null,
                 rules:{
-                    conceptId:[{ required: true, message: '请输入疾病名称',trigger: ['blur'] }],
+                    conceptId:[{ required: true, message: '请输入疾病名称',trigger: ['change'] }],
                     description:[{
                         validator: (rule,value,callback)=>{
                             if(value.length>100){
@@ -134,7 +134,7 @@
                                 that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.basDescription']=[{required: true, message: '请输入基础依据名称',trigger: ['blur'] }];
                                 that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.basType']=[{ required: true, message: '请选择基础依据类型',trigger: ['change'] }];
                                 that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.basLibType']=[{ required: true, message: '请选择基础依据术语类型',trigger: ['change'] }];
-                                that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.basConceptId']=[{ required: true, message: '请输入医学标准术语',trigger: ['blur'] }];
+                                that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.basConceptId']=[{ required: true, message: '请输入医学标准术语',trigger: ['change'] }];
                                 that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.dataType']=[{ required: true, message: '请选择类型',trigger: ['change'] }];
                                 that.rules['klDiagnoseTypeVO.'+i+'.groupVO.'+x+'.klDiagnoseDetail.'+j+'.maxOperator']=[{
                                     validator: (rule,value,callback)=>{
@@ -242,9 +242,9 @@
                 let temp = this.getInitData();
                 this.form.klDiagnoseTypeVO = [temp];
             },
-            addDiag(){
+            addDiag(i){
                 let temp = this.getInitData();
-                this.form.klDiagnoseTypeVO.push(temp);
+                this.form.klDiagnoseTypeVO.splice(i+1,0,temp);
                 this.setRules();
             },
             copyDiag(i){

src/components/knowledgeExtra/DiagBaseGroup.vue

@@ -37,6 +37,7 @@
 </template>
 <script>
     import DiagBaseItem from './DiagBaseItem.vue';
+    import util from '../../api/utils.js'
     export default {
         name:'DiagBaseGroup',
         props:['data','inx','isLast','diagTypeList','parInx'],
@@ -96,10 +97,10 @@
                     this.$emit("delGroup",this.inx);
                     return;
                 }
-                this.data.klDiagnoseDetail.splice(i,1);
+                this.data.klDiagnoseDetail.splice(i,1,null);
             },
             addGroup(){
-                this.$emit("addGroup");
+                this.$emit("addGroup",this.inx);
             },
             delGroup(){
                 this.$emit("delGroup",this.inx);

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="groups-cont">
+    <div class="groups-cont" v-if="groupData">
         <!--<el-form ref="groupData" label-width="150px" class="sub-condition-form" :model="groupData" :rules="rules">-->
         <div class="sub-condition-form">
         <span v-if="!isLast" class="del-btn"  @click="delRule">删除</span><!--:class="isLast?'disable del-btn':'del-btn'"-->

src/components/knowledgeExtra/DiagBaseType.vue

@@ -67,7 +67,7 @@
                       this.typeList = typeListData;
                   },
                   addDiag(){
-                      this.$emit("addDiag");
+                      this.$emit("addDiag",this.inx);
                   },
                   delDiag(){
                       this.$emit("delDiag",this.inx);
@@ -75,7 +75,7 @@
                   copyDiag(){
                       this.$emit("copyDiag",this.inx);
                   },
-                  addGroup(){
+                  addGroup(i){
                       const temp={
                           "baseGroup": '',
                           "conditionGroup": '',
@@ -98,7 +98,7 @@
                               "minVal": ""
                           }]
                       };
-                      this.data.groupVO.push(temp);
+                      this.data.groupVO.splice(i+1,0,temp);
                       this.$emit('setRules');
                   },
                   delGroup(i){
@@ -119,10 +119,15 @@
               background: #E3EAF4;
               padding: 20px 0;
           }
+          /deep/ .diag-type .el-form-item__error{
+              top: 35px!important;
+              left: 0!important;
+              background: none!important;
+          }
           .diag-type{
               background: #fff;
               margin: 0 20px;
-              padding: 8px 0;
+              padding: 8px 0 15px;
           }
           .group-oper{
               margin: 20px 20px 0 20px;