合并depart分支

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/MedicalName.vue

@@ -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'
             });