feat: 新增对账搜索未对账单据列表方法更新；开放应付对账界面导出按钮

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApBillServiceImpl.java

@@ -365,14 +365,11 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and mri_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
-            sql.append("and DAYFORMDATE(mr_date) >= '").append(fromDate).append("' ");
+            sql.append("and mr_date >= '").append(fromDate).append("' ");
         }
         if (endDate != null) {
-            sql.append("and DAYFORMDATE(mr_date) < '").append(endDate).append("' ");
+            sql.append("and mr_date < '").append(endDate).append("' ");
         }
         if (null != keyword.getVendorUU()) {
             sql.append("and mr_venduu = ").append(keyword.getVendorUU());
@@ -416,14 +413,11 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and mai_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
-            sql.append("and DAYFORMDATE(make$accept.ma_date) >= '").append(fromDate).append("' ");
+            sql.append("and make$accept.ma_date >= '").append(fromDate).append("' ");
         }
         if (endDate != null) {
-            sql.append("and DAYFORMDATE(make$accept.ma_date) < '").append(endDate).append("' ");
+            sql.append("and make$accept.ma_date < '").append(endDate).append("' ");
         }
         if (null != keyword.getVendorUU()) {
             sql.append("and make$accept.ma_venduu = ").append(keyword.getVendorUU());
@@ -467,14 +461,11 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and poi_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
-            sql.append("and DAYFORMDATE(po_date) >= '").append(fromDate).append("' ");
+            sql.append("and po_date >= '").append(fromDate).append("' ");
         }
         if (endDate != null) {
-            sql.append("and DAYFORMDATE(po_date) < '").append(endDate).append("' ");
+            sql.append("and po_date < '").append(endDate).append("' ");
         }
         if (null != keyword.getVendorUU()) {
             sql.append("and po_venduu = ").append(keyword.getVendorUU());
@@ -518,9 +509,6 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and pbi_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
             sql.append("and pb_date >= '").append(fromDate).append("' ");
         }
@@ -569,9 +557,6 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and pri_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
             sql.append("and pr_date >= '").append(fromDate).append("' ");
         }
@@ -620,9 +605,6 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         if (null != keyword.getTaxRate()) {
             sql.append("and pai_taxrate = '").append(keyword.getTaxRate()).append("' ");
         }
-        if (!org.apache.axis.utils.StringUtils.isEmpty(keyword.getSuuorname())) {
-            sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
-        }
         if (fromDate != null) {
             sql.append("and pa_date >= '").append(fromDate).append("' ");
         }

src/main/webapp/resources/js/index/app.js

@@ -9993,7 +9993,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (angular.isDefined($scope.taxRate)) {
                 url = url + '&taxRate=' + $scope.taxRate;
             }
