Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/BusExport.vue

@@ -5,14 +5,15 @@
         text-align: center;
         font-weight: bold;
         margin-top:10px;
+        font-size:16px;
     }
     .Bus_Content{
-        width:800px;
+        width:100%;
         height:auto;
         margin:auto;
     }
     .Bus_detailTable {
-        width: 100%;
+        width: 800px;
         font-size: 12px;
         color: #333;
         margin: 10px auto;
@@ -24,11 +25,14 @@
     .Bus_detailTable td {
         border: 1px solid #d1d1d1;
         padding: 3px 10px;
+        font-size:16px;
     }
 
     .Bus_detailTable th {
         background-color: #fff;
         border: 1px solid #d1d1d1;
+        font-size:16px;
+        font-weight:bold;
     }
     .txLeft{
         text-align: left;
@@ -42,6 +46,9 @@
     .totalTabal td{
         height:33px;
     }
+    body{
+        min-width: 100%!important;
+    }
 </style>
 
 <template>
@@ -79,7 +86,7 @@
                 </tr>
             </tbody>
         </table>
-        <table class="Bus_detailTable totalTabal" style="page-break-before: always;margin: 0px;">
+        <table class="Bus_detailTable totalTabal" style="border:0px;page-break-before:always;margin:0 auto;">
                 <tr>
                     <td class="txRight" colspan="4">
                         <div style="width:275px;text-align:right;float:right;">{{Year}}年{{Month}}月应付公社车资：</div>
@@ -105,7 +112,7 @@
                 </tr>
         </table>
 
-        <table class="Bus_detailTable" v-for="item in dataList" style="margin: 0px;page-break-before: always;">
+        <table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;">
             <tr>
                 <th>做账主体</th>
                 <th width="200">团号</th>
@@ -164,11 +171,10 @@
         getList(){
             this.apipost('bus_get_CarfareApportionExport',this.msg, res => {
                 if(res.data.resultCode == 1) {
-                    console.log(res,'res');
                     this.dataList = res.data.data.RObj;
                     this.msg.CurrName = res.data.data.CurrName;
                     this.TotalJan = res.data.data.TotalStatistics.TSumOMoney;
-                    this.TotalCn = res.data.data.TotalStatistics.TSumMoney
+                    this.TotalCn = res.data.data.TotalStatistics.TSumMoney;
                 }else{
                     this.Error(res.data.message);
                 }