收费明细打印调整

sp-admin/sa-view/tb-fee-statistics/dayStatsPrint.html

@@ -4,6 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>打印报表</title>
     <style type="text/css">
+
         body {
             left: 0px;
             top: 0px;
@@ -16,8 +17,21 @@
             white-space: nowrap;
         }
 
+        .divHeader {
+            width: 100%;
+            display: block;
+            height: 80px;
+            position: fixed;
+        }
+
+        .divNone {
+            width: 20px !important;
+            white-space: normal !important;
+            display: none;
+        }
 
     </style>
+
     <script src="../../static/print/jquery-2.0.3.js" type="text/javascript"></script>
     <script src="../../static/print/jquery.jPrintArea.js" type="text/javascript"></script>
     <script src="../../static/sa.js"></script>
@@ -28,45 +42,53 @@
 
 <div>
 
-    <input type="button" style="height: 30;" id="print_button" value="打印"/>
+    <input type="button" style="height: 30px;" id="print_button" value="打印"/>
+    <div class="divNone">
 
+    </div>
     <fieldset align="">
         <legend>打印区</legend>
-        <div id="myPrintArea" style="height: 1500;">
-            <div align="center">
-                <SPAN style="font-size:25px" id="headName">统计报表（日）</SPAN>
-                <br/><br/>
-            </div>
+        <div id="myPrintArea" style="height: 85vh;width:95vw;overflow:auto;">
             <div style="text-align:center; font-size:15px;">
-                <table id="dp" width="100%" style="border-collapse:collapse;border:none;">
-                    <tr height="80">
-                        <td id="company" style="border:solid #000 1px;text-align: left;" colspan="3">单位：广西东兴北投口岸投资有限公司
-                        </td>
-                        <td id="unit" style="border:solid #000 1px;text-align: center;" colspan="7">金额单位：元</td>
-                        <td id="td_time" style="border:solid #000 1px;text-align: right;" colspan="6">
-                            <div id="time" align="right"></div>
-                        </td>
-                    </tr>
-                    <tr height="80">
-                        <td style="border:solid #000 1px; " rowspan="2">日期</td>
-                        <td style="border:solid #000 1px;text-align: center;" rowspan="2">收费项目</td>
-                        <td style="border:solid #000 1px; " colspan="4">收费方式</td>
-                        <td style="border:solid #000 1px; " rowspan="2">数量</td>
-                        <td style="border:solid #000 1px; " rowspan="2">总价</td>
-                        <td style="border:solid #000 1px; " rowspan="2">税率</td>
-                        <td style="border:solid #000 1px; " rowspan="2">税款</td>
-                        <td style="border:solid #000 1px; " rowspan="2">不含税金额</td>
-                        <td id="person1" style="border:solid #000 1px; " rowspan="2">开单员</td>
-                        <td id="person2" style="border:solid #000 1px; " rowspan="2">复核员</td>
-                        <td id="person3" style="border:solid #000 1px; " rowspan="2">统计稽查员</td>
-						 <td id="person3" style="border:solid #000 1px; " rowspan="2">审核员</td>
-                    </tr>
-                    <tr height="80">
-                        <td style="border:solid #000 1px; ">微信</td>
-                        <td style="border:solid #000 1px; ">支付宝</td>
-                        <td style="border:solid #000 1px; ">银联</td>
-                        <td style="border:solid #000 1px; ">预存金额</td>
-                    </tr>
+                <table width="100%" style="border-collapse:collapse;border:none;">
+                    <div class="divHeader">
+                        <thead>
+                        <tr>
+                            <td colspan="19"><h2 id="headName" style="text-align: center;">东兴A1地块进口接驳区(日)统计表</h2></td>
+                        </tr>
+                        <tr>
+                            <td id="company" style="border:solid #000 1px;text-align: center;" colspan="3">单位：广西东兴北投口岸投资有限公司
+                            </td>
+                            <td id="unit" style="border:solid #000 1px;text-align: center;" colspan="7">金额单位：元</td>
+                            <td id="td_time" style="border:solid #000 1px;text-align: center;" colspan="6">
+                                <div id="time" align="right" style="text-align: center;" ></div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">日期</td>
+                            <td style="border:solid #000 1px;text-align: center;" rowspan="2">收费项目</td>
+                            <td style="border:solid #000 1px;text-align:center; " colspan="4">收费方式</td>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">数量</td>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">总价</td>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">税率</td>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">税款</td>
+                            <td style="border:solid #000 1px; text-align:center;" rowspan="2">不含税金额</td>
+                            <td id="person1" style="border:solid #000 1px; text-align:center;" rowspan="2">开单员</td>
+                            <td id="person2" style="border:solid #000 1px; text-align:center;" rowspan="2">复核员</td>
+                            <td id="person3" style="border:solid #000 1px; text-align:center;" rowspan="2">统计稽查员</td>
+                            <td id="person4" style="border:solid #000 1px; text-align:center;" rowspan="2">审核员</td>
+                        </tr>
+                        <tr>
+                            <td style="border:solid #000 1px; ">微信</td>
+                            <td style="border:solid #000 1px; ">支付宝</td>
+                            <td style="border:solid #000 1px; ">银联</td>
+                            <td style="border:solid #000 1px; ">预存金额</td>
+                        </tr>
+                        </thead>
+                    </div>
+                    <tbody id="dp">
+
+                    </tbody>
                 </table>
 
             </div>
