Merge branch 'master' into debug

sp-admin/sa-view/tb-business-car/tb-business-car-print.html

@@ -42,7 +42,7 @@
 			<fieldset align="">
 				<div id="myPrintArea" style="height: 1500;">
 					<div align="center">
-						<SPAN style="font-size:15px">接驳区车辆缴费凭证</SPAN>
+						<SPAN style="font-size:15px">东兴北投A1场地业务收费单据证明</SPAN>
 						<br /><br />
 					</div>
 					<div style="text-align:center; font-size:15px;">
@@ -54,7 +54,10 @@
 								</td>
 							</tr>
 							<tr height="50">
-								<td style="border:solid #000 1px;text-align: left;" colspan="7">支付时间：
+								<td style="border:solid #000 1px;text-align: left;" colspan="4">总金额：
+									<span id="totalMoney"></span>
+								</td>
+								<td style="border:solid #000 1px;text-align: left;" colspan="3">支付时间：
 									<span id="payTime"></span>
 								</td>
 							</tr>
@@ -67,11 +70,9 @@
 							<tr height="50">
 								<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;">载重(kg)</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>
 							<div id="carInfo"></div>
 						</table>
@@ -82,11 +83,10 @@
 							<tr height="50">
 								<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>
 						</table>
 						<table id="three" width="100%" style="border-collapse:collapse;border:none;">
@@ -120,12 +120,6 @@
 						let unit = item.unit;
 						let num = item.num
 						let total = item.total;
-						let payStatus = item.payStatus;
-						if (payStatus === 0) {
-							payStatus = "未支付"
-						} else if (payStatus === 1) {
-							payStatus = "已支付"
-						}
 						$('#three').append(
 							"<tr height=\"35\">" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" +
@@ -140,8 +134,6 @@
 							num + "</td>" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" +
 							total + "</td>" +
-							"<td style=\"border:solid #000 1px;text-align: center;\">" +
-							payStatus + "</td>" +
 							"<tr>"
 						);
 					})
@@ -154,17 +146,18 @@
 				}, function(resp) {
 					let list = resp.data;
 					let no = list.map(obj => obj.no).join('、');
-					let createBy = list.map(obj => obj.createBy).join('、');
-					$("#createBy").html(createBy);
+					let itemPrice=eval(list.map(obj=>parseFloat(obj.itemPrice)).join('+'))
 					$("#businessNo").html(no);
-					$('#payTime').html(list.length > 0 ? list[0].payTime : '')
+					$('#payTime').html(list.length > 0 ? list[0].payTime : '');
+					getListByCarId(businessCarId,itemPrice);
 				})
 			};
 
-			function getListByCarId(businessCarId) {
+			function getListByCarId(businessCarId,itemPrice) {
 				sa.ajaxNoLayer('/TbBusinessCar/getListByCarId', {
 					businessCarId: businessCarId
 				}, function(resp) {
+					let partPrice=0;
 					let carList = resp.data;
 					$.each(carList, function(index, item) {
 						let carNo = item.carNo;
@@ -174,38 +167,38 @@
 						let payType = item.payType
 						let isLock = item.isLock;
 						let money = item.money;
+						partPrice=parseFloat(money)+partPrice;
 						if (isLock === 0) {
 							isLock = "正常"
 						} else if (isLock === 1) {
 							isLock = "锁定"
 						}
-					 $('#two').append(
+						$('#two').append(
 							"<tr height=\"35\">" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" + carNo + "</td>" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" + carType + "</td>" +
-							"<td style=\"border:solid #000 1px;text-align: center;\">" + netWeight +
-							"</td>" +
-							"<td style=\"border:solid #000 1px;text-align: center;\">" + carSize + "</td>" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" + payType + "</td>" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" + isLock + "</td>" +
 							"<td style=\"border:solid #000 1px;text-align: center;\">" + money + "</td>" +
 							"<tr>"
 						);
 					})
+					$('#totalMoney').html((itemPrice+partPrice).toFixed(2)+' 元');
 				})
 			};
 			$(function() {
+				$("#createBy").html(sa.$sys.getCurrUser().nickname);
 				var id = sa.p('businessCarId', '-1');
 				$("#print_button").click(function() {
 					$("#myPrintArea").printArea();
 				});
-				
+
 				$("#close_button").click(function() {
 					sa.closeCurrIframe();
 				});
 				getItemsByCarId(id);
 				getByBusinessCarId(id);
-				getListByCarId(id);
+
 			});
 		</script>