支付中心优化

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

@@ -1,7 +1,7 @@
 
-define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change', 'common/query/rate', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter', 'common/query/vendor','common/query/seekPurchase', 'common/query/search', 'angular-sanitize', 'common/query/authority'], function(angularAMD) {
+define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change', 'common/query/rate', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter', 'common/query/vendor','common/query/seekPurchase', 'common/query/search', 'angular-sanitize', 'common/query/authority','common/query/purchase'], function(angularAMD) {
 	'use strict';
-	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices','rateServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter', 'vendorServices','seekPurchaseServices', 'searchService', 'ngSanitize', 'authorityServices']);
+	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices','rateServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter', 'vendorServices','seekPurchaseServices', 'searchService', 'ngSanitize', 'authorityServices', 'purchaseServices']);
 	app.init = function() {
 		angularAMD.bootstrap(app);
 	};
@@ -57,7 +57,19 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             title: '收货地址',
             controller: 'ssoAddressCtrl',
             controllerUrl: 'app/controllers/ssoAddressCtrl'
-        }))
+        })).state('payAccount', angularAMD.route({
+			url: '/payAccount?status',
+			title: '付款账户',
+			templateUrl: 'static/view/usercenter/forstore/pay_center.html',
+			controller: 'buyerPayCenterCtrl',
+			controllerUrl: 'js/usercenter/controllers/forstore/pay_center_ctrl'
+		})).state('gatheringAccount', angularAMD.route({
+			url: '/gatheringAccount?tab',
+			templateUrl: 'static/view/vendor/forstore/pay_center.html',
+			title: '收款账户',
+			controller: 'vendorPayCenterCtrl',
+			controllerUrl: 'js/vendor/controllers/forstore/pay_center_ctrl'
+		}))
 	}]);
 
 	// 状态码  -> 描述
@@ -221,7 +233,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             });
             $rootScope.userInfo = data;
             $rootScope.userInfo.enterprise.enName ? $rootScope.personage = true : $rootScope.personage = false;
