Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/drugs.vue

@@ -2,7 +2,7 @@
   <div class="page_drugs">
     <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
       <div class="cell clearfix" style="margin-bottom:0;">
-        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction'
                   class="filter-item" v-model="keywords"/>
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -41,9 +41,13 @@
                       <td :colspan="item.details.length" v-if="index == 0">{{ item.total }}</td>
                     </tr>
                 </div>
-                <tr v-for="(item,index) in info.transBody.outputlist2" :key="index">
-                    <td colspan="2">{{getValue(item)}}</td>
-                    <td>合计: {{info.transBody.akc264?info.transBody.akc264:0}}元</td>
+                <tr>
+                  <td colspan="7">
+                    <div style="display:flex;flez-wrap:wrap;">
+                      <div style="width:33%;" v-for="(item,index) in info.transBody.outputlist2" :key="index">{{getValue(item)}}</div>
+                    </div>
+                  </td>
+                  <td>合计: {{info.transBody.akc264?info.transBody.akc264:0}}元</td>
                 </tr>
                 <tr>
                     <td colspan="7">