打印

app-ui/utils/request.js

@@ -28,7 +28,7 @@ function get(url, data) {
 				common.to('/pages/login/login');
 				return ;
 			}
-			return res.data
+f			return res.data
 		}
 	})
 }

sp-admin/sa-view/tb-account/balance-print.html

@@ -169,7 +169,7 @@
 								let item = list[i];
 								child.push(item);
 								totalInit+=item.beginMoney;
-								totalCharge+=item.chargeMoney;
+								totalCharge+=totalCharge;
 								totalDeuctionMoney+=item.deuctionMoney;
 								totalRefundMoney+=item.balanceRefundMoney;
 								totalErrorRefund+=item.errorRefundMoney;
@@ -185,12 +185,12 @@
 							
 							}
 							this.dataList = dataList;
-							this.totalCharge=totalCharge;
-							this.totalInit=totalInit;
-							this.totalDeuctionMoney=totalDeuctionMoney;
-							this.totalErrorRefund=totalErrorRefund;
-							this.totalRefundMoney=totalRefundMoney;
-							this.totalEnd=totalEnd;
+							this.totalCharge=parseFloat(totalCharge).toFixed(2);
+							this.totalInit=parseFloat(totalInit).toFixed(2);
+							this.totalDeuctionMoney=parseFloat(totalDeuctionMoney).toFixed(2);
+							this.totalErrorRefund=parseFloat(totalErrorRefund).toFixed(2);
+							this.totalRefundMoney=parseFloat(totalRefundMoney).toFixed(2);
+							this.totalEnd=parseFloat(totalEnd).toFixed(2);
 							// sa.loading("准备打印...");
 							// setTimeout(() => {
 							// 	this.printFn();

sp-admin/sa-view/tb-charge-record/print-receipt.html

