shenjunjie 7 лет назад
Родитель
Сommit
c5022155f1

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

@@ -9948,10 +9948,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.dataInfo = data
                         $scope.dataInfo = data
                         $scope.data = data.details;
                         $scope.data = data.details;
                         $scope.checkboxes.checked = true;
                         $scope.checkboxes.checked = true;
+                        // $scope.suuorname = data.vendorName
                         $scope.getTotalMoney();
                         $scope.getTotalMoney();
                     } else {
                     } else {
                         toaster.pop('info', '提示', '当前没有需要对账记录');
                         toaster.pop('info', '提示', '当前没有需要对账记录');
                     }
                     }
+                    $scope.suuorname = data.vendorName
                     $scope.loading = false;
                     $scope.loading = false;
                 }, function (response) {
                 }, function (response) {
                     $scope.loading = false;
                     $scope.loading = false;

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

@@ -295,7 +295,7 @@
 				</thead>
 				</thead>
 				<tbody ng-repeat="check in ALLList">
 				<tbody ng-repeat="check in ALLList">
 				<tr >
 				<tr >
-					<td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
+					<td style="color: #3f84f6">{{::check.vendorEnterprise.enName}}</td>
 					<td ng-if="check.thisMonthCount.length > 0">
 					<td ng-if="check.thisMonthCount.length > 0">
 						<div ng-repeat="count in check.thisMonthCount">
 						<div ng-repeat="count in check.thisMonthCount">
 							<span>{{count.currency}}:{{count.amount | number:2}}</span>
 							<span>{{count.currency}}:{{count.amount | number:2}}</span>
@@ -416,7 +416,7 @@
 				</tbody>
 				</tbody>
 				<tbody ng-if="tableParams.total() == 0">
 				<tbody ng-if="tableParams.total() == 0">
 				<tr>
 				<tr>
-					<td colspan="6">
+					<td colspan="3">
 						<div id="empty">
 						<div id="empty">
 							<div class="left_img">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -552,7 +552,7 @@
 					<div class="btn-group btn-group-sm">
 					<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="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="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>
+						<!--<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>
 			</div>
 			</div>
@@ -673,7 +673,7 @@
 
 
 					</tr>
 					</tr>
 					<tr ng-if="!data || data.length==0">
 					<tr ng-if="!data || data.length==0">
-						<td colspan="19">
+						<td colspan="10">
 							<div class="empty-block">
 							<div class="empty-block">
 								<i class="fa fa-exclamation-circle"></i>
 								<i class="fa fa-exclamation-circle"></i>
 								<p class="text-muted">没有对账数据,请先筛选</p>
 								<p class="text-muted">没有对账数据,请先筛选</p>