修改应收对账

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

@@ -9509,7 +9509,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
 
     //应收对账单列表
-    app.controller('PurchaseApCheckCtrl', ['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'ReportService', 'Symbol', 'CurrentRole', 'DecimalNumber', function ($scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber) {
+    app.controller('PurchaseApCheckCtrl', ['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'ReportService', 'Symbol', 'CurrentRole', 'DecimalNumber', '$filter', '$state', function ($scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
         BaseService.scrollBackToTop();
         // 获取当前用户是否为普通用户
         CurrentRole.isUser({}, {}, function (data) {
@@ -9580,6 +9580,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 };
                 pageParams.keyword = $scope.keyword;
                 if ($scope.active === 'all') {
+                    pageParams.keyword = $scope.keyword
                     FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         if (page) {
@@ -9759,7 +9760,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 默认本月
         $scope.sdateTo = new Date();
         $scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
-        $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth() + 1)
+        $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
         $scope.condition.uuorname = '';
         // $scope.condition.dateFrom = '';
         // $scope.condition.dateTo = '';

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

@@ -423,15 +423,15 @@
 			</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">-->
+						<!--<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">
@@ -441,6 +441,15 @@
 							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">
+                        <input type="search" class="form-control input-sm"
+                               ng-model="taxRate" placeholder="请输入税率" /><span
+                            class="form-control-feedback text-simple"><i
+                            class="fa fa-search"></i></span>
+                    </div>
+                </div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
 				 ng-show="condition.$open">
@@ -463,18 +472,10 @@
 					</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="taxRate" placeholder="请输入税率" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
-					</div>
-				</div>
-			</div>
+			<!--<div class="form-group form-group-sm form-group-inline"-->
+				 <!--ng-show="condition.$open">-->
+
+			<!--</div>-->
 		</form>
 		<!-- 标签scroll-table用于表头滚动 -->
 		<div class="table-wrap" id="order-detail-list" scroll-table>
@@ -490,7 +491,7 @@
 						<th width="35">序号</th>
 						<th width="60">类型</th>
 						<th width="60">单据<br>日期</th>
-						<th width="90">应付<br>供应商</th>
+						<!--<th width="90">应付<br>供应商</th>-->
 						<th width="70">客户<br>采购单</th>
 						<th width="65">客户<br>料号</th>
 						<th width="70">客户物<br>料名称</th>
@@ -524,10 +525,10 @@
 						<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="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="70">{{::check.ordercode}}</td>
 						<td width="65">{{::check.prodcode}}</td>
 						<td width="70" title="{{check.prodtitle}}">
@@ -554,7 +555,7 @@
 					</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>