@@ -6,8 +6,8 @@
 		<title>打印收费明细</title>
 		<style type="text/css">
 			@page {
-				size: A4 portrait;
-				margin: 19mm 25mm 15mm 25mm;
+				/* size: A4 portrait;
+				margin: 19mm 25mm 15mm 25mm; */
 			}
 
 			.print-btn {
@@ -23,7 +23,7 @@
 
 			.content-box {
 				text-align: center;
-				height: 1123px;
+				height: 623px;
 				width: 794px;
 				margin: 0 auto;
 			}

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

@@ -76,27 +76,27 @@
 								<th colspan="6" style="padding: 0 1px;">期间：{{item.time}}</th>
 							</tr>
 							<tr style="font-weight: 500;">
-								<th style="width: 75px;" rowspan="2">日期</th>
-								<th style="width: 80px;" rowspan="2"> 收费项目</th>
-								<th style="width: 30px;" rowspan="2">数量</th>
-								<th style="width: 40px;" rowspan="2">总价</th>
-								<th style="width: 80px;" rowspan="2">不含税金额</th>
-								<th style="width: 30px;" rowspan="2">税率</th>
-								<th style="width: 50px;" rowspan="2">税款</th>
+								<td style="width: 60px;" rowspan="2">日期</td>
+								<td style="width: 60px;" rowspan="2"> 收费项目</td>
+								<td style="width: 30px;" rowspan="2">数量</td>
+								<td style="width: 60px;" rowspan="2">总价</td>
+								<td style="width: 70px;" rowspan="2">不含税金额</td>
+								<td style="width: 30px;" rowspan="2">税率</td>
+								<td style="width: 60px;" rowspan="2">税款</td>
 
-								<th colspan="4">收费方式</th>
-								<th style="width: 60px;" rowspan="2">开单员</th>
-								<th style="width: 60px;" rowspan="2">复核员</th>
-								<th style="width: 75px;" rowspan="2">统计稽查员</th>
-								<th style="width: 75px;" rowspan="2">部门负责人</th>
+								<td colspan="4">收费方式</td>
+								<td style="width: 60px;" rowspan="2">开单员</td>
+								<td style="width: 60px;" rowspan="2">复核员</td>
+								<td style="width: 75px;" rowspan="2">统计稽查员</td>
+								<td style="width: 75px;" rowspan="2">部门负责人</td>
 							</tr>
 							<tr style="font-weight: 500;">
-								<th style="width: 40px;">微信</th>
-								<th style="width: 40px;">支付宝</th>
-								<th style="width: 40px;">银联</th>
-								<th style="width: 55px;">预存金额</th>
+								<td style="width: 60px;">微信</td>
+								<td style="width: 40px;">支付宝</td>
+								<td style="width: 40px;">银联</td>
+								<td style="width: 55px;">预存金额</td>
 							</tr>
-							<tr v-for="cel in item.list" :key="cel.index" style="height: 55px;">
+							<tr v-for="cel in item.list" :key="cel.index" style="height: 55px;font-size: 12px;">
 								<td>{{cel.dayTime}}</td>
 								<td>{{cel.feeType}}</td>
 								<td>{{cel.num}}</td>
@@ -113,7 +113,7 @@
 								<td>{{cel.jiChaPerson}}</td>
 								<td>{{cel.judgeBy}}</td>
 							</tr>
-							<tr style="height: 60px;padding: 0 0.5px;" v-if="index==dataList.length-1">
+							<tr style="height: 60px;font-size: 12px;" v-if="index==dataList.length-1">
 								<td colspan="2">合计</td>
 								<td>{{total.num}}</td>
 								<td>{{total.totalMoney}}</td>

sp-server/src/main/java/com/pj/current/SaPlusStartup.java

@@ -11,6 +11,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -45,7 +46,13 @@ public class SaPlusStartup implements CommandLineRunner {
     TaskService taskService;
 
     @Override
-    public void run(String... args) {
+    public void run(String... args) throws Exception{
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String str = "\n------------- " + applicationName + " (" + active + ") 启动成功 --by " + getNow() + " -------------\n" +
+                "\t- Local:   http://localhost:" + port + path + "\n" +
+                "\t- Local2:  http://127.0.0.1:" + port + path + "\n" +
+                "\t- Network: http://" + ip + ":" + port + path + "\n";
+        log.info(str);
         tokenTask.run();
         threadPoolTaskScheduler.scheduleAtFixedRate(tokenTask, wxConfig.getFlushSecond() * 1000);
         taskService.addTask(new StartUpCheckPayStatusTask("=========检查正在支付订单状态========", 2000L));

sp-server/src/main/java/com/pj/project/tb_charge_record/TbChargeRecordController.java

@@ -2,6 +2,8 @@ package com.pj.project.tb_charge_record;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.pj.current.satoken.StpUserUtil;
+import com.pj.project.tb_account.TbAccount;
+import com.pj.project.tb_account.TbAccountService;
 import com.pj.project.tb_entity.TbEntity;
 import com.pj.project.tb_entity.TbEntityService;
 import com.pj.project4sp.SP;
@@ -35,7 +37,7 @@ public class TbChargeRecordController {
     @Autowired
     TbChargeRecordService tbChargeRecordService;
     @Resource
-    private TbEntityService tbEntityService;
+    private TbAccountService tbAccountService;
 
     /**
      * 增
@@ -117,10 +119,9 @@ public class TbChargeRecordController {
     @SaCheckPermission(TbChargeRecord.PERMISSION_LIST_PRINT)
     public AjaxJson getPrintReceiptInfos(Long id) {
         TbChargeRecord t = tbChargeRecordService.getById(id);
-        String customerName = t.getCustomerName();
-        TbEntity tbEntity = tbEntityService.findByName(customerName);
-        if (tbEntity!=null){
-            t.setEntityTaxNo(tbEntity.getTaxIdNo());
+        TbAccount tbAccount = tbAccountService.getAccountByCustomerId(t.getCustomerId());
+        if (tbAccount!=null){
+            t.setEntityTaxNo(tbAccount.getTaxNum());
         }
         return AjaxJson.getSuccessData(t);
     }

sp-server/src/main/resources/application-dev.yml

@@ -41,6 +41,12 @@ spring:
                 max-idle: 10
                 # 连接池中的最小空闲连接
                 min-idle: 0
+# mybatis-plus配置
+mybatis-plus:
+    # 一些配置
+    configuration:
+        # 控制打印sql
+        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
     # 项目自定义配置
     myconfig:

sp-server/src/main/resources/application.yml

@@ -57,9 +57,7 @@ mybatis-plus:
     # 配置别名包，在mapper.xml中可以直接返回SoMap
     type-aliases-package: com.pj.utils.so
     # 一些配置
-    configuration: 
-        # 控制打印sql 
-        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    configuration:
         # 是否开启下划线转驼峰 
         map-underscore-to-camel-case: true
         # 即使属性为null, 也要映射