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

src/xt_pages/hospitalStation/allListTemplate/printOne.vue

@@ -24,7 +24,7 @@
                         <td style="width:10%">{{item.med_chrgitm_type}}</td>
                         <td style="width:50%">{{item.name}}</td>
                         <td style="width:10%">{{item.spec}}</td>
-                        <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                        <td style="width:10%text-align:right;">{{(item.price).toFixed(2)}}</td>
                         <td style="width:10%">{{item.count}}{{item.unit}}</td>
                         <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
                     </tr>

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

@@ -15,7 +15,7 @@
     </div>
 
     <div class="allListInfo">
-      <div>西药:{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
+      <div>西药:&nbsp;&nbsp;&nbsp;{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
       <div >中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
       <div >中草药:</div>
       <div >检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
@@ -42,6 +42,7 @@
       <div >麻醉费:</div>
       <div >材料费:{{order.materialCostTotal?order.materialCostTotal:''}}</div>
       <div >其他费:{{order.otherCostTotal?order.otherCostTotal:''}}</div>
+      <div style="visibility: hidden;">其他费:</div>
     </div>
     <!--    <div style="display:flex;justify-content: space-between;">-->
 <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
@@ -97,12 +98,12 @@
       <template v-for='(item,index) in list'>
         <tr>
           <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-          <td style="width:35%">{{ item.name }}</td>
+          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.name }}</td>
           <td style="width:15%">{{ item.spec }}</td>
           <td style="width:5%">{{ item.unit }}</td>
           <td style="width:10%">{{ item.count }}</td>
-          <td style="width:10%">{{ item.price }}</td>
-          <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
+          <td style="width:10%;text-align:right;">{{ item.price }}</td>
+          <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
           <td style="width:10%">{{ item.medicine_insurance_kind }}</td>
 
         </tr>

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -38,11 +38,11 @@
             <td style="width:5%">{{index + 1}}</td>
             <td style="width:15%">{{item.p_time}}</td>
             <td style="width:10%">{{item.feedetl_sn.split("-")[2]}}</td>
-            <td style="width:40%">{{item.name}}/{{item.spec}}</td>
+            <td style="width:40%;white-space: nowrap;overflow: hidden;">{{item.name}}/{{item.spec}}</td>
             <td style="width:5%">{{item.unit}}</td>
             <td style="width:5%">{{ item.count }}</td>
-            <td style="width:10%">{{ item.price }}</td>
-            <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
+            <td style="width:10%;text-align:right;">{{ item.price }}</td>
+            <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
           </tr>
         </template>
       </table>