修改B2B合并问题

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

@@ -11,7 +11,7 @@ define(['app/app'], function (app) {
     BaseService.scrollBackToTop();
     var b2bPath = BaseService.getB2bUrl();
     // 获取当前用户是否为普通用户
-    $rootScope.active = 'vendor_material';
+    $rootScope.active = 'vendor_order';
     CurrentRole.isUser({}, {}, function (data) {
       $scope.isUser = data.isUser;
     });

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

@@ -478,6 +478,11 @@ define(['app/app'], function (app) {
             $scope.tableParams.reload();
         }
 
+        // 下载图片
+        $scope.B2bdownFile = function(id) {
+          window.location.href = BaseService.getB2bUrl() + '/file/'+id
+        }
+
         // 导出
         $scope.exportXls = function () {
             PurcInquiry.exportXls({}, {}, function (data) {

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

@@ -9,7 +9,7 @@ define(['app/app'], function (app) {
         'BaseService', 'B2bCurrentRole',
         function ($scope, $rootScope, $filter, MakeChange, ngTableParams, toaster,
             BaseService, CurrentRole) {
-          $rootScope.active = 'vendor_material';
+          $rootScope.active = 'vendor_order';
           $scope.storeType = 'makeChange'
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户

src/main/webapp/resources/view/usercenter/b2b/order/changeList.html

@@ -125,7 +125,7 @@
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
 			<li class="down-purchase">
 				<a class="tab_add" ui-sref="purc_change_new" type="button" title="新增采购变更单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
-				<span class='tab_add' ng-click="exportXls()">
+				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
 				</span>
 				<form style="display: none;" id="down-load-purchase" method="get">

src/main/webapp/resources/view/usercenter/b2b/order/outorder.html

@@ -119,7 +119,7 @@
 			<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
 			<li class="down-purchase">
-				<span class='tab_add' ng-click="exportXls()">
+				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
 				</span>
 				<form style="display: none;" id="down-load-purchase" method="get">

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -207,7 +207,7 @@
 			<li class="down-purchase">
 				<a class="tab_add" ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 				<a class="tab_add" ui-sref="purc_cart" title="购物车"><i class="fa fa-shopping-cart fa-fw"></i>购物车</a>
-				<span class='tab_add' ng-click="exportXls()">
+				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
 				</span>
 				<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -493,7 +493,7 @@
     <ul class="fl" style="width: 100%">
       <li><a ui-sref="vendorInvoice">优软商城</a></li>
       <li class="active"><a>B2B</a></li>
-      <li class="down-purchase" style="margin-right: 20px;min-width: 80px">
+      <li class="down-purchase" style="margin-right: 20px;min-width: 80px;cursor:pointer">
           <span ng-click="exportXls()">
             <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
         </span>

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

@@ -322,7 +322,7 @@
     <ul class="fl" style="width: 100%">
       <li ng-class="{'active': storeType=='sample'}"><a ui-sref="sale_sample">客户打样申请</a></li>
       <li ng-class="{'active': storeType=='approval'}"><a >客户认定单</a></li>
-      <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
+      <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;cursor:pointer"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
     </ul>
   </div>
   <div class="oder01" style="margin-bottom: 0px">

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

@@ -119,7 +119,7 @@
 				<li>
 					<a ui-sref="sale_vendorPerformanceAssess">绩效考核</a>
 				</li>
-				<li class="export">
+				<li class="export" style="cursor:pointer">
 					<a ng-click="exportXls()"><i class="fa fa-file-text fa-fw"></i>导出Excel</a>
 				</li>
 			</ul>

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

@@ -299,7 +299,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -298,7 +298,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -307,7 +307,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -294,7 +294,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -299,7 +299,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -298,7 +298,7 @@
         <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()">
+          <span ng-click="exportXls()" style="cursor:pointer">
               <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">

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

@@ -322,7 +322,7 @@
     <ul class="fl" style="width: 100%">
       <li ng-class="{'active': storeType=='sample'}"><a>客户打样申请</a></li>
       <li ng-class="{'active': storeType=='approval'}"><a ui-sref="sale_approval">客户认定单</a></li>
-      <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
+      <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;cursor:pointer"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
     </ul>
   </div>
   <div class="oder01" style="margin-bottom: 0px">

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

@@ -225,7 +225,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -623,7 +623,7 @@
 			<li ng-class="{'active': storeType=='tender'}"><a ui-sref="saleTenderList">客户招标</a></li>
 			<li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
 			<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 				<form style="display: none;" id="down-load-purchase" method="get">
@@ -814,12 +814,12 @@
 					备注：{{::inquiryItem.remark}}
 				</div>
 				<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
-					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
+					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" ng-click="B2bdownFile(attach.id)">{{::attach.name}}</a>
 				</div>
 				<div ng-if="inquiryItem.attaches.length" class="text-muted">
 					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>报价附件：
 					<div ng-repeat="attach in inquiryItem.attaches">
-						<a class="file" href="file/{{attach.id}}">{{::attach.name}}&nbsp;</a>
+						<a class="file" ng-click="B2bdownFile(attach.id)">{{::attach.name}}&nbsp;</a>
 						<a ng-show="inquiryItem.$editing" ng-click="deleteAttach(inquiryItem.attaches, $index)" title="删除附件"><i class="fa fa-trash-o fa-lg"></i></a>
 					</div>
 				</div>

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

@@ -563,7 +563,7 @@
 			<li ng-class="{'active': storeType=='tender'}"><a ui-sref="saleTenderList">客户招标</a></li>
 			<li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
 			<li class="down-purchase" style="float:right">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw" style="color:#5078cb"></i>导出Excel
                     </span>
 				<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -226,7 +226,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="downPurchase()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -1025,7 +1025,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -413,7 +413,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -193,7 +193,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -572,7 +572,7 @@
 				<a ui-sref="sale_quotation_new" title="新增主动报价单" style="color: #5078cb;"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 			</li>
 			<li class="down-purchase">
-                    <span ng-click="exportXls()" style="color:#5078cb">
+                    <span ng-click="exportXls()" style="color:#5078cb;cursor: pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 				<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -229,7 +229,7 @@
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">

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

@@ -330,7 +330,7 @@
 				<li ng-class="{'active': tab == 'undercarriage'}" ng-click="toggleActive('undercarriage')"><a href="javascript:void(0)">下架产品</a></li>
 				<li ng-class="{'active': tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="javascript:void(0)">批量发布</a></li>
 				<li class="down-goods" ng-if="tab == 'onSale'">
-                    <span ng-click="downGoods()">
+                    <span ng-click="downGoods()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-goods" method="get">

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

@@ -1245,7 +1245,7 @@
 				<li class="active"><a ui-sref="vendor_order">优软商城</a></li>
 				<li><a ui-sref="saleOrder">B2B</a></li>
 				<li class="down-purchase">
-                    <span ng-click="downPurchase()">
+                    <span ng-click="downPurchase()" style="cursor:pointer">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 					<form style="display: none;" id="down-load-purchase" method="get">