Merge branch 'debug' into dev

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

@@ -63,10 +63,10 @@
 		<div>
 			<div class="box">
 				<button class="print-btn" @click="printFn">打印</button>
-				<div id="myPrintArea" style="position: absolute;">
-					<div class="content-box" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
+				<div id="myPrintArea" style="position: relative;">
+					<div class="content-box" style="position: relative;" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
 						:key="index">
-						<div class="header-title" style="text-align: center;">
+						<div class="header-title" style="text-align: center;" v-if="index==0">
 							<h2 style="font-size: 20px;">东兴口岸（二桥）进口货物集散区 (A1地块)（日）统计表</h2>
 						</div>
 						<table style="margin-top: 20px;text-align: center;width: 1123px;">
@@ -96,7 +96,7 @@
 								<th style="width: 40px;">银联</th>
 								<th style="width: 55px;">预存金额</th>
 							</tr>
-							<tr v-for="cel in item.list" :key="cel.index" style="height: 52px;">
+							<tr v-for="cel in item.list" :key="cel.index" style="height: 55px;">
 								<td>{{cel.dayTime}}</td>
 								<td>{{cel.feeType}}</td>
 								<td>{{cel.num}}</td>
@@ -130,6 +130,7 @@
 								<td>-</td>
 							</tr>
 						</table>
+						<span style="position: absolute;top: 750px;left: 1050px">{{index+1}}/{{dataList.length}}</span>
 					</div>
 				</div>
 			</div>
@@ -189,7 +190,7 @@
 								totalTaxMoney += item.taxes;
 								totalNoTaxMoney += item.noTaxMoney;
 								child.push(item);
