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/allListPrint.vue

@@ -269,7 +269,7 @@
       printThisPage() {
 
         const style =
-          '@media print {.allListTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
         printJS({
           printable: 'allList-print',
           type: 'html',

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -19,7 +19,7 @@
                     <td style="width:10%">数量</td>
                     <td style="width:10%">金额(元)</td>
                 </tr>
-                <template v-for='item in list.slice(index * 13,(index * 14) + pageArr[index])'>
+                <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
                     <tr v-if="item.is_total == 2">
                         <td style="width:10%">{{item.med_chrgitm_type}}</td>
                         <td style="width:50%">{{item.name}}</td>
@@ -140,7 +140,7 @@
     padding:20px 10px;
 }
 .allListTitle{
-    font-size: 28px;
+    font-size: 24px;
     text-align: center;
     font-weight: bold;
     margin-bottom: 10px;
@@ -156,7 +156,7 @@
     text-align: center;
     border-collapse: collapse;
     line-height: 40px;
-    font-size: 16px;
+    font-size: 14px;
     border-color: #000;
     text-align: left;
 }

src/xt_pages/outpatientCharges/listPrint.vue

@@ -157,7 +157,7 @@
       printThisPage() {
 
         const style =
-          '@media print {.listTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
         printJS({
           printable: 'list-print',
           type: 'html',

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -23,7 +23,7 @@
                 <td style="width:6%">数量</td>
                 <td style="width:10%">金额(元)</td>
             </tr>
-            <tr v-for="item in list.slice(index * 13,(index * 14) + pageArr[index])">
+            <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
                 <td style="width:19%">{{item.p_time}}</td>
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
                 <td style="width:31%">{{item.name}}</td>
@@ -138,7 +138,7 @@
     padding:20px 10px;
 }
 .listTitle{
-    font-size: 28px;
+    font-size: 24px;
     text-align: center;
     font-weight: bold;
     margin-bottom: 10px;
@@ -154,7 +154,7 @@
     text-align: center;
     border-collapse: collapse;
     line-height: 40px;
-    font-size: 16px;
+    font-size: 14px;
     border-color: #000;
     text-align: left;
 }