Merge remote-tracking branch 'origin/release-201847-wangcz' into release-201847-wangcz

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -392,12 +392,12 @@
 					<td colspan="7">
 						<div class="table-colspan-list" ng-repeat="count in check.amountDetailList">
 							<span>{{count.currency || '-'}}</span>
-							<span>{{count.thisPeriodAmount ? (count.thisPeriodAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodSendQty ? (count.thisPeriodSendQty | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodTodoAmount ? (count.thisPeriodTodoAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodDoneAmount ? (count.thisPeriodDoneAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodReceipt ? (count.thisPeriodReceipt | number:2) : '-'}}</span>
-							<span>{{count.totalAmount ? (count.totalAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodAmount >= 0 ? (count.thisPeriodAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodSendQty >= 0 ? (count.thisPeriodSendQty | number:2) : '暂无数据'}}</span>
+							<span>{{count.thisPeriodTodoAmount >= 0 ? (count.thisPeriodTodoAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodDoneAmount >= 0 ? (count.thisPeriodDoneAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodReceipt >= 0 ? (count.thisPeriodReceipt | number:2) : '暂无数据'}}</span>
+							<span>{{count.totalAmount >= 0 ? (count.totalAmount | number:2) : '-'}}</span>
 						</div>
 					</td>
 					<td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
@@ -644,7 +644,7 @@
 							<div ng-if="dataInfo.thisPeriodDoneAmount.length > 0" ng-repeat="count in dataInfo.thisPeriodDoneAmount">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisPeriodDoneAmount.length === 0">
+							<div ng-if="!dataInfo.thisPeriodDoneAmount || dataInfo.thisPeriodDoneAmount.length === 0">
 								暂无数据
 							</div>
 						</label>
@@ -656,7 +656,7 @@
 							<div ng-if="dataInfo.thisPeriodSendAmount.length > 0" ng-repeat="count in dataInfo.thisPeriodSendAmount">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisPeriodSendAmount.length === 0">
+							<div ng-if="!dataInfo.thisPeriodSendAmount || dataInfo.thisPeriodSendAmount.length === 0">
 								暂无数据
 							</div>
 						</label>
@@ -796,16 +796,16 @@
 								<tr>
 									<th width="60">
 										<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="checkOneAll($event, check)" ng-if="check.allChecked !== 1">
-										<span ng-if="childs.allChecked === 1">已对账</span>
+										<span ng-if="check.allChecked === 1">已对账</span>
 									</th>
 									<th width="70" ng-bind="check.orderCode"></th>
 									<th colspan="11">
 										<div class="order-count">
 											<span>合计：</span>
-											验收数量：<span>{{check.checkQty ? (check.checkQty | number:2) :'-'}}</span>
-											发货数量：<span>{{check.sendQty ? (check.sendQty | number:2) : '-'}}</span>
-											应收金额：<span>{{check.checkAmountList ? (check.checkAmountList | number: 2) : '-'}}</span>
-											发货金额：<span>{{check.sendAmountList ? (check.sendAmountList | number: 2) : '-'}}</span>
+											验收数量：<span>{{check.checkQty >= 0 ? (check.checkQty | number:2) :'暂无数据'}}</span>
+											发货数量：<span>{{check.sendQty >= 0 ? (check.sendQty | number:2) : '暂无数据'}}</span>
+											应收金额：<span>{{check.checkAmountList >= 0 ? (check.checkAmountList | number: 2) : '暂无数据'}}</span>
+											发货金额：<span>{{check.sendAmountList >= 0 ? (check.sendAmountList | number: 2) : '暂无数据'}}</span>
 										</div>
 										<a ng-show="check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">收起 <i class="fa fa-angle-up"></i></a>
 										<a ng-show="!check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">展开 <i class="fa fa-angle-down"></i></a>
@@ -816,7 +816,7 @@
 										<input ng-model="childs.$selected" name="checkbox" type="checkbox" ng-checked="childs.$selected" ng-click="stopPrevent($event)" ng-if="childs.haveChecked !== 1">
 										<span ng-if="childs.haveChecked === 1">已对账</span>
 									</td>
-									<td width="70" rowspan="{{index}}" ng-if="index === 0"></td>
+									<td width="70" rowspan="{{check.details.length}}" ng-if="index === 0"></td>
 									<td width="70">{{::childs.inoutno}}</td>
 									<td width="70">{{::childs.sendcode}}</td>
 									<td width="70">{{::childs.prodcode}}</td>
@@ -833,7 +833,7 @@
 									<td width="70">{{::(childs.orderprice || 0)*(childs.thischeckqty || 0) | number:2}}</td>
 									<td width="100" ng-if="childs.haveChecked === 1">
 										<div>{{::childs.recorder || '-'}}</div>
-										<div>{{::childs.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+										<div>{{::childs.apCheckDate | date:'yyyy-MM-dd'  || '-'}}</div>
 									</td>
 									<td width="100" ng-if="childs.haveChecked !== 1">
 										未对账
@@ -843,61 +843,8 @@
 						</td>
 					</tr>
 				</table>
-				<table style="display:none;" class="table table-bordered">
-						<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-						<td width="55" style="text-align: center;vertical-align: middle;">
-							<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)" ng-if="check.haveChecked !== 1">
-							<span ng-if="check.haveChecked === 1">已对账</span>
-						</td>
-						<td width="70">{{::check.ordercode}}</td>
-							<td width="60">{{::check.sendcode}}</td>
-							<td width="90">{{::check.pidate | date:'yyyy年MM月dd日'  || '-'}}</td>
-							<td width="60">{{::check.inoutno}}</td>
-							<td width="70">{{::check.prodcode}}</td>
-						<td width="70" title="{{check.prodtitle}}">
-							<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
-						</td>
-						<td width="70" title="{{check.prodspec}}">
-							<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-
-						<td width="55">{{::check.qty}}</td>
-
-						<td width="100">{{::check.thischeckqty}}</td>
-						<td width="40">{{::check.orderprice}}</td>
-						<td width="40" align="center">{{::check.taxrate}}</td>
-						<td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-							<td width="110" ng-if="check.haveChecked === 1">
-								<div>{{::check.recorder || '-'}}</div>
-								<div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
-							</td>
-							<td width="110" ng-if="check.haveChecked !== 1">
-								未对账
-							</td>
-						<!--<td width="70" title="{{check.custname}}"><div-->
-						<!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
-						<!--<td width="35" align="center">{{::check.detno}}</td>-->
-						<!--<td width="60">{{::check.piclass}}</td>-->
-						<!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
-						<!--<td width="90" title="{{check.receivename}}">-->
-						<!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
-						<!--</td>-->
-						<!--<td width="65">{{::check.prodcode}}</td>-->
-						<!--<td width="65">{{::check.factory}}</td>-->
-						<!--<td width="30">{{::check.currency}}</td>-->
-						<!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
-
-					</tr>
-					<tr ng-if="!data || data.length==0">
-						<td colspan="11">
-							<div class="empty-block">
-								<i class="fa fa-exclamation-circle"></i>
-								<p class="text-muted">没有对账数据，请先筛选</p>
-							</div>
-						</td>
-					</tr>
-				</table>
 			</div>
-			<div style="padding: 10px 20px">本期间应收总额：{{totalMoney | number:2 || 0}}</div>
+			<!--<div style="padding: 10px 20px">本期间应收总额：{{totalMoney | number:2 || 0}}</div>-->
 		</div>
 	</div>
 </div>
@@ -906,11 +853,18 @@
 		text-align: center;
 		padding: 20px 0
 	}
+    .order-table2 tbody td .table-colspan-list{
+        border-bottom:1px dotted #999;
+    }
+    .order-table2 tbody td .table-colspan-list:last-child{
+        border:none;
+    }
 	.order-table2 tbody td .table-colspan-list span {
 		display:inline-block;
 		vertical-align: top;
 		width:95px;
 		margin:0 auto;
+        line-height: 25px;
 	}
 	.order-table2 tbody td .table-colspan-list span:first-child {
 		width:90px;
@@ -928,6 +882,7 @@
 		font-size:14px;
 		padding:0 2px;
 		vertical-align: middle;
+		border:1px solid #fff;
 	}
 	#order-detail-list .child-table tr th:first-child{
 		text-align: center;
@@ -996,6 +951,7 @@
 
 	.add-apCheckList .table-header-wrap th {
 		text-align: center;
+        vertical-align:middle;
 	}
 
 	.add-apCheckList .table-body-wrap {

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -370,12 +370,12 @@
 					<td colspan="7">
 						<div class="table-colspan-list" ng-repeat="count in check.amountDetailList">
 							<span>{{count.currency || '-'}}</span>
-							<span>{{count.thisPeriodAmount ? (count.thisPeriodAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodSendQty ? (count.thisPeriodSendQty | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodTodoAmount ? (count.thisPeriodTodoAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodDoneAmount ? (count.thisPeriodDoneAmount | number:2) : '-'}}</span>
-							<span>{{count.thisPeriodReceipt ? (count.thisPeriodReceipt | number:2) : '-'}}</span>
-							<span>{{count.totalAmount ? (count.totalAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodAmount >= 0 ? (count.thisPeriodAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodSendQty >= 0 ? (count.thisPeriodSendQty | number:2) : '暂无数据'}}</span>
+							<span>{{count.thisPeriodTodoAmount >= 0 ? (count.thisPeriodTodoAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodDoneAmount >= 0 ? (count.thisPeriodDoneAmount | number:2) : '-'}}</span>
+							<span>{{count.thisPeriodReceipt >= 0 ? (count.thisPeriodReceipt | number:2) : '暂无数据'}}</span>
+							<span>{{count.totalAmount >= 0 ? (count.totalAmount | number:2) : '-'}}</span>
 						</div>
 					</td>
 					<td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
@@ -569,7 +569,7 @@
 							<div ng-if="dataInfo.thisPeriodDoneAmount.length > 0" ng-repeat="count in dataInfo.thisPeriodDoneAmount">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisPeriodDoneAmount.length === 0">
+							<div ng-if="!dataInfo.thisPeriodDoneAmount || dataInfo.thisPeriodDoneAmount.length === 0">
 								暂无数据
 							</div>
 						</label>
@@ -581,7 +581,7 @@
 							<div ng-if="dataInfo.thisPeriodSendAmount.length > 0" ng-repeat="count in dataInfo.thisPeriodSendAmount">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisPeriodSendAmount.length === 0">
+							<div ng-if="!dataInfo.thisPeriodSendAmount || dataInfo.thisPeriodSendAmount.length === 0">
 								暂无数据
 							</div>
 						</label>
@@ -704,10 +704,10 @@
 									<th colspan="11">
 										<div class="order-count">
 											<span>合计：</span>
-											验收数量：<span>{{check.checkQty ? (check.checkQty | number:2) : '-'}}</span>
-											发货数量：<span>{{check.sendQty ? (check.sendQty | number:2) : '-'}}</span>
-											应付金额：<span>{{check.checkAmountList ? (check.checkAmountList | number: 2) : '-'}}</span>
-											发货金额：<span>{{check.sendAmountList ? (check.sendAmountList | number: 2) : '-'}}</span>
+											验收数量：<span>{{check.checkQty >= 0 ? (check.checkQty | number:2) :'暂无数据'}}</span>
+											发货数量：<span>{{check.sendQty >= 0 ? (check.sendQty | number:2) : '暂无数据'}}</span>
+											应收金额：<span>{{check.checkAmountList >= 0 ? (check.checkAmountList | number: 2) : '暂无数据'}}</span>
+											发货金额：<span>{{check.sendAmountList >= 0 ? (check.sendAmountList | number: 2) : '暂无数据'}}</span>
 										</div>
 										<a ng-show="check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">收起 <i class="fa fa-angle-up"></i></a>
 										<a ng-show="!check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">展开 <i class="fa fa-angle-down"></i></a>
@@ -718,7 +718,7 @@
 										<!--<input ng-model="childs.$selected" name="checkbox" type="checkbox" ng-checked="childs.$selected" ng-click="stopPrevent($event)" ng-if="childs.haveChecked !== 1">-->
 										<!--<span ng-if="childs.haveChecked === 1">已对账</span>-->
 									<!--</td>-->
-									<td width="70" rowspan="{{index}}" ng-if="index === 0"></td>
+									<td width="70" rowspan="{{check.details.length}}" ng-if="index === 0"></td>
 									<td width="70">{{::childs.inoutno}}</td>
 									<td width="70">{{::childs.sendcode}}</td>
 									<td width="70">{{::childs.prodcode}}</td>
@@ -735,7 +735,7 @@
 									<td width="70">{{::(childs.orderprice || 0)*(childs.thischeckqty || 0) | number:2}}</td>
 									<td width="100" ng-if="childs.haveChecked === 1">
 										<div>{{::childs.recorder || '-'}}</div>
-										<div>{{::childs.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+										<div>{{::childs.apCheckDate | date:'yyyy-MM-dd'  || '-'}}</div>
 									</td>
 									<td width="100" ng-if="childs.haveChecked !== 1">
 										未对账
@@ -745,50 +745,8 @@
 						</td>
 					</tr>
 				</table>
-				<table style="display:none;" class="table table-bordered">
-					<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-						<td width="70">{{::check.ordercode}}</td>
-						<td width="60">{{::check.sendcode}}</td>
-						<td width="90">{{::check.pidate | date:'yyyy年MM月dd日'  || '-'}}</td>
-						<td width="60">{{::check.inoutno}}</td>
-						<td width="70" title="{{check.prodcode}}">
-							{{::check.prodcode}}
-						</td>
-						<td width="70" title="{{check.prodtitle}}">
-							<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
-						</td>
-						<td width="70" title="{{check.prodspec}}">
-							<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-
-						<td width="55">{{::check.qty}}</td>
-
-						<td width="100">{{::check.thischeckqty}}</td>
-						<td width="40">{{::check.orderprice}}</td>
-						<td width="40" align="center">{{::check.taxrate}}</td>
-						<td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-						<td width="100" ng-if="check.haveChecked === 1">
-							<div>{{::check.recorder || '-'}}</div>
-							<div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
-						</td>
-						<td width="100" ng-if="check.haveChecked !== 1">
-							未对账
-						</td>
-						<!--<td width="100">-->
-							<!--<div>{{::check.recorder || '-'}}</div>-->
-							<!--<div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>-->
-						<!--</td>-->
-					</tr>
-					<tr ng-if="!data || data.length==0">
-						<td colspan="11">
-							<div class="empty-block">
-								<i class="fa fa-exclamation-circle"></i>
-								<p class="text-muted">没有对账数据，请先筛选</p>
-							</div>
-						</td>
-					</tr>
-				</table>
 			</div>
-			<div style="padding: 10px 20px">本期间应付总额：{{totalMoney | number:2 || 0}}</div>
+			<!--<div style="padding: 10px 20px">本期间应付总额：{{totalMoney | number:2 || 0}}</div>-->
 		</div>
 	</div>
 </div>
@@ -797,11 +755,18 @@
 		text-align: center;
 		padding: 20px 0
 	}
+	.order-table2 tbody td .table-colspan-list{
+		border-bottom:1px dotted #999;
+	}
+	.order-table2 tbody td .table-colspan-list:last-child{
+		border:none;
+	}
 	.order-table2 tbody td .table-colspan-list span {
 		display:inline-block;
 		vertical-align: top;
 		width:95px;
 		margin:0 auto;
+		line-height: 25px;
 	}
 	.order-table2 tbody td .table-colspan-list span:first-child {
 		width:90px;
@@ -819,6 +784,7 @@
 		font-size:14px;
 		padding:0 2px;
 		vertical-align: middle;
+		border:1px solid #fff;
 	}
 	#order-detail-list .child-table tr th:first-child{
 		text-align: center;
@@ -886,6 +852,7 @@
 
 	.add-apCheckList .table-header-wrap th {
 		text-align: center;
+		vertical-align:middle;
 	}
 
 	.add-apCheckList .table-body-wrap {