Merge branch 'dragTerm1025-mofan' into test

src/components/icss/drug/DrugManage.vue

@@ -59,6 +59,12 @@
             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>
@@ -84,16 +90,7 @@
           />
           <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
           >

src/components/icss/hemp/Hemp.vue

@@ -1,4 +1,3 @@
-<<<<<<< .mine
 <template>
   <div>
     <crumbs title="麻醉关联维护" style="min-width: 980px" class="knowledgeTitle">
@@ -1351,5 +1350,4 @@ export default {
 #upFileMatch {
   display: none;
 }
-</style>
->>>>>>> .theirs
+

src/components/icss/lis/Lis.vue

@@ -266,7 +266,7 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim(),
+        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
         uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
         uniqueCode: '',
         hisDetailName: this.filter.hisDetailName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),