shenjunjie 7 år sedan
förälder
incheckning
91c1f7c2b9

+ 5 - 3
src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -206,7 +206,7 @@
   define(['app/app'], function (app) {
 
       //应收对账单列表
-      app.register.controller('SaleArCheckCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'B2bReportService', 'Symbol', 'B2bCurrentRole',  'B2bDecimalNumber', '$filter', '$state',function ($rootScope, $scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
+      app.register.controller('SaleArCheckCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'B2bReportService', 'Symbol', 'B2bCurrentRole',  'B2bDecimalNumber', '$filter', '$state', 'B2bFaArCheck', function ($rootScope, $scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state, FaArCheck) {
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户
           $rootScope.active = 'buyer_pay_center';
@@ -265,7 +265,9 @@
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           };
-
+          var getService = function () {
+              return FaArCheck;
+          };
           //获取应收对账单全部
           $scope.tableParams = new ngTableParams({
               page: 1,
@@ -329,7 +331,7 @@
                           toaster.pop('error', '数据加载失败', response.data);
                       });
                   } else {
-                      FaApCheck[getState($scope.active)](BaseService.parseParams(pageParams), function (page) {
+                      getService()['get'].call(null, BaseService.parseParams(pageParams), function (page) {
                           $scope.loading = false;
                           if (page) {
                               params.total(page.totalElement);

+ 2 - 2
src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -650,7 +650,7 @@
                
             <span>
             <!--<i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i>-->
-            <img src="static/img/user/images/shop_home.png" style="margin-right: 5px">{{::check.custName}}</span>
+            <img src="static/img/user/images/shop_home.png" style="margin-right: 5px">{{::check.vendorName}}</span>
             <span style="margin-left: 100px;">单据编号:</span>
             <span class="text-num"><a ui-sref="fa_arCheck_detail({id:check.id})" title="点击查看详情" ng-click="setOrdersRead(check.id)" style="color: #5078cb">{{::check.code}}</a></span>
           </td>
@@ -753,7 +753,7 @@
           </td>
         </tr>
         </tbody>
-        <tbody ng-if="active === 'all' && (ALLList !== undefined || ALLList.length == 0)">
+        <tbody ng-if="active === 'all' && (ALLList !== undefined && ALLList.length == 0)">
         <tr>
           <td colspan="4">
             <div class="empty">

+ 1 - 1
src/main/webapp/resources/view/usercenter/b2b/fa/arCheck_detail.html

@@ -320,7 +320,7 @@
         <tr class="header">
           <th width="40" style="padding:8px 0;font-size: 16px">行号</th>
           <th width="150" style="font-size: 16px">商品</th>
-          <th width="40" style="font-size: 16px">采购单号</th>
+          <th width="80" 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>