Merge branch 'hotfix-1226'

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

@@ -142,6 +142,17 @@
 			<!--<a class="text-simple append" ui-sref="fa.apCheckList" title="新增对账单" ng-hide="showNotCheck"><i class="fa fa-plus-square fa-fw"></i>新增对账单</a>&nbsp;&nbsp;&nbsp;-->
 			<!--<a href="#" ng-click="exportXls()" ng-hide="active === 'all'" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
+
+		<div class="p-right" ng-show="active !== 'all'">
+			<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;"  ng-click="setActive('all')">
+				<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			</div>
+		</div>
+		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
+			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+		</div>
 		<div class="p-right" ng-show="active === 'all'">
 			<div class="btn-group btn-group-sm"  style="    float: right;
     font-size: 14px;
@@ -157,16 +168,6 @@
 				<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 			</div>
 		</div>
-		<div class="p-right" ng-show="active !== 'all'">
-			<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;"  ng-click="setActive('all')">
-				<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-			</div>
-		</div>
-		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
-			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
-
-		</div>
 	</div>
 	<!--<div class="menu condition block">-->
 		<!--<div class="row">-->
@@ -731,6 +732,7 @@
 						<!--<th width="70">客户<br>名称</th>-->
 						<th width="70">采购单</th>
 						<th width="60">发货单</th>
+						<th width="90">单据日期</th>
 						<th width="60">验收单</th>
 						<th width="70">物料编号</th>
 						<th width="70">物料名称</th>
@@ -764,6 +766,7 @@
 						</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}}">

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

@@ -106,8 +106,8 @@
 			<table class="block table table-default table-striped table-hover">
 				<thead>
 				<tr class="header">
-					<th width="40" style="font-size: 14px">采购单号</th>
-					<th width="100" style="font-size: 14px">验收单</th>
+					<th width="150" style="font-size: 14px">采购单号</th>
+					<th width="150" style="font-size: 14px">验收单</th>
 					<!--<th width="40" style="padding:8px 0;font-size: 14px">行号</th>-->
 					<th width="150" style="font-size: 14px">商品</th>
 					<!--<th style="font-size: 14px">采购序号</th>-->

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

@@ -143,6 +143,17 @@
 			<!--<a href="#" ng-click="exportXls()" ng-hide="active === 'all'"-->
 			   <!--target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		</div>
+
+		<div class="p-right" ng-show="active !== 'all'">
+			<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;"  ng-click="setActive('all')">
+				<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			</div>
+		</div>
+		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
+			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+		</div>
 		<div class="p-right" ng-show="active === 'all'">
 			<div class="btn-group btn-group-sm"  style="    float: right;
     font-size: 14px;
@@ -158,16 +169,6 @@
 				<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 			</div>
 		</div>
-		<div class="p-right" ng-show="active !== 'all'">
-			<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;"  ng-click="setActive('all')">
-				<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-			</div>
-		</div>
-		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
-			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
-
-		</div>
 	</div>
 	<!--<div class="menu condition block">-->
 		<!--<div class="row">-->
@@ -643,6 +644,7 @@
 					<tr>
 						<th width="70">采购单</th>
 						<th width="60">发货单</th>
+						<th width="90">单据日期</th>
 						<th width="60">验收单</th>
 						<th width="70">物料编号</th>
 						<th width="70">物料名称</th>
@@ -663,6 +665,7 @@
 					<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}}

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

@@ -126,12 +126,14 @@
 		<div class="block">
 			<table class="block table table-default table-striped table-hover">
 				<thead>
-				<th width="40" style="padding:8px 0;font-size: 16px">行号</th>
+				<th width="150" style="font-size: 16px">采购单号</th>
+				<th width="150" style="font-size: 16px">验收单</th>
+				<!--<th width="40" style="padding:8px 0;font-size: 16px">行号</th>-->
 				<th width="150" style="font-size: 16px">商品</th>
-				<th width="100" style="font-size: 16px">采购单号</th>
-				<th style="font-size: 16px">采购序号</th>
-				<th width="100" style="font-size: 16px">验收单</th>
-				<th style="font-size: 16px">验收单序号</th>
+
+				<!--<th style="font-size: 16px">采购序号</th>-->
+
+				<!--<th style="font-size: 16px">验收单序号</th>-->
 				<th style="font-size: 16px">单价</th>
 				<!--<th width="80">单据类型</th>-->
 				<th style="font-size: 16px">税率</th>
@@ -140,15 +142,17 @@
 				</thead>
 				<tbody>
 					<tr ng-repeat="item in order.items track by item.id">
-						<td ng-bind="item.number" style="padding:8px 0;"></td>
+						<td ng-bind="item.inoutno"></td>
+						<td ng-bind="item.orderCode"></td>
+						<!--<td ng-bind="item.number" style="padding:8px 0;"></td>-->
 						<td style="max-width: 250px;" class="text-left">
 							<div>编号： <span ng-bind="item.prodCode"></span></div>
 							<div>规格： <span ng-bind="item.prodSpec"></span></div>
 						</td>
-						<td ng-bind="item.orderCode"></td>
-						<td style="text-align: center" ng-bind="item.orderDetno"></td>
-						<td ng-bind="item.inoutno"></td>
-						<td style="text-align: center" ng-bind="item.inoutnodetno"></td>
+
+						<!--<td style="text-align: center" ng-bind="item.orderDetno"></td>-->
+
+						<!--<td style="text-align: center" ng-bind="item.inoutnodetno"></td>-->
 
 						<!--<td ng-bind="item.orderClass"></td>-->
 						<td ng-bind="isUser?'-':item.price"></td>
@@ -157,9 +161,6 @@
 						<td style="text-align: center" ng-bind="isUser?'-':(item.amount | number:2)"></td>
 					</tr>
 					<tr>
-						<td></td>
-						<td></td>
-						<td></td>
 						<td></td>
 						<td></td>
 						<td></td>