报表优化

src/main/resources/static/js/daily.js

@@ -90,7 +90,8 @@ function getRjbb() {
                 $("#charge18").html(res.mzReceiptSerial.charge18.toFixed(2));
                 $("#charge19").html(res.mzReceiptSerial.charge19.toFixed(2));
                 $("#charge20").html(res.mzReceiptSerial.charge20.toFixed(2));
-                $("#totalCharge").html(res.mzReceiptSerial.totalChargeStr +"  ("+res.mzReceiptSerial.totalCharge+")");
+                $("#totalCharge").html(res.mzReceiptSerial.totalCharge);
+                $("#totalChargeStr").html(res.mzReceiptSerial.totalChargeStr);
 
                 $("#userIdCode_p").html(res.user.userCode);
                 $("#username_p").html(res.user.userName);
@@ -115,8 +116,8 @@ function getRjbb() {
                 $("#charge18_p").html(res.mzReceiptSerial.charge18.toFixed(2));
                 $("#charge19_p").html(res.mzReceiptSerial.charge19.toFixed(2));
                 $("#charge20_p").html(res.mzReceiptSerial.charge20.toFixed(2));
-                $("#totalCharge_p").html(res.mzReceiptSerial.totalCharge.toFixed(2));
-                $("#totalCharge_p").html(res.mzReceiptSerial.totalChargeStr +"  ("+res.mzReceiptSerial.totalCharge+")");
+                $("#totalCharge_p").html(res.mzReceiptSerial.totalCharge);
+                $("#totalChargeStr_p").html(res.mzReceiptSerial.totalChargeStr);
                 //现金收款
                 $("#xjbs").html(res.chargeCountVo.xjbs);
                 $("#xjbs_p").html(res.chargeCountVo.xjbs);

src/main/resources/templates/daily.html

@@ -118,7 +118,8 @@
                     </tr>
                     <tr>
                         <td>合计：</td>
-                        <td id="totalCharge" colspan="5">0.00</td>
+                        <td id="totalCharge">0.00</td>
+                        <td id="totalChargeStr" colspan="5">零元整</td>
                     </tr>
                     </tbody>
                 </table>
@@ -158,6 +159,15 @@
                         <td id="yhkssbs">0</td>
                         <td id="yhkss">0.00</td>
                     </tr>
+                    <tr>
+                        <td class="text-center">医保卡</td>
+                        <td id="sybbs">0</td>
+                        <td id="sybksk">0.00</td>
+                        <td id="sybtfbs">0</td>
+                        <td id="sybtf">0.00</td>
+                        <td id="sybssbs">0</td>
+                        <td id="sybkss">0.00</td>
+                    </tr>
                     <tr>
                         <td class="text-center">支付宝</td>
                         <td id="zfbbs">0</td>
@@ -176,6 +186,15 @@
                         <td id="wxssbs">0</td>
                         <td id="wxss">0.00</td>
                     </tr>
+                    <tr>
+                        <td class="text-center">医保卡记账</td>
+                        <td id="ybkjzbs">0</td>
+                        <td id="ybkjzsk">0.00</td>
+                        <td id="ybkjztfbs">0</td>
+                        <td id="ybkjztf">0.00</td>
+                        <td id="ybkjzssbs">0</td>
+                        <td id="ybkjzss">0.00</td>
+                    </tr>
                     <tr>
                         <td class="text-center">记账绿色通道</td>
                         <td id="zfbs">0</td>
@@ -186,16 +205,7 @@
                         <td id="zfss">0.00</td>
                     </tr>
                     <tr>
-                        <td class="text-center">医保卡</td>
-                        <td id="sybbs">0</td>
-                        <td id="sybksk">0.00</td>
-                        <td id="sybtfbs">0</td>
-                        <td id="sybtf">0.00</td>
-                        <td id="sybssbs">0</td>
-                        <td id="sybkss">0.00</td>
-                    </tr>
-                    <tr>
-                        <td class="text-center">总计</td>
+                        <td class="text-center">小计</td>
                         <td id="zjbs">0</td>
                         <td id="zjsk">0.00</td>
                         <td id="ztfbs">0</td>
@@ -204,15 +214,20 @@
                         <td id="zjss">0.00</td>
                     </tr>
                     <tr>
-                        <td class="text-center" colspan="2">实缴合计</td>
+                        <td class="text-center" colspan="2">实收合计</td>
                         <td id="sjhj">0.00</td>
                         <td colspan="4" id="sjhjdx"></td>
                     </tr>
                     <tr>
-                        <td class="text-center" colspan="2">记账（绿色通道）</td>
+                        <td class="text-center" colspan="2">绿色通道记账小计</td>
                         <td id="zfsshj">0.00</td>
                         <td colspan="4" id="zfdx"></td>
                     </tr>
+                    <tr>
+                        <td class="text-center" colspan="2">医保卡记账小计</td>
+                        <td id="ybkjzhj">0.00</td>
+                        <td colspan="4" id="ybkjzhjdx">零元整</td>
+                    </tr>
                     <tr>
                         <td class="text-center" colspan="2">总计</td>
                         <td id="zj">0.00</td>
@@ -396,7 +411,8 @@
                         </tr>
                         <tr>
                             <td>合计：</td>
-                            <td id="totalCharge_p" colspan="5">0.00</td>
+                            <td id="totalCharge_p">0.00</td>
+                            <td id="totalChargeStr_p" colspan="5">零元整</td>
                         </tr>
                         </tbody>
                     </table>
@@ -436,6 +452,15 @@
                             <td id="yhkssbs_p">0</td>
                             <td id="yhkss_p">0.00</td>
                         </tr>
+                        <tr>
+                            <td class="text-center">医保卡</td>
+                            <td id="sybbs_p">0</td>
+                            <td id="sybksk_p">0.00</td>
+                            <td id="sybtfbs_p">0</td>
+                            <td id="sybtf_p">0.00</td>
+                            <td id="sybssbs_p">0</td>
+                            <td id="sybkss_p">0.00</td>
+                        </tr>
                         <tr>
                             <td class="text-center">支付宝</td>
                             <td id="zfbbs_p">0</td>
@@ -454,6 +479,15 @@
                             <td id="wxssbs_p">0</td>
                             <td id="wxss_p">0.00</td>
                         </tr>
+                        <tr>
+                            <td class="text-center">医保卡</td>
+                            <td id="ybkjzbs_p">0</td>
+                            <td id="ybkjzsk_p">0.00</td>
+                            <td id="ybkjztfbs_p">0</td>
+                            <td id="ybkjztf_p">0.00</td>
+                            <td id="ybkjzssbs_p">0</td>
+                            <td id="ybkjzss_p">0.00</td>
+                        </tr>
                         <tr>
                             <td class="text-center">记账绿色通道</td>
                             <td id="zfbs_p">0</td>
@@ -464,16 +498,7 @@
                             <td id="zfss_p">0.00</td>
                         </tr>
                         <tr>
-                            <td class="text-center">医保卡</td>
-                            <td id="sybbs_p">0</td>
-                            <td id="sybksk_p">0.00</td>
-                            <td id="sybtfbs_p">0</td>
-                            <td id="sybtf_p">0.00</td>
-                            <td id="sybssbs_p">0</td>
-                            <td id="sybkss_p">0.00</td>
-                        </tr>
-                        <tr>
-                            <td class="text-center">总计</td>
+                            <td class="text-center">小计</td>
                             <td id="zjbs_p">0</td>
                             <td id="zjsk_p">0.00</td>
                             <td id="ztfbs_p">0</td>
@@ -482,15 +507,20 @@
                             <td id="zjss_p">0.00</td>
                         </tr>
                         <tr>
-                            <td class="text-center" colspan="2">实缴合计</td>
+                            <td class="text-center" colspan="2">实收合计</td>
                             <td id="sjhj_p">0.00</td>
                             <td colspan="4" id="sjhjdx_p"></td>
                         </tr>
                         <tr>
-                            <td class="text-center" colspan="2">记账（绿色通道）</td>
+                            <td class="text-center" colspan="2">绿色通道记账小计</td>
                             <td id="zfsshj_p">0.00</td>
                             <td colspan="4" id="zfdx_p"></td>
                         </tr>
+                        <tr>
+                            <td class="text-center" colspan="2">医保卡记账小计</td>
+                            <td id="ybkjzhj_p">0.00</td>
+                            <td colspan="4" id="ybkjzhjdx_p">零元整</td>
+                        </tr>
                         <tr>
                             <td class="text-center" colspan="2">总计</td>
                             <td id="zj_p">0.00</td>