合并分支

src/components/icss/AddMedicalName.vue

@@ -35,7 +35,7 @@
             </td>
             <td class="desc">
               <!-- <el-input v-model="data.remark" placeholder="请输入术语说明" maxlength="120" size="small" @input="handleRemark"></el-input> -->
-              <input v-model="data.remark" placeholder="请输入术语说明" maxlength="120" @blur="handleRemark(1)"></input>
+              <input v-model="data.remark" placeholder="请输入术语说明" maxlength="120"></input>
             </td>
           </tr>
         </table>
@@ -69,7 +69,7 @@
             </td>
             <td class="desc">
               <!-- <el-input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" size="small" @input="handleRemark(index,item.name)"></el-input> -->
-              <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" @blur="handleRemark(2,index)"></input>
+              <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120"></input>
             </td>
             <td v-if="id">
               <span @click="deleLine(index)" class="delete">删除</span>

src/components/icss/AddSimilarName.vue

@@ -259,7 +259,7 @@
           const result = res.data;
           if(result.code==0){
             this.searchDatas = result.data;
-            if(result.data.length>0){
+            if(result.data&&result.data.length>0){
               this.showFlag = true;
             }
           }else{
@@ -323,16 +323,17 @@
   }
   .search{
     display: inline-block;
-    width: 56px;
+    width: 55px;
     height: 32px;
     border-left: 1px solid #ccc;
     position: relative;
     left: -57px;
     vertical-align: middle;
     line-height: 32px;
-    bottom: 2px;
+    bottom: 1px;
     text-align: center;
     cursor: default;
+    background: #fff;
   }
   h3{
     font-size: 16px;

src/components/icss/ChronicDiseaseManage.vue

@@ -177,4 +177,4 @@
     .delete:hover {
         color: red;
     }
-</style>
+</style>

src/components/icss/MedicalName.vue

@@ -2,7 +2,7 @@
     <div>
         <crumbs title="医学术语命名维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="术语：">
+                <el-form-item label="医学标准术语：">
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">