Merge remote-tracking branch 'origin/release-201845-hejq' into release-201845-hejq

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

@@ -619,7 +619,7 @@
 							ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 					<div class="btn-group btn-group-sm">
 						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
-						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a>
+						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>确认</a>
 						<a class="btn btn-default" ng-click="exportApcheckList()" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>
 					</div>
 				</div>

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

@@ -23,6 +23,11 @@
 			<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
 			class="fa fa-print fa-fw"></i>打印</a> -->
 		</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;" ui-sref="fa.apCheck">
+			<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="pane-body">
 		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
@@ -33,10 +38,10 @@
 				<span class="title">客户名称</span>
 				<div class="content" ng-bind="::data.custName"></div>
 			</div>
-            <div class="col-xs-4">
-                <span class="title">应付供应商</span>
-                <div class="content" ng-bind="::data.items[0].receiveName"></div>
-            </div>
+            <!--<div class="col-xs-4">-->
+                <!--<span class="title">应付供应商</span>-->
+                <!--<div class="content" ng-bind="::data.items[0].receiveName"></div>-->
+            <!--</div>-->
 			<div class="col-xs-4">
 				<span class="title">对账期间</span>
 				<div class="content text-num">{{::data.beginDate | date:'yyyy/MM/dd'}} - {{::data.endDate | date:'yyyy/MM/dd'}}</div>
@@ -103,11 +108,11 @@
 				<tr class="header">
 					<th width="40" style="font-size: 14px">采购单号</th>
 					<th width="100" style="font-size: 14px">验收单</th>
-					<th width="40" style="padding:8px 0;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>
+					<!--<th style="font-size: 14px">采购序号</th>-->
 
-					<th style="font-size: 14px">验收单序号</th>
+					<!--<th style="font-size: 14px">验收单序号</th>-->
 					<th style="font-size: 14px">单价</th>
 					<!--<th width="80">单据类型</th>-->
 					<th style="font-size: 14px">税率</th>
@@ -119,15 +124,15 @@
 					<tr>
 						<td ng-bind="item.orderCode"></td>
 						<td ng-bind="item.inoutno"></td>
-						<td ng-bind="item.number" style="padding:8px 0;"></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.orderDetno"></td>
+						<!--<td ng-bind="item.orderDetno"></td>-->
 
-						<td ng-bind="item.inoutnodetno"></td>
-						<!--<td ng-bind="item.orderClass"></td>-->
+						<!--<td ng-bind="item.inoutnodetno"></td>-->
+						<!--<td ng-	bind="item.orderClass"></td>-->
 						<td ng-bind="isUser?'-':item.price"></td>
 						<td ng-bind="item.taxrate"></td>
 						<td ng-bind="item.checkQty"></td>

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

@@ -633,10 +633,17 @@
 						<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">
+						<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">