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

src/App.vue

@@ -54,7 +54,7 @@
                 return;
               case 500:
                 // 返回 500
-                this.message({
+                this.$message({
                   message:'该服务正在升级，请稍后再试',
                   type:'warning'
                 });

src/components/knowledgeExtra/DiagBase.vue

@@ -389,7 +389,7 @@
     }
     .unvailable{
         color: #FE7D3D;
-        &:hover{
+        &:hover,&:active,&:focus{
             color: #f19061;
         }
     }

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -24,7 +24,7 @@
                 <el-select v-model="groupData.basLibType"
                            placeholder="请选择"
                            size="small"
-                           :disabled="showRegx">
+                           :disabled="showRegx" @change="basLibTypeChange">
                     <el-option
                             v-for="item in baseTermTypeList"
                             :key="item.id"
@@ -37,7 +37,7 @@
                 <el-input disabled v-model="basTypeName"></el-input>
             </el-form-item>
             <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-select clearable remote filterable :remote-method="searchConcept" v-model.trim="groupData.basConceptId" @change="conceptChange">
                     <el-option
                             v-for="item in conceptList"
                             :key="item.conceptId"
@@ -207,12 +207,13 @@
                     return;
                 }
                 this.groupData.basLibType='';
+                this.groupData.dataType='';
                 this.clearConcept();    //清空医学标准术语
                 this.clearNumText();    //清空数值、医学内容
                 const obj = this.baseTypes.find((it)=>it.type===val);
                 this.baseTermTypeList = obj.subMenuList;
             },
-            subCodeChange(val){        //基础依据术语类型修改
+            basLibTypeChange(val){        //基础依据术语类型修改
                 this.groupData.basLibType=val;
                 if((this.numTypes+',').indexOf(val+',')>-1){
                     this.groupData.dataType='1';
@@ -222,6 +223,14 @@
                 this.clearConcept();
                 this.clearNumText();
             },
+            conceptChange(val){
+                this.groupData.basConceptId=val;
+                if(val){
+                    this.groupData.basLibName=this.conceptList.find((it)=>it.conceptId===val).conceptName;
+                }else{
+                    this.groupData.basLibName='';
+                }
+            },
             clearConcept(){
                 this.groupData.basConceptId='';
                 this.conceptList=[];