Merge branch 'termLink0615' into test

src/components/cdssManage/dept/DeptManage.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>
@@ -15,6 +15,16 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label class="selectMedicine">
+            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
+              <el-option
+                v-for="item in matchList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="医院科室名称：">
             <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
           </el-form-item>

src/components/cdssManage/disease/Disease.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch"  @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/drug/DrugManage.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData" >预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/fusion/Fusion.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/lis/Lis.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/nursing/nursing.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/operation/Operation.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/pacs/Pacs.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/scale/ScaleManage.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -5,8 +5,8 @@
         <el-form-item style="marginBottom: 0px">
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
           <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
-          <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <el-button size="mini" @click="handleMatchData" style="margin:0 10px">预匹配</el-button>
+          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>