Merge branch 'dragTerm1025-mofan' of http://192.168.2.236:10080/zhouna/cdssHospital into dragTerm1025-mofan

src/components/icss/drug/DrugManage.vue

@@ -30,6 +30,12 @@
         <el-form-item label="医院药品名称：">
           <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
         </el-form-item>
+		<el-form-item label="标准药品名称：">
+		  <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
+		</el-form-item>
+		<el-form-item>
+		  <el-button size="mini" @click="filterDatas">检索</el-button>
+		</el-form-item>
       </el-form>
       <el-form class="secLine" :inline="true">
         <el-form-item>
@@ -41,11 +47,7 @@
           <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>
-        <el-form-item label="标准药品名称：">
-          <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
         <el-form-item>
-          <el-button size="mini" @click="filterDatas">检索</el-button>
           <el-button size="mini" type="warning" @click="addRelation">添加关联</el-button>
         </el-form-item>
       </el-form>

src/components/icss/hemp/Hemp.vue

@@ -209,7 +209,7 @@ export default {
             if (res.status === 200) {
               utils.downloadExportedData(
                 res.data,
-                '输血关联数据（预匹配）.xls'
+                '麻醉关联数据（预匹配）.xls'
               );
             }
           });
@@ -381,7 +381,7 @@ export default {
 
     // 导出数据
     exportData() {
-      this.$confirm('确定要导出全部输血关联数据吗？', '', {
+      this.$confirm('确定要导出全部麻醉关联数据吗？', '', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'leftbtn',
@@ -395,7 +395,7 @@ export default {
         //     api.exportFusionRecord().then(res => {
         //       if (res.status === 200) {
         //         setTimeout(() => {
-        //           utils.downloadExportedData(res.data, '输血关联数据.xls');
+        //           utils.downloadExportedData(res.data, '麻醉关联数据.xls');
         //           done();
         //         }, 1500);
         //       }
@@ -411,7 +411,7 @@ export default {
             .then(res => {
               if (res.status === 200) {
                 this.$message({ message: '导出成功', type: 'success' });
-                utils.downloadExportedData(res.data, '输血关联数据.xls');
+                utils.downloadExportedData(res.data, '麻醉关联数据.xls');
               }
             });
         })
@@ -424,7 +424,7 @@ export default {
       api.exportFusionModule({ type: 14 }).then(res => {
         if (res.status === 200) {
           setTimeout(() => {
-            utils.downloadExportedData(res.data, '输血导入模板.xls');
+            utils.downloadExportedData(res.data, '麻醉导入模板.xls');
           }, 1500);
         }
       });