-            if ($rootScope.userInfo.enterprise) {
+			if ($rootScope.userInfo.enterprise) {
             	$rootScope.userInfo.enterprise.enAdminuu === $rootScope.userInfo.userUU ? $rootScope.isAdmin = true : $rootScope.isAdmin = false;
 			} else {
                 $rootScope.isAdmin = false

src/main/webapp/resources/js/sso/main.js

@@ -2,6 +2,7 @@ require.config({
 	baseUrl : 'static',
 	paths : {
 		'app' : 'js/sso',
+		'js': 'js',
 		'angular' : 'lib/angular/angular.min',
 		'angularAMD' : 'lib/angular/angularAMD',
 		'angular-toaster': 'lib/angular/angular-toaster.min',

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

@@ -78,9 +78,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			controller: 'buyerInvoiceRecordCtrl',
 			controllerUrl: 'app/controllers/forstore/buyer_invoice_record_ctrl'
 		})).state('pay_center', angularAMD.route({
-			url: '/payCenter',
+			url: '/payCenter?status',
 			templateUrl: 'static/view/usercenter/forstore/pay_center.html',
-			controller: 'payCenterCtrl',
+			controller: 'buyerPayCenterCtrl',
 			controllerUrl: 'app/controllers/forstore/pay_center_ctrl'
 		}))
 		/*	.state('my_seek_purchase', angularAMD.route({

src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -3,8 +3,8 @@
  */
 define(['app/app'], function(app) {
 	'use strict';
-	app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'ngTableParams', 'BaseService', 'bankInfoService', '$filter', 'SessionService', '$modal', 'toaster', 'OrderSimpleInfo', 'Loading', 'Authority', function($scope, $rootScope, ngTableParams, BaseService, bankInfoService, $filter, SessionService, $modal, toaster, OrderSimpleInfo, Loading, Authority) {
-		$rootScope.active = 'pay_center';
+	app.register.controller('buyerPayCenterCtrl', ['$scope', '$rootScope', 'ngTableParams', 'BaseService', 'bankInfoService', '$filter', 'SessionService', '$modal', 'toaster', 'OrderSimpleInfo', 'Loading', 'Authority', '$stateParams', function($scope, $rootScope, ngTableParams, BaseService, bankInfoService, $filter, SessionService, $modal, toaster, OrderSimpleInfo, Loading, Authority, $stateParams) {
+		$rootScope.active = 'buyer_pay_center';
 
 		document.title = '支付中心-优软商城';
 		var hideBankFilter = $filter("hideBankFilter");
@@ -14,6 +14,11 @@ define(['app/app'], function(app) {
 
 		$scope.status = hiStatus == null ? 'pay-history' : hiStatus;
 
+		// pay-info
+		if ($stateParams.status) {
+			$scope.status = $stateParams.status;
+		}
+
 		//切换银行账户信息，历史记录的状态
 		$scope.toggleStatus = function(status) {
 			if($scope.status != status) {
@@ -42,6 +47,12 @@ define(['app/app'], function(app) {
 
 		$scope.paytype = 'ALL';
 
+		// 交易方式
+		$scope.remitteeType = 'ALL';
+
+		// 时间域选择
+		$scope.dateArea = 'ALL';
+
 		/**
 		 * 使用ngTable 获取支付记录信息
 		 */
@@ -61,9 +72,12 @@ define(['app/app'], function(app) {
 				if ($scope.currency && $scope.currency != 'ALL'){
 					param.currencyName = $scope.currency;
 				}
-				if ($scope.paytype && $scope.paytype != 'ALL'){
-					param.method = $scope.paytype;
+				if ($scope.remitteeType && $scope.remitteeType !== 'ALL') {
+					param.remitteeType = $scope.remitteeType;
 				}
+				// if ($scope.paytype && $scope.paytype != 'ALL'){
+				// 	param.method = $scope.paytype;
+				// }
 				if ($scope.startDate){
 					param.fromDate = $scope.startDate.getTime();
 				}
@@ -197,6 +211,7 @@ define(['app/app'], function(app) {
 					}
 				}
 			}
+			loadPayHistory();
 		};
 
 		/**
@@ -239,6 +254,63 @@ define(['app/app'], function(app) {
 			$scope.endDate = null;
 		};
 
+		var _formatDate = function (date, fmt) {
+			if (!date) {
+				return null;
+			}
+			if (typeof date === 'string') {
+				date = new Date(Date.parse(date.replace(/-/g, '/')));
+			}
+			var o = {
+				'M+': date.getMonth() + 1, // 月份
+				'd+': date.getDate(), // 日
+				'h+': date.getHours(), // 小时
+				'm+': date.getMinutes(), // 分
+				's+': date.getSeconds(), // 秒
+				'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+				'S': date.getMilliseconds() // 毫秒
+			}
+			if (/(y+)/.test(fmt)) {
+				fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+			}
+			for (var k in o) {
+				if (new RegExp('(' + k + ')').test(fmt)) {
+					fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+				}
+			}
+			return fmt;
+		}
+
+		var _getClearDay = function (date) {
+			return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+		}
+
+		$scope.setFilters = function (type, val) {
+			$scope[type] = val;
+			if (type == 'dateArea') {
+				// 时间筛选
+				var currentTime = _getClearDay(new Date());
+				var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+				if (val == 'ALL' || val == 'autoMonth') {
+					$scope.startDate = null;
+					$scope.endDate = null;
+				} else if (val == 'oneMonth') {
+					$scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+					$scope.endDate = endDate;
+				} else if (val == 'threeMonth') {
+					$scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+					$scope.endDate = endDate;
+				} else if (val == 'sixMonth') {
+					$scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+					$scope.endDate = endDate;
+				} else {
+					$scope.startDate = null;
+					$scope.endDate = null;
+				}
+			}
+			loadPayHistory();
+		}
+
 		$scope.filterLoad = function () {
 			loadPayHistory();
 		};

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

@@ -574,7 +574,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         })).state('pay_center', angularAMD.route({
 			url: '/payCenter?tab',
 			templateUrl: 'static/view/vendor/forstore/pay_center.html',
-			controller: 'payCenterCtrl',
+			controller: 'vendorPayCenterCtrl',
 			controllerUrl: 'app/controllers/forstore/pay_center_ctrl'
 		})).state('vendor_deliveryRule', angularAMD.route({
 			title : '配送规则',

src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -3,8 +3,8 @@
  */
 define(['app/app'], function(app) {
     'use strict';
-    app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', '$http', 'Authority', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams, $http, Authority) {
-        $rootScope.active = 'pay_center';
+    app.register.controller('vendorPayCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', '$http', 'Authority', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams, $http, Authority) {
+        $rootScope.active = 'vendor_pay_center';
 
         document.title = '结算中心-优软商城';
         // 加密订单的ID过滤器
@@ -22,6 +22,12 @@ define(['app/app'], function(app) {
         $scope.paytype = 'ALL';
         $scope.$$transfer = {};
 
+        // 交易方式
+        $scope.remitteeType = 'ALL';
+
+        // 时间域选择
+        $scope.dateArea = 'ALL';
+
         var getTransferMoney = function () {
             bankTransferService.getTotalTransferMoney({}, function (data) {
                 if (data.code == 1) {
@@ -55,6 +61,9 @@ define(['app/app'], function(app) {
                     if ($scope.endDate){
                         param.toDate = $scope.endDate.getTime();
                     }
+                    if ($scope.remitteeType && $scope.remitteeType !== 'ALL') {
+                        param.remitteeType = $scope.remitteeType;
+                    }
                     bankTransferService.getVendorBankTransferByMall(param, function (page) {
                         if(page.code == 1) {
                             $scope.bankTransRecore = page.data.data.content;
@@ -144,6 +153,64 @@ define(['app/app'], function(app) {
             $scope.endDate = null;
         };
 
+
+        var _formatDate = function (date, fmt) {
+            if (!date) {
+                return null;
+            }
+            if (typeof date === 'string') {
+                date = new Date(Date.parse(date.replace(/-/g, '/')));
+            }
+            var o = {
+                'M+': date.getMonth() + 1, // 月份
+                'd+': date.getDate(), // 日
+                'h+': date.getHours(), // 小时
+                'm+': date.getMinutes(), // 分
+                's+': date.getSeconds(), // 秒
+                'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+                'S': date.getMilliseconds() // 毫秒
+            }
+            if (/(y+)/.test(fmt)) {
+                fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+            }
+            for (var k in o) {
+                if (new RegExp('(' + k + ')').test(fmt)) {
+                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                }
+            }
+            return fmt;
+        }
+
+        var _getClearDay = function (date) {
+            return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+        }
+
+        $scope.setFilters = function (type, val) {
+            $scope[type] = val;
+            if (type == 'dateArea') {
+                // 时间筛选
+                var currentTime = _getClearDay(new Date());
+                var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                if (val == 'ALL' || val == 'autoMonth') {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
+                } else if (val == 'oneMonth') {
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else if (val == 'threeMonth') {
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else if (val == 'sixMonth') {
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
+                }
+            }
+            loadHistory();
+        }
+
         $scope.search = function () {
             if (!$scope.startDate && $scope.endDate){
                 toaster.pop("info", "请输入起始日期");
@@ -257,6 +324,7 @@ define(['app/app'], function(app) {
                     }
                 }
             }
+            loadHistory();
         };
 
         /**

src/main/webapp/resources/view/sso/left_nav.html

@@ -48,6 +48,8 @@
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_management'}"><span ui-sref="ssoManagement">员工管理</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_permission'}"><span ui-sref="ssoPermission">角色权限</span></li>
 		<li ng-class="{'active' : active == 'sso_address'}"><span ui-sref="ssoAddress">收货地址</span></li>
+		<li ng-class="{'active' : active == 'vendor_pay_center'}" ng-if="userInfo.enterprise.uu && userInfo.enterprise.isVendor == 313"><span ui-sref="gatheringAccount({'tab': 'accountTab'})">收款账户</span></li>
+		<li ng-class="{'active' : active == 'buyer_pay_center'}"><span ui-sref="payAccount({'status': 'pay-info'})">付款账户</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_logistics'}">-->
 			<!--<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>-->
 			<!--<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>-->

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -105,26 +105,26 @@
 
 	}
 	.pay_record .ticket_record_list dl span:nth-child(1){
-		width:17.03%!important;
+		width:26%!important;
 	}
 	.pay_record .ticket_record_list dl span:nth-child(2){
-		width:15.73%!important;
+		width:20%!important;
 	}
 	.pay_record .ticket_record_list dl span:nth-child(3){
-		width:23.84%!important;
+		width:16%!important;
 	}
 	.pay_record .ticket_record_list dl span:nth-child(4){
-		width:8%!important;
+		width:10%!important;
 	}
 	.pay_record .ticket_record_list dl span:nth-child(5){
-		width:9.65%!important;
+		width:8%!important;
 	}
 	.pay_record .ticket_record_list dl span:nth-child(6){
-		width:12.12%!important;
+		width:20%!important;
 	}
-	.pay_record .ticket_record_list dl span:nth-child(7){
+	/*.pay_record .ticket_record_list dl span:nth-child(7){
 		width:13.52%!important;
-	}
+	}*/
 	.pay_record .ticket_record_list dl span .select-adder {
 		opacity: 1;
 		width: 64px;
@@ -141,16 +141,26 @@
 		font-size: 14px;
 		background: #89aefa;
 	}
+	.pay_record .ticket_record_list dl dd {
+		border: 1px solid #dae5fd;
+		border-top: none;
+	}
 	.pay_record .ticket_record_list dl dd:hover {
 		background: #f1f5ff;
 	}
-	.pay_record .ticket_record_list dl dd span:first-child{
+	/*.pay_record .ticket_record_list dl dd span:first-child{
 		border-left: 1px solid #dae5fd;
 	}
+	.pay_record .ticket_record_list dl dd span:first-child{
+		border-left: 1px solid #dae5fd;
+	}*/
 	.pay_record .ticket_record_list dl dd span {
 		color: #666;
-		border-right: 1px solid #dae5fd;
-		border-bottom: 1px solid #dae5fd;
+	/*	border-right: 1px solid #dae5fd;
+		border-bottom: 1px solid #dae5fd;*/
+	}
+	.pay_record .ticket_record_list dl dd .link {
+		color: #3f84f6;
 	}
 	.ticket_record_list{
 		background: none;
@@ -436,17 +446,42 @@
 	.empty .empty-info i{
 		margin-right:5px;
 	}
+	.check-filter {
+		height: 80px;
+		line-height: 30px;
+		padding-left: 22px;
+	}
+	.check-filter .sreach input {
+		width: 147px;
+	}
+	.check-filter .radio-block {
+		display: inline-block;
+		font-size: 14px;
+		width: 33.3%;
+	}
+	.check-filter .radio-block.date-radio {
+		width: 46%;
+	}
+	.check-filter .radio-block .com-check-radio {
+		font-weight: normal;
+		color: #666;
+		margin-right: 13px;
+	}
+	.check-filter .radio-block .com-check-radio:last-child {
+		margin-right: 0;
+	}
+
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">
 	<!--支付中心-->
 	<div class="pay_record oder">
-		<div class="oder01" style="margin-bottom: 16px;">
+		<!--<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
 				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>
 				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">付款账户</a></li>
 			</ul>
-		</div>
+		</div>-->
 		<!--支付中心列表-->
 		<div class="ticket_record_list">
 			<!-- 支付信息-->
@@ -507,9 +542,73 @@
 			<!--支付记录-->
 			<div class="tab" ng-show="status == 'pay-history'" style="display: inline-block">
 				<!--搜索时间筛选-->
-				<div class="screen">
+				<div class="screen check-filter">
+					<div class="radio-block">
+						交易方式：
+						<label class="com-check-radio">
+							<input type="radio" id="methodAll" name="method" ng-click="setFilters('remitteeType', 'ALL')" ng-checked="remitteeType == 'ALL'">
+							<label for="methodAll"></label>
+							全部
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="forSeller" name="method" ng-click="setFilters('remitteeType', 'PAIDTOVENDOR')" ng-checked="remitteeType == 'PAIDTOVENDOR'">
+							<label for="forSeller"></label>
+							卖家收款
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="forPlatform" name="method" ng-click="setFilters('remitteeType', 'PAIDTOPLATFORM')" ng-checked="remitteeType == 'PAIDTOPLATFORM'">
+							<label for="forPlatform"></label>
+							平台代收
+						</label>
+					</div>
+					<div class="radio-block">
+					交易币种：
+					<label class="com-check-radio">
+						<input type="radio" id="currencyAll" name="currency" ng-click="setFilters('currency', 'ALL')" ng-checked="currency == 'ALL'">
+						<label for="currencyAll"></label>
+						全部
+					</label>
+					<label class="com-check-radio">
+						<input type="radio" id="RMB" name="currency" ng-click="setFilters('currency', 'RMB')" ng-checked="currency == 'RMB'">
+						<label for="RMB"></label>
+						RMB
+					</label>
+					<label class="com-check-radio">
+						<input type="radio" id="USD" name="currency" ng-click="setFilters('currency', 'USD')" ng-checked="currency == 'USD'">
+						<label for="USD"></label>
+						USD
+					</label>
+				</div>
+					<div class="radio-block date-radio">
+						交易时间：
+						<label class="com-check-radio">
+							<input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'ALL')" ng-checked="dateArea == 'ALL'">
+							<label for="dateAll"></label>
+							全部
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="oneMonth" name="date" ng-click="setFilters('dateArea', 'oneMonth')" ng-checked="dateArea == 'oneMonth'">
+							<label for="oneMonth"></label>
+							一个月
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="threeMonth" name="date" ng-click="setFilters('dateArea', 'threeMonth')" ng-checked="dateArea == 'threeMonth'">
+							<label for="threeMonth"></label>
+							三个月
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="sixMonth" name="date" ng-click="setFilters('dateArea', 'sixMonth')" ng-checked="dateArea == 'sixMonth'">
+							<label for="sixMonth"></label>
+							六个月
+						</label>
+						<label class="com-check-radio">
+							<input type="radio" id="autoMonth" name="date" ng-click="setFilters('dateArea', 'autoMonth')" ng-checked="dateArea == 'autoMonth'">
+							<label for="autoMonth"></label>
+							自定义
+						</label>
+					</div>
 					<div class="sreach fr">
-						<div class="date fl">
+						<div class="date fl" ng-show="dateArea == 'autoMonth'">
 							<div class="data-input">
 								<input id="start" type="text" ng-model="startDate" readonly="readonly"
 									   class="form-control select-adder" placeholder="起始时间"
@@ -544,55 +643,43 @@
 				</div>
 				<dl>
 					<dt>
-						<span>时间</span>
+						<span>卖家</span>
 						<span>订单号</span>
-						<span>商家名称</span>
-						<span>
+						<!--<span>
 							<select class="form-control select-adder" ng-model="currency" ng-change="filterLoad()">
 								<option value="ALL">币种</option>
 								<option value="RMB">RMB</option>
 								<option value="USD">USD</option>
 							</select>
-						</span>
-						<span>金额</span>
-						<span>
+						</span>-->
+						<span>订单金额</span>
+						<!--<span>
 							<select class="form-control select-adder" style="width: 90px" ng-model="paytype" ng-change="filterLoad()">
 								<option value="ALL">交易方式</option>
 								<option value="1102">线上支付</option>
 								<option value="1103">线下支付</option>
 							</select>
-						</span>
+						</span>-->
+						<span>交易方式</span>
 						<span>
-							<select class="form-control select-adder" style="width: 90px">
-								<option>状态</option>
-								<option value="1">支付成功</option>
-							</select>
+							状态
 						</span>
+						<span>时间</span>
 					</dt>
 					<dd ng-repeat="tradeRecord in tradeRecordPage">
-						<span ng-bind="tradeRecord.paytime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
-						<span><a ng-bind="tradeRecord.orderid" ng-href="user#/order/detail/{{tradeRecord.orderid | EncryptionFilter}}">20170116001</a></span>
-						<span ng-bind="tradeRecord.sellername">优软科技</span>
-						<span ng-bind="tradeRecord.currencyName"></span>
-						<span style="text-align:left;padding-left:5px;">
-							<!--<i class="fa fa-plus" style="color:#f51c24"></i>-->
-							<i class="fa fa-minus" style="color:#1da902"></i>
+						<span title="{{tradeRecord.sellername}}" ng-bind="tradeRecord.sellername"></span>
+						<span><a class="link" ng-bind="tradeRecord.orderid" ng-href="user#/order/detail/{{tradeRecord.orderid | EncryptionFilter}}"></a></span>
+						<span>
+							{{tradeRecord.currencyName == 'USD' ? '$' : '¥'}}
                             <em style="color: #323232;" ng-bind="tradeRecord.ensurePrice | formateNumber : 2"></em></span>
 						</span>
 						<span>
-							<b ng-if="tradeRecord.paytype == 1102">线上支付</b>
-							<b ng-if="tradeRecord.paytype == 1103">线下支付</b>
+							<b ng-if="tradeRecord.remitteeType == 'PAIDTOVENDOR'">卖家收款</b>
+							<b ng-if="tradeRecord.remitteeType == 'PAIDTOPLATFORM'">平台代收</b>
 						</span>
 						<span><b>支付成功</b></span>
+						<span ng-bind="tradeRecord.paytime | date : 'yyyy-MM-dd HH:mm:ss'"></span>
 					</dd>
-					<!--<dd>
-						<span>2017.01.18</span>
-						<span><em>20170116001</em></span>
-						<span>￥8888.52</span>
-						<span>支付宝</span>
-						<span>12345678909</span>
-						<span><em>退款成功</em></span>
-					</dd>-->
 					<dd ng-if="!tradeRecordPage || tradeRecordPage.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
 						<div class="col-xs-offset-3 col-xs-3">
 							<img src="static/img/all/empty-cart.png">

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -1065,7 +1065,7 @@
                 <th width="260">品牌/物料名称</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
-                <th width="120">状态/截止时间</th>
+                <th width="120">状态/截止{{tab == 'waitOffer' ? '时间' : '日期'}}</th>
                 <th width="140">操作</th>
             </tr>
             </thead>
@@ -1105,12 +1105,17 @@
                 </td>
                 <td>
                     <div class="row-wrap">
+                        <!--<div ng-bind="seek.endDate | date:'yyyy-MM-dd'"></div>
+                        <div class="date-bottom-item" ng-bind="seek.endDate | date:'HH:mm:ss'"></div>-->
                         <span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>
                         <span ng-if="seek.agreed == 0 && seek.offerAmount > 0">已报价</span>
                         <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
-                        <div class="remain" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></div>
-                        <div class="remain" ng-if="seek.remainingTime <= 0"><span>已截止</span></div>
-                        <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>
+                        <div ng-if="tab == 'offered'" class="date-bottom-item" ng-bind="seek.endDate | date:'yyyy-MM-dd'"></div>
+                        <div ng-if="tab == 'waitOffer'">
+                            <div class="remain" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></div>
+                            <div class="remain" ng-if="seek.remainingTime <= 0"><span>已截止</span></div>
+                            <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>
+                        </div>
                     </div>
                 </td>
                 <td class="operate-seek">

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -39,7 +39,7 @@
                 <div>
                     <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
-                    <li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_invoice">发票管理</a></li>
                 </div>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -432,25 +432,22 @@
 
     }
     .pay_record .ticket_record_list dl span:nth-child(1){
-        width:17.03%;
+        width:26%!important;
     }
     .pay_record .ticket_record_list dl span:nth-child(2){
-        width:15.73%;
+        width:20%!important;
     }
     .pay_record .ticket_record_list dl span:nth-child(3){
-        width:23.84%;
+        width:16%!important;
     }
     .pay_record .ticket_record_list dl span:nth-child(4){
-        width:8%;
+        width:10%!important;
     }
     .pay_record .ticket_record_list dl span:nth-child(5){
-        width:9.65%;
+        width:8%!important;
     }
     .pay_record .ticket_record_list dl span:nth-child(6){
-        width:12.12%;
-    }
-    .pay_record .ticket_record_list dl span:nth-child(7){
-        width:13.52%;
+        width:20%!important;
     }
     .pay_record .ticket_record_list dl span .select-adder {
         opacity: 1;
@@ -471,30 +468,49 @@
         white-space:nowrap;
         overflow: hidden;
     }
+    .pay_record .ticket_record_list dl dd {
+        border: 1px solid #dae5fd;
+        border-top: none;
+    }
     .pay_record .ticket_record_list dl dd:hover {
         background: #f1f5ff;
     }
-    .pay_record .ticket_record_list dl dd span:first-child{
-        border-left: 1px solid #dae5fd;
-    }
     .pay_record .ticket_record_list dl dd span {
         color: #666;
-        border-right: 1px solid #dae5fd;
-        border-bottom: 1px solid #dae5fd;
+    }
+    .pay_record .ticket_record_list dl dd .link {
+        color: #3f84f6;
     }
     .ticket_record_list{
         background: none;
     }
     .pay_record .ticket_record_list .total{
         width:98%;
-        height:39px;
-        background: #e6eefe;
-        display:inline-flex;
-        justify-content: space-around;
-        align-items: center;
+        height:60px;
+        background: #e0dedf;
         margin:0 10px;
+        font-size: 14px;
+    }
+    .pay_record .ticket_record_list .total .fl {
+        color: #333;
+        margin-left: 25px;
+        line-height: 60px;
     }
-    .pay_record .ticket_record_list dl div.total>span{
+    .pay_record .ticket_record_list .total .fr {
+        line-height: 30px;
+        margin-right: 13px;
+    }
+    .pay_record .ticket_record_list .total .fr p {
+        font-size: 14px;
+        text-align: right;
+    }
+    .pay_record .ticket_record_list .total .fr p:first-child em {
+        color: #fd0303;
+    }
+    .pay_record .ticket_record_list .total .fr p:last-child em {
+        color: #15b262;
+    }
+   /* .pay_record .ticket_record_list dl div.total>span{
         width:200px;
     }
     .pay_record .ticket_record_list dl div.total>span:nth-child(1) em{
@@ -511,7 +527,7 @@
     }
     .pay_record .ticket_record_list dl div.total>b{
         color:#abc4f7;
-    }
+    }*/
 
 
     #pay_center .tab .tab-header {
@@ -626,25 +642,98 @@
     .oder01 ul li.active:after{
         display: block
     }
+    .check-filter {
+        height: 80px;
+        line-height: 30px;
+        padding-left: 22px;
+    }
+    .check-filter .sreach input {
+        width: 147px;
+    }
+    .check-filter .radio-block {
+        display: inline-block;
+        font-size: 14px;
+        width: 33.3%;
+    }
+    .check-filter .radio-block.date-radio {
+        width: 46%;
+    }
+    .check-filter .radio-block .com-check-radio {
+        font-weight: normal;
+        color: #666;
+        margin-right: 13px;
+    }
+    .check-filter .radio-block .com-check-radio:last-child {
+        margin-right: 0;
+    }
+    .com-check-radio label {
+        margin-bottom: 5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">
     <!--支付中心-->
     <div class="pay_record oder">
-        <div class="oder01">
+      <!--  <div class="oder01">
             <ul>
                 <li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
                 <li ng-click="setTab('accountTab')" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">收款帐户</a></li>
             </ul>
-        </div>
+        </div>-->
         <!--支付中心列表-->
         <div class="ticket_record_list">
             <!-- 交易记录-->
             <div class="tab" ng-show="tab == 'paymentRecord'" style="display: inline-block">
                 <!--搜索时间筛选-->
-                <div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
+                <div class="screen check-filter" style="background: #f5f8fe;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
+                    <div class="radio-block" style="display: block;">
+                        交易方式：
+                        <label class="com-check-radio">
+                            <input type="radio" id="methodAll" name="method" ng-click="setFilters('remitteeType', 'ALL')" ng-checked="remitteeType == 'ALL'">
+                            <label for="methodAll"></label>
+                            全部
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="forSeller" name="method" ng-click="setFilters('remitteeType', 'PAIDTOVENDOR')" ng-checked="remitteeType == 'PAIDTOVENDOR'">
+                            <label for="forSeller"></label>
+                            买家付款
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="forPlatform" name="method" ng-click="setFilters('remitteeType', 'PLATFORMPAIDTOVENDOR')" ng-checked="remitteeType == 'PLATFORMPAIDTOVENDOR'">
+                            <label for="forPlatform"></label>
+                            平台代付
+                        </label>
+                    </div>
+                    <div class="radio-block date-radio">
+                        交易时间：
+                        <label class="com-check-radio">
+                            <input type="radio" id="dateAll" name="date" ng-click="setFilters('dateArea', 'ALL')" ng-checked="dateArea == 'ALL'">
+                            <label for="dateAll"></label>
+                            全部
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="oneMonth" name="date" ng-click="setFilters('dateArea', 'oneMonth')" ng-checked="dateArea == 'oneMonth'">
+                            <label for="oneMonth"></label>
+                            一个月
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="threeMonth" name="date" ng-click="setFilters('dateArea', 'threeMonth')" ng-checked="dateArea == 'threeMonth'">
+                            <label for="threeMonth"></label>
+                            三个月
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="sixMonth" name="date" ng-click="setFilters('dateArea', 'sixMonth')" ng-checked="dateArea == 'sixMonth'">
+                            <label for="sixMonth"></label>
+                            六个月
+                        </label>
+                        <label class="com-check-radio">
+                            <input type="radio" id="autoMonth" name="date" ng-click="setFilters('dateArea', 'autoMonth')" ng-checked="dateArea == 'autoMonth'">
+                            <label for="autoMonth"></label>
+                            自定义
+                        </label>
+                    </div>
                     <div class="sreach fr">
-                        <div class="date fl">
+                        <div  ng-show="dateArea == 'autoMonth'" class="date fl">
                             <div class="data-input">
                                 <input id="start" type="text" ng-model="startDate" readonly="readonly"
                                        class="form-control select-adder" placeholder="起始时间"
@@ -680,45 +769,47 @@
 
                 <dl>
                     <dt>
-                        <span>时间</span>
+                        <span>买家</span>
                         <span>订单号</span>
-                        <span>买家名称</span>
-                        <span>币种</span>
-                        <span>金额</span>
-                        <span>
-							<select class="form-control select-adder" style="width: 90px">
-								<option>交易方式</option>
-								<option value="1">线下支付</option>
-							</select>
-						</span>
-                        <span style="width:13.52%">
-							<select class="form-control select-adder" style="width: 90px">
-								<option>状态</option>
-								<option value="1">收款成功</option>
-							</select>
-						</span>
+                        <span>订单金额</span>
+                        <span>交易方式</span>
+                        <span>状态</span>
+                        <span>时间</span>
                     </dt>
                     <dd ng-repeat="record in bankTransRecore">
-                        <span ng-bind="record.transferTime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
-                        <span><a style="color: #666;" ng-bind="record.orderid" ng-href="vendor#/purchase/detail/{{record.puid | EncryptionFilter}}">20170116001</a></span>
-                        <span ng-bind="record.buyerentername || record.buyername">优软科技</span>
-                        <span ng-bind="record.currencyName">RMB</span>
-                        <span style="text-align:left;padding-left:5px;">
-                            <i class="fa fa-plus" style="color:#f51c24"></i>
-                            <!--<i class="fa fa-minus" style="color:#1da902"></i>-->
-                            {{record.total}}</span>
-                        <span>线下付款</span>
+                        <span title="{{record.buyerentername || record.buyername}}" ng-bind="record.buyerentername || record.buyername">优软科技</span>
+                        <span><a class="link" style="color: #666;" ng-bind="record.orderid" ng-href="vendor#/purchase/detail/{{record.puid | EncryptionFilter}}">20170116001</a></span>
+                        <span title="{{(record.currencyName == 'USD' ? '$' : '¥') + record.total}}">{{(record.currencyName == 'USD' ? '$' : '¥') + record.total}}</span>
+                        <span>{{record.type == 'PAIDTOVENDOR' ? '买家付款' : '平台代付'}}</span>
                         <span>收款成功</span>
+                        <span ng-bind="record.transferTime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
                     </dd>
                     <div class="total" ng-if="bankTransRecore && bankTransRecore.length > 0">
-                        <span>收入总计&nbsp;  <em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                     <!--   <span>收入总计&nbsp;  <em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
                             <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>{{totalPrice}}</em></span>
                         <b>|</b>
                         <span>支出总计&nbsp;  <em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
                             <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>0</em></span>
                         <b>|</b>
                         <span>结余&nbsp;<em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
-                            <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>{{totalPrice}}(共计{{totalElements}}笔交易)</em></span>
+                            <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>{{totalPrice}}(共计{{totalElements}}笔交易)</em></span>-->
+                        <div class="fl">共计{{totalElements}}笔交易</div>
+                        <div class="fr">
+                            <p>已收总计：
+                                <em>
+                                    <i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                                    <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>
+                                    {{totalPrice}}
+                                </em>
+                            </p>
+                            <p>结余：
+                                <em>
+                                    <i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                                    <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>
+                                    {{totalPrice}}
+                                </em>
+                            </p>
+                        </div>
                     </div>
 
                     <dd ng-if="!bankTransRecore || bankTransRecore.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -689,7 +689,7 @@
                 <th width="245">品牌/物料名称</th>
                 <th width="245">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
-                <th width="130">剩余时间</th>
+                <th width="130">截止日期</th>
                 <th width="90">操作</th>
             </tr>
             </thead>
@@ -730,9 +730,11 @@
                         </div>
                     </div>
                 </td>
-                <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
+                <td ng-bind="seek.endDate | date:'yyyy-MM-dd'">
+                </td>
+                <!--<td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
-                <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
+                <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>-->
                 <td class="operate" ng-switch="seek.agreed" style="border-right: 1px solid #dae5fd">
                     <a ng-click="setLinkBoxIndex($index)">联系买家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
                     <div class="is-say-price" ng-if="seek.agreed != 1 && seek.agreed != 0 || seek.replies">已报价 <img src="static/img/seekPurchase/check.png" alt="">

src/main/webapp/resources/view/vendor/left_nav.html

@@ -51,7 +51,7 @@
 				<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 			</li>
 			<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
-			<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">财务对账</span></li>
+			<li ng-class="{'active' : active == 'vendor_pay_center'}"><span  ui-sref="pay_center">应收对账</span></li>
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
 				<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>