@@ -93,7 +115,7 @@
 <script type="text/javascript">
     $(function () {
         $("#print_button").click(function () {
-            $("#myPrintArea").printArea();
+            $("#myPrintArea").printArea({popTitle: "&nbsp"});
         });
 
         function getUrlParam(name) {
@@ -106,10 +128,11 @@
         var isMonth = getUrlParam('isMonth');
         isMonth = isMonth != '' ? isMonth : null;
         if (isMonth != null) {
-            $("#headName").html("统计报表（月）");
+            $("#headName").html("东兴A1地块进口接驳区(月)统计表");
             $("#person1").remove();
             $("#person2").remove();
             $("#person3").remove();
+            $("#person4").remove();
             $("#company").attr('colspan', 3);
             $("#unit").attr('colspan', 5);
             $("#td_time").attr('colspan', 3);
@@ -117,10 +140,11 @@
         var isYear = getUrlParam('isYear');
         isYear = isYear != '' ? isYear : null;
         if (isYear != null) {
-            $("#headName").html("统计报表（年）");
+            $("#headName").html("东兴A1地块进口接驳区(年)统计表");
             $("#person1").remove();
             $("#person2").remove();
-            $("#person3").remove()
+            $("#person3").remove();
+            $("#person4").remove();
             $("#company").attr('colspan', 3);
             $("#unit").attr('colspan', 5);
             $("#td_time").attr('colspan', 3);
@@ -171,30 +195,49 @@
             success: function (data) { // 接口调用成功回调函数
                 var html = [];
                 var list = data.data.list;
+                let heightSum = 850;
+                let a = 0;
+                const tbhHeight = $(".divHeader").outerHeight();
                 for (var i = 0; i < list.length; i++) {
-                    html.push(
-                        "<tr height=\"60\"><td style=\"border:solid #000 1px; \">" + list[i]['dayTime'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['feeType'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['wxPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['aliPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['cardPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['yuePrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['num'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxMoney'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxRate'] * 100 +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxes'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['noTaxMoney']
-                    )
+                    let tbo =
+                        "<tr height=\"60\"><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['dayTime'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['feeType'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['wxPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['aliPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['cardPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['yuePrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['num'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['taxMoney'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['taxRate'] * 100 +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['taxes'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['noTaxMoney'];
+
                     if (isMonth == null && isYear == null) {
-                        html.push(
-                            "</td><td style=\"border:solid #000 1px; \">" + list[i]['kaiDanPerson'] +
-                            "</td><td style=\"border:solid #000 1px; \">" + list[i]['diaoDuPerson'] +
-                            "</td><td style=\"border:solid #000 1px; \">" + list[i]['jiChaPerson'] + 
-							 "</td><td style=\"border:solid #000 1px; \">" + list[i]['judgeBy'] + 
-							"</td></tr>"
-                        )
+                        tbo+=
+                            "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['kaiDanPerson'] +
+                            "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['diaoDuPerson'] +
+                            "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['jiChaPerson'] +
+							 "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['judgeBy'] +
+							"</td></tr>";
+
                     } else {
-                        html.push("</td></tr>")
+                        tbo+="</td></tr>";
+                    }
+
+                    $("#dp").append(tbo);
+                    $(".divNone").append(tbo);
+                    let dpHeight = $(".divNone").height();
+                    $(".divNone").html("");
+                    if(a==0){
+                        heightSum-=(dpHeight+tbhHeight);
+                    }else {
+                        heightSum-=dpHeight;
+                    }
+                    a++;
+                    if(heightSum<=0 && i!==0){
+                        a=0;
+                        heightSum+=850;
+                        $("#dp tr").eq(i-1).css('page-break-after','always');
                     }
                 }
                 var totalMoney = data.data.totalMoney;
@@ -205,22 +248,23 @@
                 var totalCardPrice = data.data.totalCardPrice;
                 var totalYuePrice = data.data.totalYuePrice;
                 html.push(
-                    "<tr height=\"60\"><td style=\"border:solid #000 1px; \">" + "合计" +
+                    "<tr height=\"60\"><td style=\"border:solid #000 1px; text-align:center;\">" + "合计" +
                     "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalWxPrice +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalAliPrice +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalCardPrice +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalYuePrice +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalWxPrice +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalAliPrice +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalCardPrice +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalYuePrice +
                     "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalMoney +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalMoney +
                     "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalTaxes +
-                    "</td><td style=\"border:solid #000 1px; \">" + totalNoTaxMoney
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalTaxes +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + totalNoTaxMoney
                 )
                 if (isMonth == null && isYear == null) {
                     html.push(
                         "</td><td style=\"border:solid #000 1px; \">" +
                         "</td><td style=\"border:solid #000 1px; \">" +
+                        "</td><td style=\"border:solid #000 1px; \">" +
                         "</td><td style=\"border:solid #000 1px; \">" + "</td></tr>"
                     )
                 } else {
@@ -236,11 +280,13 @@
                 // }
 
 
-                $("#myPrintArea").printArea();
+                $("#myPrintArea").printArea({popTitle: "&nbsp"});
             }
         });
 
     });
+
+
 </script>
 
 

sp-admin/sa-view/tb-fee-statistics/detailPrint.html

@@ -16,7 +16,18 @@
             overflow: hidden;
             white-space: nowrap;
         }
+        .divHeader {
+            width: 100%;
+            display: block;
+            height: 160px;
+            position: fixed;
+        }
 
+        .divNone {
+            width: 20px !important;
+            white-space: normal !important;
+            display: none;
+        }
 
     </style>
     <script src="../../static/print/jquery-2.0.3.js" type="text/javascript"></script>
@@ -29,58 +40,67 @@
 
 <div>
 
-    <input type="button" style="height: 30;" id="print_button" value="打印"/>
+    <input type="button" style="height: 30px;" id="print_button" value="打印"/>
+
+    <div class="divNone">
 
+    </div>
     <fieldset align="">
         <legend>打印区</legend>
-        <div id="myPrintArea" style="height: 1500;">
-            <div align="center">
-                <SPAN style="TEXT-DECORATION: underline;font-size:25px">收费记录明细</SPAN>
-                <br/><br/>
-            </div>
-            <div style="text-align:center; font-size:15px;he">
-                <table id="dp" width="100%" style="border-collapse:collapse;border:none;">
-                    <tr height="80">
-                        <td style="border:solid #000 1px;text-align: left;" colspan="5">单位：广西东兴北投口岸投资有限公司</td>
-                        <td style="border:solid #000 1px;text-align: center;" colspan="8">金额单位：元</td>
-                        <td style="border:solid #000 1px;text-align: right;" colspan="6">
-                            <div id="time" align="right"></div>
-                        </td>
-                    </tr>
-                    <tr height="80">
-                        <td style="border:solid #000 1px; ">序号</td>
-                        <td style="border:solid #000 1px; ">车牌号</td>
-                        <td style="border:solid #000 1px; ">收费项目</td>
-                        <td style="border:solid #000 1px; ">业务类型</td>
-                        <td style="border:solid #000 1px; ">车型</td>
-                        <td style="border:solid #000 1px; ">数量</td>
-                        <td style="border:solid #000 1px; ">单价</td>
-                        <td style="border:solid #000 1px; ">总价</td>
-                        <td style="border:solid #000 1px; ">结算状态</td>
-                        <td style="border:solid #000 1px; ">税率</td>
-                        <td style="border:solid #000 1px; ">税款</td>
-                        <td style="border:solid #000 1px; ">不含税金额</td>
-                        <td style="border:solid #000 1px; ">收款方式</td>
-                        <td style="border:solid #000 1px; ">业务单号</td>
-                        <td style="border:solid #000 1px; ">企业名称</td>
-                        <td style="border:solid #000 1px; ">付款时间</td>
-                        <td style="border:solid #000 1px; ">开单员</td>
-                        <td style="border:solid #000 1px; ">复核员</td>
-                        <td style="border:solid #000 1px; ">统计稽查员</td>
-                    </tr>
+        <div id="myPrintArea" style="height: 85vh;width:95vw;overflow:auto;">
+            <div style="text-align:center; font-size:15px;">
+                <table  width="100%" style="border-collapse:collapse;border:none; " >
+                    <div class="divHeader">
+                        <thead>
+                        <tr>
+                            <td colspan="19"><h2 style="text-align: center;">东兴A1地块进口接驳区收费记录明细</h2></td>
+                        </tr>
+                        <tr height="80">
+                            <td style="border:solid #000 1px;text-align: center;" colspan="5">单位：广西东兴北投口岸投资有限公司</td>
+                            <td style="border:solid #000 1px;text-align: center;" colspan="8">金额单位：元</td>
+                            <td style="border:solid #000 1px;" colspan="6">
+                                <div id="time" style="text-align: center;"></div>
+                            </td>
+                        </tr>
+                        <tr height="80">
+                            <td style="border:solid #000 1px; text-align: center;">序号</td>
+                            <td style="border:solid #000 1px; text-align: center;">车牌号</td>
+                            <td style="border:solid #000 1px; text-align: center;">收费项目</td>
+                            <td style="border:solid #000 1px; text-align: center;">业务类型</td>
+                            <td style="border:solid #000 1px; text-align: center;">车型</td>
+                            <td style="border:solid #000 1px; text-align: center;">数量</td>
+                            <td style="border:solid #000 1px; text-align: center;">单价</td>
+                            <td style="border:solid #000 1px; text-align: center;">总价</td>
+                            <td style="border:solid #000 1px; text-align: center;">结算状态</td>
+                            <td style="border:solid #000 1px; text-align: center;">税率</td>
+                            <td style="border:solid #000 1px; text-align: center;">税款</td>
+                            <td style="border:solid #000 1px; text-align: center;">不含税金额</td>
+                            <td style="border:solid #000 1px; text-align: center;">收款方式</td>
+                            <td style="border:solid #000 1px; text-align: center;">业务单号</td>
+                            <td style="border:solid #000 1px; text-align: center;">企业名称</td>
+                            <td style="border:solid #000 1px; text-align: center;">付款时间</td>
+                            <td style="border:solid #000 1px; text-align: center;">开单员</td>
+                            <td style="border:solid #000 1px; text-align: center;">复核员</td>
+                            <td style="border:solid #000 1px; text-align: center;">统计稽查员</td>
+                        </tr>
+                        </thead>
+                    </div>
+                    <tbody id="dp">
+
+                    </tbody>
                 </table>
 
             </div>
-            <div align="center">
-                <br/><br/>
-                <SPAN style=";font-size:15px">
-          收费统计员：
-          &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-          收费核对员：
-          &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-          收费员：
-        </SPAN>
-            </div>
+<!--            <div align="center">-->
+<!--                <br/><br/>-->
+<!--                <SPAN style=";font-size:15px">-->
+<!--          收费统计员：-->
+<!--          &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp-->
+<!--          收费核对员：-->
+<!--          &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp-->
+<!--          收费员：-->
+<!--        </SPAN>-->
+<!--            </div>-->
 
         </div>
     </fieldset>
@@ -90,7 +110,7 @@
 <script type="text/javascript">
     $(function () {
         $("#print_button").click(function () {
-            $("#myPrintArea").printArea();
+            $("#myPrintArea").printArea({popTitle: "&nbsp"});
         });
 
         function getUrlParam(name) {
@@ -108,6 +128,7 @@
         feeType = feeType != '' ? feeType : null;
         var itemTypeName = getUrlParam('itemTypeName');
         itemTypeName = itemTypeName != '' ? itemTypeName : null;
+
         $.ajax({
             url: sa.cfg.api_url + '/TbFeeDetails/prePrint',
             data: {
@@ -117,9 +138,19 @@
                 "itemTypeName": itemTypeName
             },
             type: 'get',     // 请求类型，常用的有 GET 和 POST
+            beforeSend: function(xhr) {
+                xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                // 追加token
+                if (localStorage.tokenName) {
+                    xhr.setRequestHeader(localStorage.tokenName, localStorage.tokenValue);
+                }
+            },
             success: function (data) { // 接口调用成功回调函数
                 var html = [];
                 var list = data.data.list;
+                let heightSum = 700;
+                let a = 0;
+                const tbhHeight = $(".divHeader").outerHeight();
                 for (var i = 0; i < list.length; i++) {
                     if (list[i]['itemName'] == null) {
                         list[i]['itemName'] = "";
@@ -127,57 +158,73 @@
                     if (list[i]['customerName'] == null) {
                         list[i]['customerName'] = "";
                     }
-                    html.push(
+                    let tbo =
                         "<tr height=\"60\"><td style=\"border:solid #000 1px; \">" + list[i]['index'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['carNo'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['feeType'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['itemTypeName'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['itemName'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['num'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['unitPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['itemPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['settle'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxRate'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['taxPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['noTaxPrice'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['payType'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['businessNo'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['customerName'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['payTime'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['kaiDanPerson'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['diaoDuPerson'] +
-                        "</td><td style=\"border:solid #000 1px; \">" + list[i]['jiChaPerson'] + "</td></tr>"
-                    )
+                        "</td><td style=\"border:solid #000 1px; text-align:center;\">" + list[i]['carNo'] +
+                        "</td><td style=\"border:solid #000 1px;text-align:center; \">" + list[i]['feeType'] +
+                        "</td><td style=\"border:solid #000 1px;text-align:center; \">" + list[i]['itemTypeName'] +
+                        "</td><td style=\"border:solid #000 1px;text-align:center; \">" + list[i]['itemName'] +
+                        "</td><td style=\"border:solid #000 1px;text-align:center; \">" + list[i]['num'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['unitPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['itemPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['settle'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['taxRate'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['taxPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['noTaxPrice'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['payType'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['businessNo'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['customerName'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['payTime'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['kaiDanPerson'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['diaoDuPerson'] +
+                        "</td><td style=\"border:solid #000 1px; text-align:center; \">" + list[i]['jiChaPerson'] + "</td></tr>";
+
+
+                    $("#dp").append(tbo);
+                    $(".divNone").append(tbo);
+                    let dpHeight = $(".divNone").height();
+                    $(".divNone").html("");
+                    if(a==0){
+                        heightSum-=(dpHeight+tbhHeight);
+                    }else {
+                        heightSum-=dpHeight;
+                    }
+                    a++;
+                    if(heightSum<=0 && i!==0){
+                        a=0;
+                        heightSum+=700;
+                        $("#dp tr").eq(i-1).css('page-break-after','always');
+                    }
                 }
                 var allDayFee = data.data.allDayFee;
                 var allDayTaxes = data.data.allDayTaxes;
                 var allDayNoTaxFee = data.data.allDayNoTaxFee;
                 html.push(
-                    "<tr height=\"60\"><td style=\"border:solid #000 1px; \">" + "合计" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" + allDayFee +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" + allDayTaxes +
-                    "</td><td style=\"border:solid #000 1px; \">" + allDayNoTaxFee +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \">" +
-                    "</td><td style=\"border:solid #000 1px; \"></td></tr>"
+                    "<tr height=\"60\"><td style=\"border:solid #000 1px;text-align:center; \">" + "合计" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center; \">" +
+                    "</td><td style=\"border:solid #000 1px;text-align:center;  \">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center; \">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center; \">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + allDayFee +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + allDayTaxes +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" + allDayNoTaxFee +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\">" +
+                    "</td><td style=\"border:solid #000 1px; text-align:center;\"></td></tr>"
                 )
-                $("#dp").append(html.join(''));
+             //   $("#dp").append(html.join(''));
 
                 $("#time").html("期间：" + data.data.time);
 
-                $("#myPrintArea").printArea();
+                $("#myPrintArea").printArea({popTitle: "&nbsp"});
             }
         });
 

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -629,8 +629,11 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         String nowStr = DateUtil.format(now, "yyyy-MM-dd HH:mm");
         String beginTime = so.getString("beginTime");
         String endTime = so.getString("endTime");
-        String time = beginTime + "至" + endTime;
+        String time = "所有时间";
+        if (StrUtil.isNotEmpty(beginTime) && StrUtil.isNotEmpty(endTime)) {
+            time = beginTime + "至" + endTime;
 
+        }
 
         BigDecimal allDayFee = new BigDecimal(0);
         BigDecimal allDayTaxes = new BigDecimal(0);