Parcourir la source

1、调整应付页面显示
2、供应商显示字段问题

shenjunjie il y a 7 ans
Parent
commit
64b67721c8

+ 5 - 2
src/main/webapp/resources/js/index/app.js

@@ -9571,7 +9571,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
     }]);
-    app.controller('SaleArCheckCtrl', ['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'ReportService', 'Symbol', 'CurrentRole', 'DecimalNumber', '$filter', '$state', function ($scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
+    app.controller('SaleArCheckCtrl', ['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'ReportService', 'Symbol', 'CurrentRole', 'DecimalNumber', '$filter', '$state', 'FaArCheck', function ($scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state, FaArCheck) {
         BaseService.scrollBackToTop();
         // 获取当前用户是否为普通用户
         CurrentRole.isUser({}, {}, function (data) {
@@ -9584,6 +9584,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.apCheckCondition = {
             $open: false
         }
+        var getService = function () {
+            return FaArCheck;
+        };
         /* 时间筛选初始化*/
         var fromDate = new Date();
         var toDate = new Date();
@@ -9690,7 +9693,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         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);

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

@@ -345,7 +345,7 @@
 								<i class="fa fa-circle" style="color: #f40;"></i>
 							</a>&nbsp;&nbsp;
 							<span class="text-num" title="录单时间">{{::check.recordDate | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>&nbsp;&nbsp;&nbsp;
-							<span style="margin-left: 100px;width: 200px;display: inline-block;"><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.custName}}</span>
+							<span style="margin-left: 100px;width: 200px;display: inline-block;"><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.vendorName}}</span>
 							<span style="margin-left: 200px;">单据编号:</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>
 						</div>

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/arCheck_detail.html

@@ -128,7 +128,7 @@
 				<thead>
 				<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="100" 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>