-            window.location.href = url;
+            window.open(url);
         }
 
         /**

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

@@ -319,10 +319,6 @@
 								<a><img src="static/img/empty/uas_empty.png"></a>
 								<a>B2B 商务</a>
 							</div>
-							<div class="right_link">
-								<!--<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>-->
-								<!--<a ng-if="active != 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>-->
-							</div>
 						</div>
 					</td>
 				</tr>
@@ -336,9 +332,6 @@
 					<th width="150">对账期间</th>
 					<th width="180">对账总额</th>
 					<th width="180">对账人</th>
-					<!--<th width="180">商品总数</th>-->
-					<!--<th width="100">对账结果</th>-->
-					<!--<th width="100">操作</th>-->
 				</tr>
 				</thead>
 				<tbody ng-repeat="check in $data">
@@ -365,53 +358,9 @@
 							<p style="text-align: center;margin-left: 0px">
 								对账人:{{::check.recorder}}
 							</p>
-							<!--<p>-->
-							<!--<strong class="text-num">{{::check.items.length}}</strong> 条<br>-->
-							<!--</p>-->
-							<!--<p>-->
-							<!--<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>-->
-							<!--</p>-->
 						</div>
 					</td>
 
-					<!--<td class="status">-->
-						<!--&lt;!&ndash;<div ng-if="check.checkStatus == '未对账'" class="text-center text-muted f14"><br>未对账！</div>&ndash;&gt;-->
-						<!--<div></div>-->
-						<!--<div ng-if="check.checkStatus == '已确认'" class="text-center text-muted f14">-->
-							<!--<br> <i class="fa fa-check-square-o"></i> 已确认-->
-						<!--</div>-->
-						<!--<div ng-if="check.checkStatus == '不同意'" class="text-center text-muted f14">-->
-							<!--<br> <i class="fa fa-check-square-o"></i> 不同意-->
-						<!--</div>-->
-						<!--<div ng-if="check.checkStatus == '已作废'" class="text-center text-muted f14">-->
-							<!--<br> <i class="fa fa-check-square-o"></i> 已作废-->
-						<!--</div>-->
-					<!--</td>-->
-						<!--<td>-->
-							<!--<div ng-hide="check.status" class="block">-->
-								<!--<span class="text-trans error">未提交</span>-->
-							<!--</div>-->
-							<!--<div ng-show="check.status" class="block">-->
-								<!--<span class="text-trans success">已提交</span>-->
-							<!--</div>-->
-							<!--<div ng-if="check.checkStatus == '未对账'" class="text-center text-muted f14">-->
-								<!--<div class="" style="margin-top: 33px;margin-right: 20px;">-->
-									<!--<div class="pull-right" title="等待客户确认"><a>&nbsp;客户正在确认</a></div>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--<div ng-if="check.checkStatus == '不同意'" class="text-center text-muted f14">-->
-								<!--<div class="" style="margin-top: 33px;margin-right: 20px;">-->
-									<!--<div class="pull-right" title="客户不同意"><a>&nbsp;客户不同意</a></div>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--<div ng-if="check.checkStatus == '已确认'" class="text-center text-muted f14">-->
-								<!--<div class="" style="margin-top: 33px;margin-right: 20px;">-->
-									<!--<a ng-click="print(check)" class="pull-right" title="打印{{check.print? '(已打印)':'(未打印)'}}" ng-class="{'unPrinted' : !check.print, 'text-muted': check.print}"><i class="fa fa-print fa-lg"></i>&nbsp;打印</a>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--&lt;!&ndash; <a ui-sref="fa.apCheck_detail({id:check.id})" class="operate operate-undo text-center"-->
-								 <!--target="_blank">查看详情</a>	 &ndash;&gt;-->
-						<!--</td>-->
 				</tr>
 				</tbody>
 				<tbody ng-if="tableParams.total() == 0">
@@ -423,8 +372,6 @@
 								<a>B2B 商务</a>
 							</div>
 							<div class="right_link">
-								<!--<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>-->
-								<!--<a ng-if="active != 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>-->
 							</div>
 						</div>
 					</td>
@@ -551,22 +498,12 @@
 							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="exportApcheckList()" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>-->
-					</div>
+                        <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>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
 				 ng-show="condition.$open">
-				<!--<label class="col-sm-2 control-label">应付供应商：</label>-->
-				<!--<div class="col-sm-4">-->
-				<!--<div class="form-group form-group-sm has-feedback">-->
-				<!--<input type="search" class="form-control input-sm"-->
-				<!--ng-model="receiveName" placeholder="可用应付供应商名称筛选" /><span-->
-				<!--class="form-control-feedback text-simple"><i-->
-				<!--class="fa fa-search"></i></span>-->
-				<!--</div>-->
-				<!--</div>-->
 				<label class="col-sm-2 control-label">送货工厂：</label>
 				<div class="col-sm-4">
 					<div class="form-group form-group-sm has-feedback">
@@ -607,8 +544,6 @@
 					</div>
 				</div>
 			</div>
-			<!--<div class="form-group form-group-sm form-group-inline"-->
-			<!--ng-show="condition.$open">-->
 
 			<!--</div>-->
 		</form>
@@ -617,8 +552,6 @@
 			<div class="table-header-wrap">
 				<table class="table table-bordered">
 					<tr>
-						<!--<th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>-->
-						<!--<th width="70">客户<br>名称</th>-->
 						<th width="70">采购单</th>
 						<th width="70">物料名称</th>
 						<th width="70">规格型号</th>
@@ -629,22 +562,12 @@
 						<th width="40">单价</th>
 						<th width="40">税率</th>
 						<th width="70">小计</th>
-						<!--<th width="35">序号</th>-->
-						<!--<th width="60">类型</th>-->
-						<!--<th width="60">单据<br>日期</th>-->
-						<!--<th width="90">应付<br>供应商</th>-->
-						<!--<th width="65">客户<br>料号</th>-->
-						<!--<th width="65">送货<br>工厂</th>-->
-						<!--<th width="30">币别</th>-->
-						<!--<th width="60">金额</th>-->
 					</tr>
 				</table>
 			</div>
 			<div class="table-body-wrap">
 				<table class="table table-bordered">
 					<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-						<!--<td width="36" style="text-align: center;vertical-align: middle;">-->
-							<!--<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>-->
 						<td width="70">{{::check.ordercode}}</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>
@@ -658,19 +581,6 @@
 						<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="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="10">