瀏覽代碼

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

csx 3 年之前
父節點
當前提交
1e65eb11e3

+ 2 - 2
src/xt_pages/outpatientCharges/newStatementPrintTwo.vue 查看文件

85
         if(this.$store.getters.xt_user.org_id == 10138){
85
         if(this.$store.getters.xt_user.org_id == 10138){
86
           setTimeout(() => {
86
           setTimeout(() => {
87
             const style =
87
             const style =
88
-            '@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%;}}}';
88
+            '@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%;}}}';
89
             const style2 =
89
             const style2 =
90
-            '@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%;}}}';
90
+            '@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%;}}}';
91
             const style3 =
91
             const style3 =
92
             '@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%;}}}';
92
             '@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%;}}}';
93
             const style4 =
93
             const style4 =

+ 3 - 3
src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue 查看文件

100
                   <tr>
100
                   <tr>
101
                       <td width="70">类别</td>
101
                       <td width="70">类别</td>
102
                       <td>项目</td>
102
                       <td>项目</td>
103
-                      <td width="180">规格</td>
104
-                      <td width="50">单位</td>
105
-                      <td width="50">数量</td>
103
+                      <td min-width="180" style="min-width:60px;">规格</td>
104
+                      <td width="40">单位</td>
105
+                      <td width="40">数量</td>
106
                       <td width="60">单价</td>
106
                       <td width="60">单价</td>
107
                       <td width="70">总额</td>
107
                       <td width="70">总额</td>
108
                       <td width="130">小计</td>
108
                       <td width="130">小计</td>