Merge remote-tracking branch 'origin/release-B2bOrSsr-wangcz' into release-B2bOrSsr-wangcz

src/main/webapp/resources/js/common/b2bServices.js

@@ -2782,7 +2782,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
         return $resource(b2bUrl + '/sale/inquiry', {}, {
             // 获取最新的已采纳的价信息
             agreed: {
-                url: 'sale/inquiry/recentPrice/:prId',
+                url: b2bUrl + 'sale/inquiry/recentPrice/:prId',
                 method: 'GET'
             }
         });

src/main/webapp/resources/js/common/services.js

@@ -151,7 +151,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 					// defer.promise.then(function (resolve) {
 					// 	$rootScope.b2bUrl = resolve.url;
 					// });
-					$rootScope.b2bUrl = this.getRootPath().indexOf('usoftmall.com') > -1 ? 'http://uas.ubtob.com' : 'http://10.1.51.91:8090/platform-b2b';
+					$rootScope.b2bUrl = this.getRootPath().indexOf('usoftchina.com') > -1 ? 'http://b2b.usoftchina.com/' : 'http://192.168.253.12:9000/b2b-test/';
 				}
 				return $rootScope.b2bUrl;
 			}

src/main/webapp/resources/js/common/services/Token.js

@@ -1,9 +1,9 @@
 define([ 'ngResource'], function() {
 	angular.module('TokenService', [ 'ngResource']).factory('token', ['$resource', 'BaseService', function($resource, BaseService) {
     var rootPath = BaseService.getB2bUrl();
-		return $resource(rootPath + 'token', {}, {
+		return $resource(rootPath + '/token', {}, {
 			info: {
-				url: rootPath + 'token',
+				url: rootPath + '/token',
 				mehtod: 'GET'
 			}
 		})

src/main/webapp/resources/js/sso/controllers/b2b/addPartnerRequestCtrl.js

@@ -62,6 +62,8 @@ define(['app/app'], function (app) {
                   if (page) {
                       params.total(page.totalElement);
                       $defer.resolve(page.content);
+                    $scope.infoCommon = page
+                    $scope.infoCommon.all = page.content.length
                       $scope.keywordXls = angular.copy(pageParams.keyword);//保存当前取值的关键词
                   }
               }, function (response) {

src/main/webapp/resources/js/sso/controllers/b2b/customersInfoCtrl.js

@@ -28,6 +28,8 @@ define(['app/app'], function (app) {
                   if (page) {
                       params.total(page.totalElement);
                       $scope.total = page.totalElement;
+                    $scope.infoCommon = page
+                    $scope.infoCommon.all = page.content.length
                       $defer.resolve(page.content);
                   }
                   $scope.totalCount = page.totalElement;

src/main/webapp/resources/js/sso/controllers/b2b/newPartnerCtrl.js

@@ -62,6 +62,8 @@ define(['app/app'], function (app) {
                       if (page) {
                           params.total(page.totalElement);
                           $defer.resolve(page.content);
+                        $scope.infoCommon = page
+                        $scope.infoCommon.all = page.content.length
                           $scope.keywordXls = angular.copy(pageParams.keyword);//保存当前取值的关键词
                       }
                   }, function (response) {

src/main/webapp/resources/js/sso/controllers/b2b/servicerInfoCtrl.js

@@ -29,6 +29,8 @@ define(['app/app'], function (app) {
                   if (page) {
                       params.total(page.totalElement);
                       $scope.total = page.totalElement;
+                    $scope.infoCommon = page
+                    $scope.infoCommon.all = page.content.length
                       $defer.resolve(page.content);
                   }
                   $scope.totalCount = page.totalElement;

src/main/webapp/resources/js/sso/controllers/b2b/vendorsInfoCtrl.js

@@ -29,6 +29,8 @@ define(['app/app'], function (app) {
                   if (page) {
                       params.total(page.totalElement);
                       $scope.total = page.totalElement;
+                    $scope.infoCommon = page
+                    $scope.infoCommon.all = page.content.length
                       $defer.resolve(page.content);
                   }
                   $scope.totalCount = page.totalElement;

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/purchaseInquiryCtrl.js

@@ -189,7 +189,7 @@ define(['app/app'], function(app) {
     $scope.exportXls = function () {
       PurchaseInquiry.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcChangeListCtrl.js

@@ -200,7 +200,7 @@ define(['app/app'], function(app) {
         $scope.exportXls = function () {
             change.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'purc/change/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = BaseService.getB2bUrl() + '/purc/change/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcMakeOutOrderCtrl.js

@@ -232,7 +232,7 @@ define(['app/app'], function(app) {
         $scope.exportXls = function () {
             MakeOutOrder.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = BaseService.getB2bUrl() + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/usercenter/controllers/b2b/order/usercenterOrderCtrl.js

@@ -354,7 +354,7 @@ define(['app/app'], function(app) {
             $scope.exportXls = function () {
                 PurcOrders.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = 'sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                        window.location.href = BaseService.getB2bUrl() + '/sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/apBill.js

@@ -124,7 +124,7 @@ define(['app/app'], function (app) {
           $scope.exportXls = function () {
             FaApBill.exportXls({}, {}, function (data) {
               if (data.success) {
-                window.location.href = 'sale/apBill/xls?_state=' + $scope.active
+                window.location.href = BaseService.getB2bUrl() + '/sale/apBill/xls?_state=' + $scope.active
                     + '&keyword=' + ($scope.keywordXls || "") + '&fromDate='
                     + $scope.fromDateXls + '&endDate=' + $scope.endDateXls;
               }

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -166,7 +166,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       FaApCheck.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/change/sale_inquiry_details.js

@@ -1,6 +1,6 @@
 // 询价单明细
 define(['app/app'], function (app) {
-  app.register.controller('saleInquiryDetailCtrl', ['$rootScope', '$scope', '$stateParams', 'B2bPurcInquiry', '$filter', 'toaster', '$upload', 'token', 'B2bCurrentRole', function ($rootScope, $scope, $stateParams, PurcInquiry, $filter, toaster, $upload, token, CurrentRole) {
+  app.register.controller('saleInquiryDetailCtrl', ['BaseService', '$rootScope', '$scope', '$stateParams', 'B2bPurcInquiry', '$filter', 'toaster', '$upload', 'token', 'B2bCurrentRole', function (BaseService, $rootScope, $scope, $stateParams, PurcInquiry, $filter, toaster, $upload, token, CurrentRole) {
       $rootScope.active = 'vendor_seek_purchase';
       // 获取当前用户是否为普通用户
       CurrentRole.isUser({}, {}, function (data) {
@@ -147,7 +147,7 @@ define(['app/app'], function (app) {
               if (withSteps) {
                   if(null != file) {
                       $upload.upload({
-                          url: 'sale/inquiry/addAttach',
+                          url: BaseService.getB2bUrl() + '/sale/inquiry/addAttach',
                           file: file,
                           method: 'POST',
                           data: {
@@ -174,7 +174,7 @@ define(['app/app'], function (app) {
               } else {
                   if(null != file) {
                       $upload.upload({
-                          url: 'sale/inquiry/addAttach',
+                          url:BaseService.getB2bUrl() + '/sale/inquiry/addAttach',
                           file: file,
                           method: 'POST',
                           data: {

src/main/webapp/resources/js/vendor/controllers/b2b/change/sale_inquiry_mould_detail.js

@@ -1,6 +1,6 @@
 // 客户模具询价单
 define(['app/app'], function (app) {
-  app.register.controller('saleInquiryMouldDetailCtrl', ['$scope', '$stateParams', 'B2bPurcInquiryMould', '$filter', 'toaster', '$upload', 'B2bCurrentRole', function ($scope, $stateParams, PurcInquiryMould, $filter, toaster, $upload, CurrentRole) {
+  app.register.controller('saleInquiryMouldDetailCtrl', ['BaseService', '$scope', '$stateParams', 'B2bPurcInquiryMould', '$filter', 'toaster', '$upload', 'B2bCurrentRole', function (BaseService, $scope, $stateParams, PurcInquiryMould, $filter, toaster, $upload, CurrentRole) {
       // 获取当前用户是否为普通用户
       CurrentRole.isUser({}, {}, function (data) {
           $scope.isUser = data.isUser;
@@ -107,7 +107,7 @@ define(['app/app'], function (app) {
 //			var file = mould.attachFile.$viewValue, file = file && file.length > 0 ? file[0] : null;
           $scope.mould  = $scope.inquiryMould;
           $upload.upload({
-              url: 'sale/mould/' + $scope.mould.id + '/send',
+              url: BaseService.getB2bUrl() +'sale/mould/' + $scope.mould.id + '/send',
               method: 'POST',
               file: file,
               data: {

src/main/webapp/resources/js/vendor/controllers/b2b/sale/approval.js

@@ -112,7 +112,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcApproval.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+          window.location.href = BaseService.getB2bUrl() + '/sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/saleQuotationNewCtrl.js

@@ -184,7 +184,7 @@ define(['app/app'], function (app) {
                     if ($stateParams.id)
                         window.location.reload();
                     else
-                        window.location.hash = '#/sale/quotation/list';
+                        window.location.hash = '#/sale/quotationList';
                 }, function (response) {
                     $scope.loading = false;
                     toaster.pop('error', '保存失败', response.data);
@@ -233,7 +233,7 @@ define(['app/app'], function (app) {
                     $scope.item = data;
                     toaster.pop('success', '成功', '提交成功');
                     // window.location.hash = '#/sale/quotation/' + data.id;
-                    window.location.hash = '#/sale/quotation/list';
+                    window.location.hash = '#/sale/quotationList';
                 }, function (response) {
                     $scope.loading = false;
                     toaster.pop('error', '保存失败', response.data);
@@ -243,7 +243,7 @@ define(['app/app'], function (app) {
 
         $scope.deleteById = function (id) {
             Quotation.deleteById({id: id}, {}, function (data) {
-                window.location.href = "#/sale/quotation/list";
+                window.location.href = "#/sale/quotationList";
             }, function (response) {
                 toaster.pop('error', '提示', response.data);
             })

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_accept.js

@@ -124,7 +124,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcAccept.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_badIn.js

@@ -110,7 +110,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcBadIn.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_badOut.js

@@ -118,7 +118,7 @@ define(['app/app'], function (app) {
           $scope.exportXls = function () {
             PurcBadOut.exportXls({}, {}, function (data) {
               if (data.success) {
-                window.location.href = 'sale/badOut/xls?_state=' + $scope.active
+                window.location.href = BaseService.getB2bUrl() + '/sale/badOut/xls?_state=' + $scope.active
                     + '&searchFilter=' + encodeURIComponent(
                         angular.toJson($scope.searchFilterXls));
               }

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_make_accept.js

@@ -120,7 +120,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       MakeAccept.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+          window.location.href = BaseService.getB2bUrl() + '/make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_make_returns.js

@@ -117,7 +117,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       MakeReturn.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+          window.location.href = BaseService.getB2bUrl() + '/make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sale_returns.js

@@ -117,7 +117,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcReturn.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/sample.js

@@ -207,7 +207,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcSample.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleChangeCtrl.js

@@ -183,7 +183,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcChange.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = b2bPath + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+          window.location.href = BaseService.getB2bUrl() + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleInquiryCtrl.js

@@ -358,7 +358,7 @@ define(['app/app'], function (app) {
                 if (withSteps) { // 保存并报价
                     if(null != file) {
                         $upload.upload({
-                            url: 'sale/inquiry/addAttach',
+                            url: BaseService.getB2bUrl() + '/sale/inquiry/addAttach',
                             file: file,
                             method: 'POST',
                             data: {
@@ -389,7 +389,7 @@ define(['app/app'], function (app) {
                 } else {  // 保存
                     if(null != file) {
                         $upload.upload({
-                            url: 'sale/inquiry/addAttach',
+                            url: BaseService.getB2bUrl() + '/sale/inquiry/addAttach',
                             file: file,
                             method: 'POST',
                             data: {
@@ -482,7 +482,7 @@ define(['app/app'], function (app) {
         $scope.exportXls = function () {
             PurcInquiry.exportXls({}, {}, function (data) {
                 if (data.success) {
-                    window.location.href = 'sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = BaseService.getB2bUrl() + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleInquiryMouldCtrl.js

@@ -325,7 +325,7 @@ define(['app/app'], function (app) {
 //			var file = mould.attachFile.$viewValue, file = file && file.length > 0 ? file[0] : null;
             $scope.mould = mould;
             $upload.upload({
-                url: 'sale/mould/' + mould.id + '/send',
+                url: BaseService.getB2bUrl() + '/sale/mould/' + mould.id + '/send',
                 method: 'POST',
                 file: file,
                 data: {
@@ -436,11 +436,15 @@ define(['app/app'], function (app) {
         $scope.exportXls = function () {
             PurcInquiryMould.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = BaseService.getB2bUrl() + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
             });
         }
+
+        $scope.downFile = function(id) {
+          window.location.href = BaseService.getB2bUrl() + '/file/' + id
+        }
     }]);
 });

src/main/webapp/resources/js/vendor/controllers/b2b/saleMakechangeCtrl.js

@@ -154,7 +154,7 @@ define(['app/app'], function (app) {
           $scope.exportXls = function () {
             MakeChange.exportXls({}, {}, function (data) {
               if (data.success) {
-                window.location.href = 'make/changes/xls?_state='
+                window.location.href =  BaseService.getB2bUrl() +'/make/changes/xls?_state='
                     + $scope.active + '&searchFilter=' + encodeURIComponent(
                         angular.toJson($scope.searchFilterXls));
               }

src/main/webapp/resources/js/vendor/controllers/b2b/saleMaketodoCtrl.js

@@ -4,8 +4,8 @@
  */
 define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('saleMaketodoCtrl', ['$rootScope','$scope', '$filter', 'B2bMakeOrder', 'ngTableParams', 'toaster', 'B2bReportService', 'BaseService', 'B2bSearchFilter', '$http', 'B2bCurrentRole',
-        function ($rootScope, $scope, $filter, MakeOrder, ngTableParams, toaster, ReportService, BaseService, SearchFilter, $http, B2bCurrentRole) {
+    app.register.controller('saleMaketodoCtrl', ['BaseService', '$rootScope','$scope', '$filter', 'B2bMakeOrder', 'ngTableParams', 'toaster', 'B2bReportService', 'BaseService', 'B2bSearchFilter', '$http', 'B2bCurrentRole',
+        function (BaseService, $rootScope, $scope, $filter, MakeOrder, ngTableParams, toaster, ReportService, BaseService, SearchFilter, $http, B2bCurrentRole) {
           $rootScope.active = 'vendor_order'
           $scope.tab = 'maketodo'
             var b2bUrl = BaseService.getB2bUrl()
@@ -336,7 +336,7 @@ define(['app/app'], function (app) {
             $scope.exportXls = function () {
                 MakeOrder.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = 'make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                        window.location.href = BaseService.getB2bUrl() + '/make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleNoticeCtrl.js

@@ -405,7 +405,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       PurcNotice.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/notice/xls?_state='+$scope.active+
+          window.location.href = BaseService.getB2bUrl() + '/sale/notice/xls?_state='+$scope.active+
               '&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
         }
       }, function (response) {

src/main/webapp/resources/js/vendor/controllers/b2b/saleOrderCtrl.js

@@ -352,7 +352,7 @@ define(['app/app'], function (app) {
       $scope.exportXls = function () {
         PurcOrderItem.exportXls({}, {}, function (data) {
           if (data.success){
-            window.location.href = 'sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+            window.location.href =  BaseService.getB2bUrl() +'/sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
           }
         }, function (response) {
           toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleQuotationListCtrl.js

@@ -230,7 +230,7 @@ define(['app/app'], function (app) {
         $scope.exportXls = function () {
             Quotation.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = BaseService.getB2bUrl() + '/sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/saleSendCtrl.js

@@ -121,7 +121,7 @@ define(['app/app'], function (app) {
     $scope.exportXls = function () {
       SaleSend.exportXls({}, {}, function (data) {
         if (data.success){
-          window.location.href = 'sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+          window.location.href = BaseService.getB2bUrl() + '/sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
         }
       }, function (response) {
         toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/view/sso/b2b/customersInfo.html

@@ -146,6 +146,28 @@
 		border: solid 1px #5078cb;
 		color: #ffffff !important ;
 	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
 </style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
 <div style="background: #fff;" id="myquest-public" class="block fr">
@@ -174,7 +196,7 @@
                 </div>
             </div>
         </form>-->
-		<div class="pane-body">
+		<div class="pane-body" style="position: relative">
 			<table class="customer-tab table table-bordered table-striped table-hover"
 				   ng-table="customerParams">
 				<tbody ng-repeat="customer in $data" ng-if="customerParams.total() > 0">
@@ -233,6 +255,9 @@
 				</tr>
 				</tbody>
 			</table>
+			<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+				显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/view/sso/b2b/myRequest.html

@@ -390,9 +390,30 @@
 	}
 	.order-table .order-hd.height72{
 		background: #fff !important ;
+	}.ng-table-pager::after {
+		 clear: both;
+		 content: ' ';
+		 zoom: 1;
+		 display: block;
+		 visibility: hidden;
+	 }
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
 	}
 </style>
-<div class="block fr" id="myquest-public">
+<div class="block fr" id="myquest-public" style="position: relative">
 	<div ng-include src="'static/view/sso/b2b/vendorAndCustomer.html'"></div>
 	<div>
 		<div class="search">
@@ -473,5 +494,8 @@
 			</td>
 		</tr>
 		</tbody>
+		<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+			显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+		</div>
 	</table>
 </div>

src/main/webapp/resources/view/sso/b2b/newPartner.html

@@ -338,8 +338,30 @@
 		width:1026px;
 		margin: 0 auto;
 	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
 </style>
-<div class="block fr" id="myquest-public">
+<div class="block fr" id="myquest-public" style="position: relative">
 	<div class="loading in" ng-class="{'in': loading}">
 		<!--<i></i>-->
 		<div class="wrap">
@@ -444,4 +466,7 @@
 		</tr>
 		</tbody>
 	</table>
+	<!--<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">-->
+		<!--显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条-->
+	<!--</div>-->
 </div>

src/main/webapp/resources/view/sso/b2b/servicerInfo.html

@@ -163,6 +163,28 @@
 		border: solid 1px #5078cb;
 		color: #ffffff !important ;
 	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
 </style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
 <div style="background: #fff;" id="myquest-public" class="block fr">
@@ -195,7 +217,7 @@
 		</div>
 	</div>
 	<div class="wrap-contnet" id="customer-tab">
-		<div class="content">
+		<div class="content" style="position: relative">
 			<!--供应商列表-->
 			<table class="table  table-hover customer-tab" ng-table="customerParams">
 				<tbody ng-repeat="vendor in $data">
@@ -252,6 +274,9 @@
 				</tr>
 				</tbody>
 			</table>
+			<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+				显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/view/sso/b2b/vendorsInfo.html

@@ -163,7 +163,28 @@
 		border: solid 1px #5078cb;
 		color: #ffffff !important ;
 	}
-
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
 </style>
 <div style="background: #fff;" id="myquest-public" class="block fr">
 	<div ng-include src="'static/view/sso/b2b/vendorAndCustomer.html'"></div>
@@ -195,7 +216,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="wrap-content" id="customer-tab">
+	<div class="wrap-content" id="customer-tab"  style="position: relative">
 		<div class="content">
 			<!--供应商列表-->
 			<table class="table order-table table-hover customer-tab" ng-table="customerParams">
@@ -255,6 +276,9 @@
 				</tr>
 				</tbody>
 			</table>
+			<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+				显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/view/usercenter/b2b/Purc/inquiry_unapply.html

@@ -314,7 +314,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html

@@ -332,7 +332,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/view/usercenter/b2b/Purc/tender_answer_list.html

@@ -258,7 +258,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html

@@ -187,7 +187,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

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

@@ -149,7 +149,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

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

@@ -552,9 +552,13 @@
 		min-width: 110px
 	}
 	.oder01 ul li.active a{
+		border: 0px;
 		border-bottom: #fff;
 		background: #5078cb;
-		color: #fff;
+		color: #fff !important;
+	}
+	.oder01 ul {
+		border-bottom: 0px
 	}
 	.oder01 ul li::after{
 		background: url('static/img/vendor/images/downicon.png');

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

@@ -145,9 +145,13 @@
         position: relative;
     }
     .oder01 ul li.active a{
+        border: 0px;
         border-bottom: #fff;
         background: #5078cb;
-        color: #fff;
+        color: #fff !important;
+    }
+    .oder01 ul {
+        border-bottom: 0px
     }
     .oder01 ul li::after{
         background: url('static/img/vendor/images/downicon.png');

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

@@ -205,9 +205,13 @@ body div.ng-table-pager a.page-a {
     position: relative;
 }
 .oder01 ul li.active a{
+    border: 0px;
     border-bottom: #fff;
     background: #5078cb;
-    color: #fff;
+    color: #fff !important;
+}
+.oder01 ul {
+    border-bottom: 0px
 }
 .oder01 ul li::after{
     background: url('static/img/vendor/images/downicon.png');

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

@@ -861,9 +861,14 @@
         position: relative;
     }
     .oder011 ul li.active a{
-        border-bottom: #fff;
+
         background: #5078cb;
-        color: #fff;
+        color: #fff !important;
+        border:0px;
+        border-bottom: #fff;
+    }
+    .oder01 ul {
+        border-bottom: 0px
     }
     .oder011 ul li::after{
         background: url('static/img/vendor/images/downicon.png');

src/main/webapp/resources/view/vendor/b2b/apBill.html

@@ -142,7 +142,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -161,7 +161,7 @@
     display: inline-block;
   }
   .com_tab:nth-of-type(1) ul li::after {
-    background:url('/static/img/vendor/images/downicon.png')
+    background:url('/static/img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_mould_detail.html

@@ -467,42 +467,43 @@
         </td>
       </table>
     </div>
-  </div>
-</div>
-<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null && inquiryMould.valid != 0">
-  <div class="text-center btn-items" ng-show="!inquiryMould.$editing">
-    <button class="btn btn-success btn-items"
-            ng-click="inquiryMould.$editing=!inquiryMould.$editing">
-      报价
-    </button>
-  </div>
-  <div class="text-center btn-items" ng-show="inquiryMould.$editing">
-    <button ng-click="onReplyClick(inquiryMould, true)"
-            class="btn btn-danger btn-items">
-      保存并确认报价
-    </button>
-    <button ng-click="onReplyClick(inquiryMould)"
-            ng-disabled="!canSave"
-            class="btn btn-success btn-items">保存</button>
-    <button class="btn btn-items"
-            ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()">取消</button>
-  </div>
-</div>
-<div ng-if="inquiryMould.replyable && inquiryMould.status == 201 && inquiryMould.adoptStatus == null && inquiryMould.checked != 1  && inquiryMould.valid != 0" style="padding-top: 20px;">
-  <div class="text-center btn-items" ng-show="!inquiryMould.$editing">
-    <button class="btn btn-success" ng-click="inquiryMould.$editing=!inquiryMould.$editing;  getToken()">修改报价</button>
-  </div>
-  <div class="text-center" ng-show="inquiryMould.$editing">
-    <button ng-click="onReplyClick(inquiryMould, true)"
-            ng-disabled="!canSave"
-            class="btn btn-danger btn-items">
-      保存并确认报价
-    </button>
-    <botton class="btn btn-success btn-items" ng-disabled="!canSave"
-            ng-click="onReplyClick(inquiryMould)">
-      保存
-    </botton>
-    <button class="btn btn-items"
-            ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()">取消</button>
+    <div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null && inquiryMould.valid != 0">
+      <div class="text-center btn-items" ng-show="!inquiryMould.$editing">
+        <button class="btn btn-success btn-items"
+                ng-click="inquiryMould.$editing=!inquiryMould.$editing">
+          报价
+        </button>
+      </div>
+      <div class="text-center btn-items" ng-show="inquiryMould.$editing">
+        <button ng-click="onReplyClick(inquiryMould, true)"
+                class="btn btn-danger btn-items">
+          保存并确认报价
+        </button>
+        <button ng-click="onReplyClick(inquiryMould)"
+                ng-disabled="!canSave"
+                class="btn btn-success btn-items">保存</button>
+        <button class="btn btn-items"
+                ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()">取消</button>
+      </div>
+    </div>
+    <div ng-if="inquiryMould.replyable && inquiryMould.status == 201 && inquiryMould.adoptStatus == null && inquiryMould.checked != 1  && inquiryMould.valid != 0" style="padding-top: 20px;">
+      <div class="text-center btn-items" ng-show="!inquiryMould.$editing">
+        <button class="btn btn-success" ng-click="inquiryMould.$editing=!inquiryMould.$editing;  getToken()">修改报价</button>
+      </div>
+      <div class="text-center" ng-show="inquiryMould.$editing">
+        <button ng-click="onReplyClick(inquiryMould, true)"
+                ng-disabled="!canSave"
+                class="btn btn-danger btn-items">
+          保存并确认报价
+        </button>
+        <botton class="btn btn-success btn-items" ng-disabled="!canSave"
+                ng-click="onReplyClick(inquiryMould)">
+          保存
+        </botton>
+        <button class="btn btn-items"
+                ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()">取消</button>
+      </div>
+    </div>
+
   </div>
 </div>

src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html

@@ -290,13 +290,22 @@
 <div class="block user_right fr" id="public" style="    position: relative">
   <div class="pro_management device">
     <div class="com_tab" style="margin-bottom: 10px">
-      <ul class="fl" style="width: 100%">
-        <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
-        <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
-        <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
-        <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
-        <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
-        <li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2b客户出入库</a></li>
+      <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
+        <li ng-class="{'active': $$productOn.tab == 'bathOn'}"><a>导入产品</a></li>
+        <!--<li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>-->
+        <!--<li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>-->
+      </ul>
+      <ul class="fl" style="width: 100%" ng-if="isPcbStore">
+        <!--<li><a ui-sref="vendor_material">公司产品库</a></li>-->
+        <!--<li><a ui-sref="vendor_material_person">个人产品库</a></li>-->
+        <!--<li><a ui-sref="vendor_onSale">在售产品</a></li>-->
+        <!--<li><a ui-sref="vendor_storage">出入库</a></li>-->
+        <!--<li><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
+        <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
+        <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
+        <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
+        <li><a ui-sref="vendor_upload">产品导入</a></li>
+        <li class="active"><a ui-sref="sale_badOut">B2b客户出入库</a></li>
         <li class="down-purchase">
           <span ng-click="exportXls()">
               <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
@@ -306,6 +315,22 @@
           </form>
         </li>
       </ul>
+      <!--<ul class="fl" style="width: 100%">-->
+        <!--<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
+        <!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->
+        <!--<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>-->
+        <!--<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
+        <!--<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>-->
+        <!--<li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2b客户出入库</a></li>-->
+        <!--<li class="down-purchase">-->
+          <!--<span ng-click="exportXls()">-->
+              <!--<i class="fa fa-file-excel-o fa-fw"></i>导出Excel-->
+          <!--</span>-->
+          <!--<form style="display: none;" id="down-load-purchase" method="get" class="ng-pristine ng-valid">-->
+            <!--<input type="hidden" name="ids" ng-value="localInfo.ids">-->
+          <!--</form>-->
+        <!--</li>-->
+      <!--</ul>-->
     </div>
   </div>
   <div class="tab_top" style="margin-bottom: 10px">

src/main/webapp/resources/view/vendor/b2b/sale_change.html

@@ -507,7 +507,7 @@
 						<span ng-bind="change.description"></span>
 					</td>
 					<td class="text-center br-l" style="vertical-align:middle;padding-top: 0px" rowspan="{{::change.orderChangeItems.length}}" ng-if="$index === 0">
-						<div ng-if="change.status != 200">
+						<div >
 							<div ng-bind="::item.description"></div>
 							<div ng-if="change.agreed == 1 && !change.unNeedReply" class="block">
 								<span class="text-trans success">已同意</span>

src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -280,7 +280,7 @@
 		display: inline-block;
 	}
 	.com_tab:nth-of-type(1) ul li::after {
-		background:url('/static/img/vendor/images/downicon.png')
+		background:url('/static/img/vendor/images/downicon.png');
 		width: 11px;
 		height: 6px;
 		position: absolute;
@@ -639,7 +639,7 @@
 			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待报价(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>
 			<li ng-class="{'active': active=='agreed'}" ng-click="setActive('agreed')"><a>已采纳</a></li>
 			<li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>未采纳</a></li>
-			<li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>已失效</a></li>
+			<li ng-class="{'active': active=='invalid'}" ng-click="setActive('invalid')"><a>已失效</a></li>
 		</ul>
 	</div>
 	<div class="condition block">

src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html

@@ -221,7 +221,7 @@
 		display: inline-block;
 	}
 	.com_tab:nth-of-type(1) ul li::after {
-		background:url('/static/img/vendor/images/downicon.png')
+		background:url('/static/img/vendor/images/downicon.png');
 		width: 11px;
 		height: 6px;
 		position: absolute;
@@ -758,12 +758,12 @@
 					</div>
 				</div>
 				<div ng-if="inquiryMould.attachs.length" class="text-muted">
-					附件：<a class="file" ng-repeat="attach in inquiryMould.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
+					附件：<a class="file" ng-repeat="attach in inquiryMould.attachs" ng-click="downFile(attach.id)">{{::attach.name}}</a>
 				</div>
 				<div ng-if="inquiryMould.sellAttachs.length" class="text-muted">
 					供应商附件：
 					<div ng-repeat="attach in inquiryMould.sellAttachs track by $index">
-						<a class="file"  href="file/{{attach.id}}">{{::attach.name}}</a>
+						<a class="file"  href="file/{{attach.id}}" >{{::attach.name}}</a>
 						<a style="color: #ff2222" ng-click="removeFile(inquiryMould, attach)">删除</a>
 					</div>
 				</div>

src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -224,7 +224,7 @@
 		display: inline-block;
 	}
 	.com_tab:nth-of-type(1) ul li::after {
-		background:url('/static/img/vendor/images/downicon.png')
+		background:url('/static/img/vendor/images/downicon.png');
 		width: 11px;
 		height: 6px;
 		position: absolute;

src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html

@@ -246,7 +246,7 @@
 		display: inline-block;
 	}
 	.com_tab:nth-of-type(1) ul li::after {
-		background:url('/static/img/vendor/images/downicon.png')
+		background:url('/static/img/vendor/images/downicon.png');
 		width: 11px;
 		height: 6px;
 		position: absolute;

src/main/webapp/resources/view/vendor/b2b/sale_tender_question_list.html

@@ -269,7 +269,7 @@
 		display: inline-block;
 	}
 	.com_tab:nth-of-type(1) ul li::after {
-		background:url('/static/img/vendor/images/downicon.png')
+		background:url('/static/img/vendor/images/downicon.png');
 		width: 11px;
 		height: 6px;
 		position: absolute;

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

@@ -629,13 +629,13 @@
         border-bottom: #fff;
         background: #5078cb;
         border: 0px;
-        color: #fff;
+        color: #fff !important;
     }
     .oder01 ul {
         border-bottom: 0px
     }
     .oder01 ul li::after{
-        background: url('static/img/vendor/images/downicon.png');
+
         width: 11px;
         height: 6px;
         position: absolute;
@@ -644,6 +644,7 @@
         content: ' ';
         margin-left: -5px;
         display: none;
+        background: url('static/img/vendor/images/downicon.png');
     }
     .oder01 ul li.active:after{
         display: block

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

@@ -1156,6 +1156,7 @@
                 <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
                 <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
+                <li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2b客户出入库</a></li>
             </ul>
         </div>
         <div class="com_tab com_tab2" style="margin-bottom: 10px">

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

@@ -610,6 +610,7 @@
                 <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
                 <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
+                <li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2b客户出入库</a></li>
             </ul>
         </div>
         <div class="search-check">

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

@@ -545,6 +545,7 @@
                 <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
                 <li class="active"><a ui-sref="vendor_upload">产品导入</a></li>
+                <li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2b客户出入库</a></li>
             </ul>
         </div>
         <div class="remind-line" ng-show="$$productOn.tab == 'bathOn' && showTip"><span class="fl">导入企业库的产品同时会进行上架销售并展示在店铺</span><a ng-click="closeTip()" class="fr">&times;</a></div>