修改B2B文件下载上传问题

src/main/webapp/resources/js/common/controllers/b2bCommonCtrls.js

@@ -29,7 +29,7 @@ define([ 'app/app' ], function(app) {
     /**
      * 投标单提问
      */
-    app.controller('SaleTenderQuestionCtrl', ['$scope', 'saleTender','$modalInstance', '$upload', 'toaster', function($scope, saleTender, $modalInstance, $upload ,toaster){
+    app.controller('SaleTenderQuestionCtrl', ['BaseService', '$scope', 'saleTender','$modalInstance', '$upload', 'toaster', function(BaseService, $scope, saleTender, $modalInstance, $upload ,toaster){
         $scope.saleTender = saleTender;
 
         // 当前日期，用作新增提问
@@ -53,7 +53,7 @@ define([ 'app/app' ], function(app) {
             $scope.loading = true;
             var files = form.attachFile.$viewValue, file = files && files.length > 0 ? files[0] : null;
             $upload.upload({
-                url: 'tender/question/send/' + $scope.saleTender.id,
+                url: BaseService.getB2bUrl() + '/tender/question/send/' + $scope.saleTender.id,
                 method: 'POST',
                 file: file,
                 data: {
@@ -328,13 +328,13 @@ define([ 'app/app' ], function(app) {
     /**
      * 代采订单批量导入
      */
-    app.controller('DeputyOrderUploadCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', function ($scope, toaster, $upload, $modalInstance) {
+    app.controller('DeputyOrderUploadCtrl', ['BaseService', '$scope', 'toaster', '$upload', '$modalInstance', function (BaseService, $scope, toaster, $upload, $modalInstance) {
         // 通过excel批量上传物料
         $scope.result = null;
         $scope.upload = function () {
             var file = $scope.myFiles[0];
             $upload.upload({
-                url: 'deputyOrder/release/excel',
+                url:BaseService.getB2bUrl() +  '/deputyOrder/release/excel',
                 file: file,
                 method: 'POST'
             }).success(function (data) {

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

@@ -1,6 +1,6 @@
 define(['app/app'], function(app) {
   // 询价单明细（发出）
-  app.register.controller('PurcInquiryInfoDetailCtrl', ['$rootScope', '$scope', '$stateParams', 'B2bPurchaseInquiry', '$filter', 'toaster', 'B2bCurrentRole', function ($rootScope, $scope, $stateParams, PurchaseInquiry, $filter, toaster, CurrentRole) {
+  app.register.controller('PurcInquiryInfoDetailCtrl', ['BaseService', '$rootScope', '$scope', '$stateParams', 'B2bPurchaseInquiry', '$filter', 'toaster', 'B2bCurrentRole', function (BaseService, $rootScope, $scope, $stateParams, PurchaseInquiry, $filter, toaster, CurrentRole) {
     // 获取当前用户是否为普通用户
     $rootScope.active = 'purc_haseinquiry'
     CurrentRole.isUser({}, {}, function (data) {
@@ -80,6 +80,10 @@ define(['app/app'], function(app) {
       }
     };
 
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
+
     // 采纳
     $scope.accept = function (id) {
       PurchaseInquiry.accept({id: id}, {}, function (data) {

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

@@ -51,7 +51,9 @@ define(['app/app'], function(app) {
         }
       }
     }
-
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
     var getService = function () {
       return PurchaseInquiry;
     };

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

@@ -14,6 +14,7 @@ define(['app/app'], function(app) {
     var getService = function () {
       return $scope.searchMethod ? PurcProduct : PurcProductNewest;
     };
+    $rootScope.active = 'buyer_tender'
 
     // 物料信息
     $scope.tableParams = new ngTableParams({
@@ -43,6 +44,10 @@ define(['app/app'], function(app) {
       }
     });
 
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/'+ id
+    }
+
     // 搜索框回车
     $scope.onSearch = function (keyword) {
       // 每次搜索重置获取数据方法
@@ -468,7 +473,7 @@ define(['app/app'], function(app) {
     $scope.upload = function (myFile) {  // 上传附件
       var file = $scope.myFile, file = file && file.length > 0 ? file : null;
       $upload.upload({
-        url: 'tender/addTenderAttach',
+        url: BaseService.getB2bUrl() + '/tender/addTenderAttach',
         file: file,
         method: 'POST'
       }).success(function (attach) {
@@ -913,13 +918,13 @@ define(['app/app'], function(app) {
   /**
    * 招标单批量导入
    */
-  app.register.controller('PurcTenderUploadCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', function ($scope, toaster, $upload, $modalInstance) {
+  app.register.controller('PurcTenderUploadCtrl', ['BaseService', '$scope', 'toaster', '$upload', '$modalInstance', function (BaseService, $scope, toaster, $upload, $modalInstance) {
     // 通过excel批量上传物料
     $scope.result = null;
     $scope.upload = function () {
       var file = $scope.myFiles[0];
       $upload.upload({
-        url: 'tender/release/excel',
+        url: BaseService.getB2bUrl() + '/tender/release/excel',
         file: file,
         method: 'POST'
       }).success(function (data) {
@@ -947,7 +952,7 @@ define(['app/app'], function(app) {
 
     // 下载模板
     $scope.download = function () {
-      window.location.href = 'tender/upload/template';
+      window.location.href = BaseService.getB2bUrl() + '/tender/upload/template';
     };
 
     $scope.enSure = function () {

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

@@ -24,6 +24,9 @@ define(['app/app'], function(app) {
       };
       loadData();
 
+      $scope.downFile = function(id) {
+        window.location.href = BaseService.getB2bUrl() + '/file/' + id
+      }
       // 回答
       $scope.sendAnswer = function (){
         angular.element('body').css({
@@ -53,7 +56,7 @@ define(['app/app'], function(app) {
   /**
    * 招标单答疑
    */
-  app.register.controller('PurcTenderAnswerCtrl', ['$scope', 'answer','$modalInstance', '$upload', 'toaster', function($scope, answer, $modalInstance, $upload ,toaster){
+  app.register.controller('PurcTenderAnswerCtrl', ['$scope','BaseService', 'answer','$modalInstance', '$upload', 'toaster', function(BaseService,$scope, answer, $modalInstance, $upload ,toaster){
     $scope.answer = answer;
 
     $scope.cancel = function() {
@@ -65,7 +68,7 @@ define(['app/app'], function(app) {
       $scope.loading = true;
       var files = form.attachFile.$viewValue, file = files && files.length > 0 ? files[0] : null;
       $upload.upload({
-        url: 'tender/question/answer/send',
+        url: BaseService.getB2bUrl() + '/tender/question/answer/send',
         method: 'POST',
         file: file,
         data: {
@@ -79,6 +82,9 @@ define(['app/app'], function(app) {
         toaster.pop('error', '错误', '出现异常，答疑失败');
       });
     };
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
   }]);
 
 })

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

@@ -26,6 +26,9 @@ define(['app/app'], function (app) {
     };
     evaluation();
 
+    $scope.downFile = function(id){
+      window.location.href = BaseService.getB2bUrl()  + '/file/' + id
+    }
 
     $scope.orderType = '';
     // $scope.dir = '-';

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

@@ -14,6 +14,10 @@ define(['app/app'], function (app) {
       toaster.pop('error', '数据加载失败', response.data);
     });
 
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
+
   }]);
 
 })

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

@@ -6,6 +6,9 @@ define(['app/app'], function (app) {
       CurrentRole.isUser({}, {}, function (data) {
           $scope.isUser = data.isUser;
       });
+      $scope.downFile = function(id) {
+          window.location.href = BaseService.getB2bUrl() + '/file/' + id
+      }
 
       var loadData = function () {
           PurcInquiry.getAll({id: $stateParams.id}, function (data) {

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

@@ -1,10 +1,11 @@
 // 客户模具询价单
 define(['app/app'], function (app) {
-  app.register.controller('saleInquiryMouldDetailCtrl', ['BaseService', '$scope', '$stateParams', 'B2bPurcInquiryMould', '$filter', 'toaster', '$upload', 'B2bCurrentRole', function (BaseService, $scope, $stateParams, PurcInquiryMould, $filter, toaster, $upload, CurrentRole) {
+  app.register.controller('saleInquiryMouldDetailCtrl', ['$rootScope','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;
       });
+    $rootScope.active = 'vendor_seek_purchase'
       var inquiryMould_copy = {};
       var loadData = function () {
           PurcInquiryMould.getAll({id: $stateParams.id}, function (data) {
@@ -111,7 +112,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: BaseService.getB2bUrl() +'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

@@ -108,6 +108,10 @@ define(['app/app'], function (app) {
       $scope.tableParams.reload();
     };
 
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
+
     // 导出
     $scope.exportXls = function () {
       PurcApproval.exportXls({}, {}, function (data) {

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

@@ -46,7 +46,7 @@ define(['app/app'], function (app) {
 
         //是否不能被点击
         $scope.isDisabled = function () {
-            return $scope.item.quotation.status == 101 && $scope.item.agreed == null;
+            return $scope.item && $scope.item.quotation &&  $scope.item.quotation.status == 101 && $scope.item.agreed == null;
         }
 
         $scope.openDatePicker = function ($event, openParam) {

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

@@ -49,7 +49,7 @@ define(['app/app'], function (app) {
         $scope.upload = function (myFile) {  // 上传附件
             var file = $scope.myFile, file = file && file.length > 0 ? file : null;
             $upload.upload({
-                url: 'tender/addTenderItemAttach',
+                url: BaseService.getB2bUrl() + '/tender/addTenderItemAttach',
                 file: file,
                 method: 'POST'
             }).success(function (attach) {
@@ -61,6 +61,10 @@ define(['app/app'], function (app) {
             $scope.attaches.splice(index, 1);
         };
 
+        $scope.downFile = function(id) {
+            window.location.href = BaseService.getB2bUrl() + '/file/' + id
+        }
+
         var taxrateYes = false;
         var cycleYes = false;
         var priceYes = false;

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

@@ -52,6 +52,9 @@ define(['app/app'], function (app) {
           $scope.tableParams.page(1);
       }
     };
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
 
     $scope.searchMethod = false;
     var getService = function () {
@@ -336,7 +339,7 @@ define(['app/app'], function (app) {
       $scope.sampleItem.sendQty = $scope.sampleItem.sampleSend.sendQty; // 判断是否需要多次送样
       var files = form.attachFile.$viewValue, file = files && files.length > 0 ? files[0] : null;
       $upload.upload({
-        url: b2bUrl + 'sale/sample/' + $scope.sampleItem.id + '/send',
+        url: b2bUrl + '/sale/sample/' + $scope.sampleItem.id + '/send',
         method: 'POST',
         file: file,
         data: {

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

@@ -6,6 +6,9 @@ define(['app/app'], function (app) {
     CurrentRole.isUser({}, {}, function (data) {
       $scope.isUser = data.isUser;
     });
+    $scope.downFile = function(id) {
+      window.location.href = BaseService.getB2bUrl() + '/file/' + id
+    }
     var loading = true;
     var loadData = function () {
       PurcSample.getItem({id: $stateParams.id}, function (data) {
@@ -77,7 +80,7 @@ define(['app/app'], function (app) {
       $scope.sampleItem.sendQty = $scope.sampleItem.sampleSend.sendQty; // 判断是否需要多次送样
       var files = form.attachFile.$viewValue, file = files && files.length > 0 ? files[0] : null;
       $upload.upload({
-        url: b2bUrl + 'sale/sample/' + $scope.sampleItem.id + '/send',
+        url: b2bUrl + '/sale/sample/' + $scope.sampleItem.id + '/send',
         method: 'POST',
         file: file,
         data: {

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

@@ -26,5 +26,8 @@ define(['app/app'], function (app) {
             };
             loadData();
 
+            $scope.downFile = function(id) {
+                window.location.href = BaseService.getB2bUrl() + '/file/' + id
+            }
         }]);
 });

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

@@ -648,7 +648,7 @@
           </div>
           <div class="col-xs-12" style="margin-bottom: 5px">
             <div class="bid-desc">附件：</div>
-            <div class="unchanged-info"><a class="file" ng-repeat="attach in inquiry.attachs" href="file/{{attach.id}}"><span ng-bind="attach.name != null ? attach.name : '无'"></span></a></div>
+            <div class="unchanged-info"><a class="file" ng-click="downFile(attach.id)" ng-repeat="attach in inquiry.attachs"><span ng-bind="attach.name != null ? attach.name : '无'"></span></a></div>
           </div>
         </div>
         <div class="title-div" style="margin-bottom: 20px">

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

@@ -372,11 +372,12 @@
     .tender-list02 dl dt span {
         height: 40px;
         line-height: 40px;
-        display: inline-block;
+        /*display: inline-block;*/
         color: #323232;
+        float:left;
         width: 13.45%;
         border-bottom: #e8e8e8 1px solid;
-        text-align: left;
+        text-align: center;
     }
 
     .tender-list02 dl dd {
@@ -1113,8 +1114,9 @@
                                                                                     ng-click="openDatePicker($event, prod.$toDateOpen, $index)"></span>
                                             <span class="wid03"><a ng-click="del($index)"><i class="fa fa-close"></i></a></span>
                                         </dd>
+                                        <div ng-if="inquiry.inquiryItems.length == 0" class="no-record" style="line-height:100px;text-align: center;border-bottom: 1px solid #e8e8e8;font-size: 14px;">暂无产品信息！</div>
                                     </div>
-                                    <div ng-if="inquiry.inquiryItems.length == 0" class="no-record">暂无产品信息！</div>
+
                                 </dl>
                             </div>
                         </div>

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

@@ -862,7 +862,7 @@
           物料规格：{{::inquiryItem.product.spec || inquiryItem.spec}}
         </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="downFile(attach.id)">{{::attach.name}}</a>
         </div>
         <div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
           品牌：<spans ng-bind="::inquiryItem.brand"></spans>

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

@@ -158,7 +158,7 @@
     font-size: 12px;
   }
   .tender-content>div>div.btn-save>button{
-    background: #5078cb;
+    /*background: #5078cb;*/
   }
   .purc-tender .date-picker span .btn-open {
     color: #fff;
@@ -291,12 +291,12 @@
     width: 94px;
     height: 36px;
     font-size: 14px;
-    color: #fff;
+    /*color: #fff;*/
     border-radius: 0;
   }
 
   .tender-content>div>div.btn-publish>button {
-    background-color: #5078cb;
+    /*background-color: #5078cb;*/
   }
 
 
@@ -1086,9 +1086,8 @@
             <div class="tender-desc">上传招标文件：</div>
             <div class="fileInputContainer">
               <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFile" ng-change="upload(myFile)" />
-              <!-- href="file/{{attach.id}}" -->
               <div class="attach-file" ng-repeat="attach in attaches">
-                <a style="color: #5078cb;" href="file/{{attach.id}}">{{::attach.name}}</a>&nbsp;&nbsp;
+                <a style="color: #5078cb;"  ng-click="downFile(attach.id)">{{::attach.name}}</a>&nbsp;&nbsp;
                 <a ng-click="removeAttach(attach.id, $index)" title="删除"><i class="fa fa-trash-o fa-lg"></i></a>
               </div>
             </div>
@@ -1226,22 +1225,22 @@
         </div>
         <div ng-show="!isSave" style="padding: 30px; border-top: 1px solid #5078cb;margin-top:20px;">
           <div class="pull-right btn-publish" style="margin-right: 15px">
-            <button class="btn" ng-disabled="tenderForm.$invalid" ng-click="save(true)" style="opacity: 1;color: #ffffff;">发布</button>
+            <button class="btn btn-publish2"  ng-click="save(true)">发布</button>
           </div>
           <div class="pull-right btn-save" style="margin-right: 15px">
-            <button class="btn" ng-disabled="tenderForm.$invalid" ng-click="save(false)" style="opacity: 1;background: #fff;border:1px solid #5078cb;color:#5078cb">保存</button>
+            <button class="btn btn-save2" ng-click="save(false)">保存</button>
           </div>
           <div style="clear:both"></div>
         </div>
         <div ng-show="isSave" style="padding: 30px;border-top: 1px solid #5078cb;">
           <div class="pull-right btn-publish" style="margin-right: 15px">
-            <button class="btn" ng-click="updateSaved(true)" style="opacity: 1;color: #ffffff;">发布</button>
+            <button class="btn btn-publish2" ng-click="updateSaved(true)" style="opacity: 1;color: #ffffff;">发布</button>
           </div>
-          <div class="pull-right btn-save" style="margin-right: 15px">
-            <button class="btn" ng-click="updateSaved(false)" style="opacity: 1;background: #fff;border:1px solid #5078cb;color:#5078cb">更新</button>
+          <div class="pull-right btn-save " style="margin-right: 15px">
+            <button class="btn btn-save2" ng-click="updateSaved(false)" style="">更新</button>
           </div>
           <div class="pull-right btn-delete" style="margin-right: 15px">
-            <button class="btn btn-danger" ng-click="deleteThis(tender.id)" style="opacity: 1;color: red;border:1px solid red;background:#fff;">删除</button>
+            <button class="btn btn-danger btn-danger2" ng-click="deleteThis(tender.id)" style="">删除</button>
           </div>
           <div style="clear:both"></div>
         </div>
@@ -1424,11 +1423,36 @@
   })
 </script>
 <style>
+  .btn-danger2 {
+    opacity: 1;color: red;border:1px solid red;background:#fff;
+  }
+  .btn-save2 {
+    opacity: 1;background: #fff;border:1px solid #5078cb;color:#5078cb;
+  }
+  .btn-publish2 {
+    color: #fff;
+    background: #5078cb;
+  }
+  .btn-publish2:hover {
+    background: #67afe4;
+    border: 1px solid #67afe4;
+  color: #fff
+  }
+  .btn-save2:hover {
+    background: #5078cb;
+    border: 1px solid #5078cb;
+    color: #fff
+  }
+  .btn-danger2:hover {
+    background:#ff4545;
+    border: 1px solid #ff4545;
+    color: #fff
+  }
   .pro-add-data02 {
     width: 100%;
     margin: 0 auto;
     background: #fff;
-    margin-top: 20px;
+    /*margin-top: 20px;*/
   }
   .pro-search {
     width: 100%;

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

@@ -79,7 +79,7 @@
 		<div class="row" ng-if="answer.answerAttaches.length > 0">
 			<label class="col-md-4 col-sm-4 col">原回复文件：</label>
 			<div class="col-md-8 col-sm-8 col">
-				<a ng-repeat="attach in answer.answerAttaches" href="_blank" class="" style="padding-left: 0; color: #5078cb;" href="file/{{attach.id}}">
+				<a ng-repeat="attach in answer.answerAttaches" href="_blank" class="" style="padding-left: 0; color: #5078cb;" ng-click="downFile(attach.id)">
 					{{::attach.name}}
 				</a>
 			</div>

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

@@ -432,7 +432,7 @@
           <div class = "col-xs-4" ng-if="answer.answerAttaches.length > 0">
             <div class="bid-desc">答疑附件：</div>
             <div class="unchanged-info">
-              <a ng-repeat="attach in answer.answerAttaches" class="" style="padding-left: 0; color: #5078cb;" href="file/{{attach.id}}">
+              <a ng-repeat="attach in answer.answerAttaches" class="" style="padding-left: 0; color: #5078cb;" ng-click="downFile(attach.id)">
                 {{::attach.name}}
               </a>
             </div>
@@ -462,7 +462,7 @@
                   <span class="wid01">{{question.vendor.enName}}</span>
                   <span>{{question.inDate | date: 'yyyy-MM-dd'}}</span>
                   <span class="wid01" ng-show="question.questionAttaches.length > 0">
-                                        <p  style="text-align: center;"><a ng-repeat="attach in question.questionAttaches" class="" style="padding-left: 0; color: #5078cb;" href="file/{{attach.id}}">
+                                        <p  style="text-align: center;"><a ng-repeat="attach in question.questionAttaches" class="" style="padding-left: 0; color: #5078cb;"  ng-click="downFile(attach.id)">
                                             {{::attach.name}}
                                         </a></p>
                                     </span>

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

@@ -469,7 +469,7 @@
           <div ng-if="tender.tenderAttaches.length > 0" class="col-xs-12">
             <span class="bid-desc">招标附件：</span>
             <div ng-repeat="attach in tender.tenderAttaches">
-              <a class="col-xs-10" style="color: #5078cb;padding-left: 0px" href="file/{{attach.id}}">{{::attach.name}}</a>
+              <a class="col-xs-10" style="color: #5078cb;padding-left: 0px" ng-click="downFile(attach.id)">{{::attach.name}}</a>
             </div>
           </div>
         </div>

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

@@ -449,7 +449,7 @@
             <div class="unchanged-info">{{tender.certificate}}</div>
           </div>
           <div ng-if="tender.tenderAttaches.length" class="col-xs-8" style="height: 50px;color: #969595">
-            招标附件：<a class="file" style="color: #5078cb;" ng-repeat="attach in tender.tenderAttaches" href="file/{{attach.id}}">{{::attach.name}}</a>
+            招标附件：<a class="file" style="color: #5078cb;" ng-repeat="attach in tender.tenderAttaches" ng-click="downFile(attach.id)">{{::attach.name}}</a>
           </div>
         </div>
         </div>
@@ -494,7 +494,7 @@
         <div style="min-height: 150px;border-bottom: 2px solid #f5f5f5" ng-if="saleTender.bidAttaches.length">
           <div class="bid-desc" style="margin-left: 20px; float: left;">投标附件：</div>
           <div class="col-xs-8" style="height: 50px;">
-            <a class="file" ng-repeat="attach in saleTender.bidAttaches" href="file/{{attach.id}}">{{::attach.name}}</a>
+            <a class="file" ng-repeat="attach in saleTender.bidAttaches"  ng-click="downFile(attach.id)">{{::attach.name}}</a>
           </div>
 
         </div>

src/main/webapp/resources/view/usercenter/b2b/modal/product_brandChoose_modal.html

@@ -18,6 +18,9 @@ table tr .br-select {
 table tr:hover .br-select {
 	display: inline-block;
 }
+	.btn-warning:hover {
+		border: 1px solid #5078cb
+	}
 </style>
 <!-- 品牌选择模态框 -->
 <div class="modal-header">

src/main/webapp/resources/view/usercenter/b2b/modal/product_kindChoose_modal.html

@@ -418,3 +418,14 @@
 		ng-disabled="!active.isLeaf" ng-click="check()">确认</button>
 	<button class="b2b-btn b2b-btn-cancel" ng-click="cancel()" type="button">取消</button>
 </div>
+
+<style>
+	.b2b-btn-submit:hover {
+		background: #67afe4;
+		border: 1px solid #67afe4
+	}
+	.b2b-btn-cancel:hover {
+		background: #717171;
+		border: 1px solid #717171
+	}
+</style>

src/main/webapp/resources/view/usercenter/b2b/modal/tender_vendor.html

@@ -114,6 +114,20 @@
     </table>
 </div>
 <div class="modal-footer">
-    <button class="btn" style="border-radius: 0;background: #5078cb;color: #fff;width: 80px" ng-click="close()" type="button">确认</button>
-    <button class="btn" style="border-radius: 0;background: #969595;color:#fff;border:1px solid #969595;width: 80px" ng-click="cancel()" type="button">取消</button>
+    <button class="btn save" style="" ng-click="close()" type="button">确认</button>
+    <button class="btn cancel" style="" ng-click="cancel()" type="button">取消</button>
 </div>
+<style>
+    .save {
+        border-radius: 0;background: #5078cb;color: #fff;width: 80px
+    }
+    .save:hover {
+        background: #67afe4;
+    }
+    .cancel {
+        border-radius: 0;background: #969595;color:#fff;border:1px solid #969595;width: 80px
+    }
+    .cancel:hover {
+        background: #717171;
+    }
+</style>

src/main/webapp/resources/view/usercenter/b2b/modal/uplodaByBatch.html

@@ -77,5 +77,14 @@
 		</div>
 	</div>
 </div>
-
+<style>
+	.b2b-btn-submit:hover {
+		background: #67afe4;
+		border: 1px solid #67afe4
+	}
+	.b2b-btn-cancel:hover {
+		background: #717171;
+		border: 1px solid #717171
+	}
+</style>
 <!-- block end -->

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

@@ -306,7 +306,7 @@
             <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="downFile(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/approval.html

@@ -470,7 +470,7 @@
           <div class="col-xs-8" ng-if="approval.attachs == 0">无</div>
           <div class="col-xs-8 file" ng-repeat="attach in approval.attachs"
                ng-if="approval.attachs.length > 0">
-            <a href="file/{{attach.id}}" ng-bind="::attach.name"></a>
+            <a ng-bind="::attach.name" ng-click="downFile(attach.id)"></a>
           </div>
         </div>
         <div ng-if="approval.finalresultremark">
@@ -508,7 +508,7 @@
                 <span ng-if="approval.prdremark">描述：{{::approval.prdremark}}&nbsp;&nbsp;</span>
                 附件：<span ng-if="approval.prdAttachs.length == 0">无</span> <span
                   ng-repeat="attach in approval.prdAttachs"><a
-                  class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+                  class="file"  ng-bind="::attach.name" ng-click="downFile(attach.id)"></a>&nbsp;&nbsp;</span>
               </div>
             </div>
           </li>
@@ -528,7 +528,7 @@
                 <span ng-if="approval.padremark">描述：{{::approval.padremark}}&nbsp;&nbsp;</span>
                 附件：<span ng-if="approval.padAttachs.length == 0">无</span> <span
                   ng-repeat="attach in approval.padAttachs"><a
-                  class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+                  class="file"  ng-bind="::attach.name" ng-click="downFile(attach.id)"></a>&nbsp;&nbsp;</span>
               </div>
             </div>
           </li>
@@ -548,7 +548,7 @@
                 <span ng-if="approval.ppdremark">描述：{{::approval.ppdremark}}&nbsp;&nbsp;</span>
                 附件：<span ng-if="approval.ppdAttachs.length == 0">无</span> <span
                   ng-repeat="attach in approval.ppdAttachs"><a
-                  class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
+                  class="file" ng-click="downFile(attach.id)" ng-bind="::attach.name"></a>&nbsp;&nbsp;</span>
               </div>
             </div>
           </li>

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

@@ -311,11 +311,20 @@
 		margin-right: 0;
 	}
 	.quot-new .text-simple {
-		background: #e5e4e4;
+		background: #5078cb;
 		width: 38px !important;
 		height: 34px !important;
-		border: 1px solid #ccc;
+		border: 1px solid #5078cb;
 		border-radius: 0 2px 2px 0;
+		color: #fff;
+	}
+	.b2b-btn-submit:hover {
+		background: #67afe4;
+		border: 1px solid #67afe4;
+	}
+	.b2b-btn-cancel:hover {
+		background: #717171;
+		border: 1px solid #717171
 	}
 </style>
 <div class="user_right fr quot-new">

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

@@ -686,9 +686,9 @@
           <div class="bid-desc" style="margin-left: 20px;">投标附件：</div>
           <div class="fileInputContainer">
             <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFile" ng-change="upload(myFile)" />
-            <!-- href="file/{{attach.id}}" -->
+
             <div class="attach-file" ng-repeat="attach in attaches">
-              <a style="color: #5078cb;" href="file/{{attach.id}}">{{::attach.name}}</a>&nbsp;&nbsp;
+              <a style="color: #5078cb;" ng-click="downFile(attach.id)">{{::attach.name}}</a>&nbsp;&nbsp;
               <a ng-click="removeAttach(attach.id, $index, tender.id)" title="删除"><i class="fa fa-trash-o fa-lg"></i></a>
             </div>
           </div>
@@ -698,7 +698,7 @@
           <div class="bid-desc" style="margin-left: 20px;">投标附件：</div>
           <div class="">
             <div ng-repeat="attach in attaches">
-              <a class="attach-file" style="color: #5078cb;" href="file/{{attach.id}}">{{::attach.name}}</a>
+              <a class="attach-file" style="color: #5078cb;" ng-click="downFile(attach.id)">{{::attach.name}}</a>
             </div>
           </div>
         </div>

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

@@ -276,7 +276,7 @@
           </div>
           <div ng-if="question.questionAttaches.length" class="col-xs-12">
             <span class="bid-desc">提问附件：</span>
-            <a ng-repeat="attach in question.questionAttaches" class="" style="padding-left: 0; color: #5078cb;" href="file/{{attach.id}}">
+            <a ng-repeat="attach in question.questionAttaches" class="" style="padding-left: 0; color: #5078cb;" ng-click="downFile(attach.id)">
               {{::attach.name}}
             </a>
           </div>
@@ -307,7 +307,7 @@
           </div>
           <div class = "col-xs-12">
             <div class="bid-desc">附件：</div>
-            <a ng-repeat="attach in question.saleTenderAnswer.answerAttaches" class="" style="padding-left: 0; color: #5078cb;" href="file/{{attach.id}}">
+            <a ng-repeat="attach in question.saleTenderAnswer.answerAttaches" class="" style="padding-left: 0; color: #5078cb;"  ng-click="downFile(attach.id)">
               {{::attach.name}}
             </a>
           </div>

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

@@ -463,7 +463,7 @@
         </div>
         <div ng-if="sample.proofing.attachs.length > 0">
           <div ng-repeat="attach in sample.proofing.attachs">
-            <i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>
+            <i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-click="downFile(attach.id)"  ng-bind="::attach.name"></a>
           </div>
         </div>
       </td>
@@ -518,7 +518,7 @@
                   <div class="row row-sm" ng-if="send.attachs.length > 0">
                     <div class="col-xs-3">附件：</div>
                     <div class="col-xs-9">
-                      <div ng-repeat="attach in send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></div>
+                      <div ng-repeat="attach in send.attachs"><a ng-click="downFile(attach.id)" class="file">{{attach.name}}</a></div>
                     </div>
                   </div>
                 </li>

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

@@ -337,7 +337,7 @@
             <div ng-if="send.addressMark">产地标识：<span ng-bind="send.addressMark"></span></div>
             <div ng-if="send.ratio">口水料比例：<span ng-bind="send.ratio"></span>%</div>
             <div ng-if="send.attachs.length > 0">
-              附件：<span ng-repeat="attach in send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></span>
+              附件：<span ng-repeat="attach in send.attachs"><a ng-click="downFile(attach.id)" class="file">{{attach.name}}</a></span>
             </div>
             <!--<div class="row row-sm" ng-if="send.attachs.length > 0">
               <div class="col-xs-4">附件：</div>