-								if (child.length == 11 || i == len - 1) {
+								if (child.length == 10 || i == len - 1) {
 									let title = {
 										time: this.p.beginDay ? this.p.beginDay + '至' + this.p.endDay :
 											'所有时间',

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

@@ -8,7 +8,6 @@
 			@page {
 				size: A4 landscape;
 				margin: 19mm 25mm 15mm 25mm;
-				/* margin:0; */
 			}
 
 			.print-btn {
@@ -66,10 +65,10 @@
 		<div>
 			<div class="box">
 				<button class="print-btn" @click="printFn">打印</button>
-				<div id="myPrintArea" style="position: absolute;">
-					<div class="content-box" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
-						:key="index">
-						<div class="header-title" style="text-align: center;">
+				<div id="myPrintArea" style="position: relative;">
+					<div class="content-box" style="position: relative;"
+						v-for="(item,index) in dataList" :class="index>0?'title-top':''" :key="index">
+						<div class="header-title" style="text-align: center;" v-if="index==0">
 							<span style="font-size: 20px;">东兴口岸（二桥）进口货物集散区 (A1地块)收费记录明细</span>
 						</div>
 						<table style="margin: 0 auto;margin-top: 20px;text-align: center;width: 1123px;">
@@ -93,12 +92,12 @@
 								<th style="min-width: 50px;">结算状态</th>
 								<th style="width: 65px;">收款方式</th>
 								<th style="width: 90px;">业务单号</th>
-								<th style="width: 90px;">付款时间</th>
+								<th style="width: 90px;">作业公司</th>
 								<th style="width: 60px;">开单员</th>
 								<th style="width: 60px;">复核员</th>
 								<th style="width: 65px;">统计稽查员</th>
 							</tr>
-							<tr v-for="cel in item.list" :key="cel.index" style="height: 80px;font-size: 10px;">
+							<tr v-for="cel in item.list" :key="cel.index" style="height: 55px;font-size: 10px;">
 								<td>{{cel.index}}</td>
 								<td>{{cel.carNo}}</td>
 								<td>{{cel.feeType}}</td>
@@ -113,32 +112,33 @@
 								<td>{{cel.settle}}</td>
 								<td>{{cel.payMode}}</td>
 								<td>{{cel.businessNo}}</td>
-								<td>{{cel.payTime}}</td>
+								<td>{{cel.pickCustomerName}}</td>
 								<td>{{cel.kaiDanPerson}}</td>
 								<td>{{cel.diaoDuPerson}}</td>
 								<td>{{cel.jiChaPerson}}</td>
 							</tr>
 							<tr style="height: 60px;padding: 0 0.5px;" v-if="index==dataList.length-1">
 								<td>合计</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
 								<td>{{allDayFee}}</td>
 								<td>{{(allDayTaxes).toFixed(2)}}</td>
 								<td>{{(allDayNoTaxFee).toFixed(2)}}</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
-								<td>-</td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
 							</tr>
 						</table>
+						<span style="position: absolute;top: 750px;left: 1050px">{{index+1}}/{{dataList.length}}</span>
 					</div>
 				</div>
 			</div>
@@ -155,17 +155,17 @@
 						"ids": sa.p('ids', '')
 					},
 					dataList: [],
-					allDayFee:0,
-					allDayTaxes:0,
-					allDayNoTaxFee:0
+					allDayFee: 0,
+					allDayTaxes: 0,
+					allDayNoTaxFee: 0
 				},
 				methods: {
 					getDataList() {
 						sa.ajax('/TbFeeDetails/prePrint', this.p, function(resp) {
-							let data=resp.data;
-							this.allDayFee=data.allDayFee;
-							this.allDayTaxes=data.allDayTaxes;
-							this.allDayNoTaxFee=data.allDayNoTaxFee;
+							let data = resp.data;
+							this.allDayFee = data.allDayFee;
+							this.allDayTaxes = data.allDayTaxes;
+							this.allDayNoTaxFee = data.allDayNoTaxFee;
 							var list = data.list;
 							let len = list.length;
 							let child = [];
@@ -173,7 +173,7 @@
 							for (i = 0; i < len; i++) {
 								let item = list[i];
 								child.push(item);
-								if (child.length == 7 || i == len - 1) {
+								if (child.length == 10 || i == len - 1) {
 									let title = {
 										time: this.p.ids ? "勾选打印" : this.p.beginTime ? this.p.beginTime +
 											'至' + this.p.endTime : '所有时间',
@@ -185,10 +185,10 @@
 							}
 							this.dataList = dataList;
 							sa.loading("准备打印...");
-							setTimeout(()=>{
+							setTimeout(() => {
 								this.printFn();
 								sa.hideLoading();
-							},2000)
+							}, 2000)
 						}.bind(this))
 					},
 					printFn() {

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

@@ -25,6 +25,7 @@
 				height: 1123px;
 				width: 794px;
 				margin: 0 auto;
+				position: relative;
 			}
 
 			table {
@@ -64,9 +65,9 @@
 			<div class="box">
 				<button class="print-btn" @click="printFn">打印</button>
 				<div id="myPrintArea">
-					<div class="content-box" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
+					<div class="content-box" style="position: relative;" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
 						:key="index">
-						<div class="header-title" style="text-align: center;">
+						<div class="header-title" style="text-align: center;" v-if="index==0">
 							<h2 style="font-size: 20px;">东兴口岸（二桥）进口货物集散区 (A1地块)（月）统计表</h2>
 						</div>
 						<table style="margin-top: 20px;text-align: center;width: 790px;">
@@ -117,6 +118,7 @@
 								<td>{{total.totalYuePrice}}</td>
 							</tr>
 						</table>
+						<span style="position: absolute;top: 1250px;left: 750px">{{index+1}}/{{dataList.length}}</span>
 					</div>
 				</div>
 			</div>

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

@@ -64,9 +64,9 @@
 			<div class="box">
 				<button class="print-btn" @click="printFn">打印</button>
 				<div id="myPrintArea">
-					<div class="content-box" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
+					<div class="content-box" style="position: relative;" v-for="(item,index) in dataList" :class="index>0?'title-top':''"
 						:key="index">
-						<div class="header-title" style="text-align: center;">
+						<div class="header-title" style="text-align: center;" v-if="index==0">
 							<h2 style="font-size: 20px;">东兴口岸（二桥）进口货物集散区 (A1地块)（年）统计表</h2>
 						</div>
 						<table style="margin-top: 20px;text-align: center;width: 790px;">
@@ -117,6 +117,7 @@
 								<td>{{total.totalYuePrice}}</td>
 							</tr>
 						</table>
+						<span style="position: absolute;top: 1250px;left: 750px">{{index+1}}/{{dataList.length}}</span>
 					</div>
 				</div>
 			</div>