Browse Source

1、新增应收对账、应付对账页面,对账记录入口
2、调整应收对账、应付对账页面,分页问题

shenjunjie 7 years ago
parent
commit
8e0006f064

+ 1 - 1
src/main/webapp/resources/css/index.css

@@ -4704,7 +4704,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	margin: 0 12px;
 }
 .ng-table-pager .pagination>li .page-record span input{
-	width: 25px;
+	width: 40px;
 	height: 25px;
 	border: #b8b8b8 1px solid;
 	margin: 0 5px;

+ 24 - 3
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -138,10 +138,29 @@
 	</div>
 	<div class="pub-com_head">
 		<span>应收对账单</span>
-		<div class="p-right">
+		<!--<div class="p-right">-->
 			<!--<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>
+			<!--<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: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #fff;
+    border: 1px solid #fff;
+    margin-top: 3px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+				<!--<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"/>返回
@@ -692,6 +711,7 @@
 						<th width="70">采购单</th>
 						<th width="60">发货单</th>
 						<th width="60">验收单</th>
+						<th width="70">物料编号</th>
 						<th width="70">物料名称</th>
 						<th width="70">规格型号</th>
 						<!--<th width="60">发货单</th>-->
@@ -724,6 +744,7 @@
 						<td width="70">{{::check.ordercode}}</td>
 							<td width="60">{{::check.sendcode}}</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>

+ 26 - 2
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -140,8 +140,28 @@
 		<span>应付对账单</span>
 		<div class="p-right">
 			<!--<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>
+			<!--<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: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #fff;
+    border: 1px solid #fff;
+    margin-top: 3px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+				<!--<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"/>返回
@@ -602,6 +622,7 @@
 						<th width="70">采购单</th>
 						<th width="60">发货单</th>
 						<th width="60">验收单</th>
+						<th width="70">物料编号</th>
 						<th width="70">物料名称</th>
 						<th width="70">规格型号</th>
 						<th width="55">发货数量</th>
@@ -621,6 +642,9 @@
 						<td width="70">{{::check.ordercode}}</td>
 						<td width="60">{{::check.sendcode}}</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>