Merge remote-tracking branch 'origin/test' into test

src/components/icss/AddMedicalInfo.vue

@@ -5,7 +5,7 @@
                 @click="back"
         ></i> 医学术语属性--{{isEdit?'修改':'添加'}}</div> -->
         <crumbs
-          :title=" isEdit? '医学术语属性-修改':'医学术语属性-添加'"
+          :title=" isEdit? '术语医学属性-修改':'术语医学属性-添加'"
           class="topBack"
           linkTo="/admin/LT-YXSYKWH-SYYXSXWH"
         ></crumbs>

src/components/icss/AddMedicalName.vue

@@ -4,7 +4,7 @@
     <div class="contents">
       <div class="content">
         <h3>添加术语：</h3>
-        <p class="titl">标准术语：</p>
+        <p class="titl">医学标准术语：</p>
         <table class="deptbox">
           <tr>
             <td class="ind">序号</td>
@@ -16,7 +16,9 @@
             <td class="ind">1</td>
             <td :title="data.name&&data.name.length>9?data.name:''">
               <!-- <el-input v-model="data.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(1)"></el-input> -->
-              <input type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @input="handleInput(1)">
+              <!-- 修改时标准词不能修改，修改了会当做新增处理 4-17 -->
+              <p v-if="id">{{data.name}}</p>
+              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @input="handleInput(1)">
             </td>
             <td>
               <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small">

src/components/icss/AddMedicalRelation.vue

@@ -20,11 +20,11 @@
         </div>
         <table class="deptbox">
           <tr>
-            <td>起始术语</td>
-            <td>类型</td>
-            <td>关系</td>
-            <td>终点术语</td>
-            <td>类型</td>
+            <td>起始术语<span class="necess">*</span></td>
+            <td>类型<span class="necess">*</span></td>
+            <td>关系<span class="necess">*</span></td>
+            <td>终点术语<span class="necess">*</span></td>
+            <td>类型<span class="necess">*</span></td>
           </tr>
           <tr>
             <td>
@@ -103,6 +103,13 @@
         })
       },
       comfirn(){
+        if(!this.data.startName.trim() || !this.data.relationName.trim() || !this.data.endName.trim()){
+          this.$message({
+            type:'warning',
+            message:'请填写相关信息'
+          })
+          return
+        }
         api.addRelationConcept(this.data).then((res)=>{
           const result = res.data;
           if(result.code==0){
@@ -227,4 +234,10 @@
     text-align: right;
     margin-top: 20px;
   }
+  .necess{
+    display: inline-block;
+    vertical-align: middle;
+    color: red;
+    margin-left: 2px;
+  }
 </style>

src/components/icss/MedicalInfo.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="医学术语属性维护">
+        <crumbs title="术语医学属性维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="医学标准术语：">
                     <el-input size="mini" v-model="filter.termName" placeholder="输入医学标准"></el-input>
@@ -24,7 +24,7 @@
                     <el-button size="mini" @click="uploadClick">导入</el-button>
                     <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
                     <router-link to="/admin/LT-YXSYKWH-TJYXSYXX" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加医学术语属性</el-button>
+                        <el-button size="mini" type="warning">添加术语医学属性</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>

src/components/icss/MedicalName.vue

@@ -24,7 +24,7 @@
                     <el-button size="mini" @click="uploadClick">导入</el-button>
                     <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
                     <router-link to="/admin/LT-YXSYKWH-TJYXSY" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加术语</el-button>
+                        <el-button size="mini" type="warning">添加医学标准术语</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>
@@ -228,6 +228,7 @@
             this.getDataList();
           }else{
             this.$message({
+              dangerouslyUseHTMLString: true,
               message:res.data.msg,
               type:'warning'
             });

src/components/icss/MedicalRelation.vue

@@ -127,9 +127,9 @@
       },
       filterDatas(){
         this.currentPage = 1;
-        this.getDataList();
+        this.getDataList(1);
       },
-      getDataList() {
+      getDataList(flag) {
         const param = this.getFilterItems();
         const param1 = {
           "current": this.currentPage,
@@ -143,7 +143,11 @@
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;
-            this.cacheData[param.current] = data.records;
+            if(!flag){//搜索时不缓存
+              this.cacheData[params.current] = data.records;
+            }else{
+              this.cacheData = {}
+            }
             this.total = data.total;
           }
         }).catch((error) => {
@@ -228,7 +232,6 @@
         e.preventDefault();
         let formData = new FormData();
         formData.append('uploadfile', fileInfo);
-        console.log(123,fileInfo,formData);
         const header = {
           headers:{
             'Content-Type': 'multipart/form-data'
@@ -242,6 +245,7 @@
             });
           }else{
             this.$message({
+              dangerouslyUseHTMLString: true,
               message:res.data.msg,
               type:'warning'
             });