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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -85,9 +85,9 @@
         if(this.$store.getters.xt_user.org_id == 10138){
           setTimeout(() => {
             const style =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 49%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 48%;}}}';
             const style2 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 52%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 51%;}}}';
             const style3 =
             '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}';
             const style4 =

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -100,9 +100,9 @@
                   <tr>
                       <td width="70">类别</td>
                       <td>项目</td>
-                      <td width="180">规格</td>
-                      <td width="50">单位</td>
-                      <td width="50">数量</td>
+                      <td min-width="180" style="min-width:60px;">规格</td>
+                      <td width="40">单位</td>
+                      <td width="40">数量</td>
                       <td width="60">单价</td>
                       <td width="70">总额</td>
                       <td width="130">小计</td>