Browse Source

处理BUG

wangcz 7 years ago
parent
commit
d082a66b0f
34 changed files with 76 additions and 127 deletions
  1. 4 1
      src/main/webapp/resources/css/b2bCommon.css
  2. 1 1
      src/main/webapp/resources/css/common.css
  3. BIN
      src/main/webapp/resources/img/logo/youruanrenzheng.png
  4. 1 1
      src/main/webapp/resources/js/common/b2bServices.js
  5. 6 6
      src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js
  6. 4 3
      src/main/webapp/resources/js/vendor/controllers/b2b/apCheckList.js
  7. 2 5
      src/main/webapp/resources/js/vendor/controllers/b2b/apCheck_detail.js
  8. 3 0
      src/main/webapp/resources/view/sso/b2b/log.html
  9. 0 23
      src/main/webapp/resources/view/sso/staffManagement.html
  10. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/inquiry_unapply.html
  11. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html
  12. 5 5
      src/main/webapp/resources/view/usercenter/b2b/Purc/purcinquiry_new.html
  13. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/tender_answer_list.html
  14. 2 2
      src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html
  15. 2 2
      src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html
  16. 1 1
      src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html
  17. 2 2
      src/main/webapp/resources/view/vendor/b2b/apBill.html
  18. 2 2
      src/main/webapp/resources/view/vendor/b2b/apCheck.html
  19. 1 1
      src/main/webapp/resources/view/vendor/b2b/apCheckList.html
  20. 2 3
      src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_details.html
  21. 3 4
      src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html
  22. 3 4
      src/main/webapp/resources/view/vendor/b2b/sale/sale_badIn.html
  23. 3 29
      src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html
  24. 3 4
      src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html
  25. 3 4
      src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html
  26. 3 4
      src/main/webapp/resources/view/vendor/b2b/sale/sale_returns.html
  27. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html
  28. 3 3
      src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html
  29. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html
  30. 1 1
      src/main/webapp/resources/view/vendor/b2b/sale_send.html
  31. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html
  32. 2 2
      src/main/webapp/resources/view/vendor/b2b/sale_tender_question_list.html
  33. 1 1
      src/main/webapp/resources/view/vendor/forstore/messagePersonal.html
  34. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

+ 4 - 1
src/main/webapp/resources/css/b2bCommon.css

@@ -1,3 +1,6 @@
+a.order-detail {
+    color: #3f84f6!important;
+}
 /** 页面头部  **/
 #b2b-box{
     box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
@@ -541,4 +544,4 @@ table.b2b-modal-table > tbody > tr > td {
 }
 #empty_info .empty_explain .info p{
     line-height: 20px;
-}
+}

+ 1 - 1
src/main/webapp/resources/css/common.css

@@ -1439,7 +1439,7 @@ i.must {
 	color: #fff !important;
 }
 .com_tab:nth-of-type(1) ul li::after{
-	background: url('../../img/vendor/images/downicon.png');
+	background: url('../img/vendor/images/downicon.png');
 	width: 11px;
 	height: 6px;
 	position: absolute;

BIN
src/main/webapp/resources/img/logo/youruanrenzheng.png


+ 1 - 1
src/main/webapp/resources/js/common/b2bServices.js

@@ -815,7 +815,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
               method: 'POST'
             },
             printPermission:{
-              url: b2bPath + 'sale/notice/sends/print/permission',
+              url: b2bPath + '/sale/notice/sends/print/permission',
               method: 'POST'
             },
             generateBarcodes :{

+ 6 - 6
src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js

@@ -360,20 +360,20 @@ define(['app/app'], function(app) {
                     if ($scope.inquiry.isOpen == 0) { // 指定询价
                         if ($scope.vendors.length > 0) {
                             $upload.upload({
-                                url: 'purc/inquiry/save/withVendor',
+                                url: BaseService.getB2bUrl() + '/purc/inquiry/save/withVendor',
                                 file: file,
                                 method: 'POST',
                                 data: {
                                     inquiry: $scope.inquiry,
                                     contacts: $scope.vendors
-                                },
+                                }
                             }).success(function (data) {
                                 $scope.loading = false;
                                 if (data.success) {
                                     toaster.pop('success', '提示', data.success);
                                     $timeout(function () {
                                         $rootScope.active = 'todo';
-                                        window.location.hash = "#/purc/inquiry_unapply";
+                                        window.location.hash = "#/inquiry_unapply";
                                     }, 500);
                                 }
                                 if (data.error) {
@@ -392,7 +392,7 @@ define(['app/app'], function(app) {
                         }
                     } else {
                         $upload.upload({
-                            url: 'purc/inquiry/save/withoutVendor',
+                            url: BaseService.getB2bUrl() + '/purc/inquiry/save/withoutVendor',
                             file: file,
                             method: 'POST',
                             data: {
@@ -442,7 +442,7 @@ define(['app/app'], function(app) {
                     if ($scope.inquiry.isOpen == 0) { // 指定询价
                         if ($scope.vendors.length > 0) {
                             $upload.upload({
-                                url: 'purc/inquiry/submit/withVendor',
+                                url: BaseService.getB2bUrl() + '/purc/inquiry/submit/withVendor',
                                 file: file,
                                 method: 'POST',
                                 data: {
@@ -473,7 +473,7 @@ define(['app/app'], function(app) {
                         }
                     } else {
                         $upload.upload({
-                            url: 'purc/inquiry/submit/withoutVendor',
+                            url: BaseService.getB2bUrl() + '/purc/inquiry/submit/withoutVendor',
                             file: file,
                             method: 'POST',
                             data: {

+ 4 - 3
src/main/webapp/resources/js/vendor/controllers/b2b/apCheckList.js

@@ -1,6 +1,7 @@
 define(['app/app'], function (app) {
   //未对账单据列表
-  app.register.controller('PurchaseApCheckListCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'toaster', '$state', '$filter', '$modal', 'B2bVendor', 'B2bDecimalNumber', function ($rootScope, $scope, FaApCheck, toaster, $state, $filter, $modal, Vendor, DecimalNumber) {
+  app.register.controller('PurchaseApCheckListCtrl', ['$rootScope', '$scope', 'BaseService', 'B2bFaApCheck', 'toaster', '$state', '$filter', '$modal', 'B2bVendor', 'B2bDecimalNumber',
+      function ($rootScope, $scope, BaseService, FaApCheck, toaster, $state, $filter, $modal, Vendor, DecimalNumber) {
     $scope.data = [];// 列表数据
     $rootScope.active = 'vendor_pay_center';
     $scope.condition = {
@@ -154,7 +155,7 @@ define(['app/app'], function (app) {
       if (angular.isDefined($scope.taxRate)) {
         url = url + '&receiveName=' + $scope.taxRate;
       }
-      window.location.href = url;
+      window.location.href = BaseService.getB2bUrl() + url;
     }
 
     /**
@@ -368,7 +369,7 @@ define(['app/app'], function (app) {
         FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
           $scope.loading = false;
           toaster.pop('success', '成功', '生成应收对账成功');
-          $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
+          $state.go('fa_apCheck_detail', {id: data.id}, {reload: true});
         }, function (response) {
           $scope.loading = false;
           toaster.pop('error', '生成对账单失败', response.data);

+ 2 - 5
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck_detail.js

@@ -35,7 +35,7 @@ define(['app/app'], function (app) {
         if (data.result) {
           toaster.pop('success', '提示', '提交成功');
           $scope.haveSelected = false;
-          window.location.href = '#/fa/apCheck';
+          window.location.href = '#/apCheck';
         } else {
           $scope.haveSource = true;
           loadData();
@@ -81,7 +81,7 @@ define(['app/app'], function (app) {
       });
       $scope.haveSelected = false;
 
-    }
+    };
 
     //作废应收对账单
     $scope.cancelApCheck = function (check) {
@@ -98,9 +98,6 @@ define(['app/app'], function (app) {
         $scope.loading = false;
         toaster.pop('error', '作废失败', response.data);
       });
-
     }
-
   }]);
-
 })

+ 3 - 0
src/main/webapp/resources/view/sso/b2b/log.html

@@ -50,11 +50,14 @@
 		font-weight: bold;
 	}
 	.operate-log .b2b-modal-table {
+		table-layout:fixed;
 		width: 1000px;
 		margin: 14px auto;
 	}
 	.operate-log .b2b-modal-table > tbody > tr > td {
 		line-height: inherit;
+		word-break:break-all;
+		word-wrap: break-word;
 	}
 </style>
 <div class="user_right fr operate-log">

+ 0 - 23
src/main/webapp/resources/view/sso/staffManagement.html

@@ -775,29 +775,6 @@
   .white {
     background-color: white;
   }
-  .com_tab ul li{
-    margin-left: 0px;
-    position: relative;
-  }
-  .com_tab ul li.active a{
-    border-bottom: #fff;
-    background: #5078cb;
-    color: #fff;
-  }
-  .com_tab ul li::after{
-    background: url('static/img/vendor/images/downicon.png');
-    width: 11px;
-    height: 6px;
-    position: absolute;
-    bottom: 0px;
-    left: 50%;
-    content: ' ';
-    margin-left: -5px;
-    display: none;
-  }
-  .com_tab ul li.active:after{
-    display: block
-  }
 </style>
 
 <style>

+ 2 - 2
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;
@@ -325,7 +325,7 @@
     display: none;
   }
   .com_tab 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;

+ 2 - 2
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;
@@ -343,7 +343,7 @@
     display: none;
   }
   .com_tab 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;

+ 5 - 5
src/main/webapp/resources/view/usercenter/b2b/Purc/purcinquiry_new.html

@@ -943,11 +943,11 @@ select.disabled {
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                            ng-click="openDatePicker($event, condition, '$fromOpened')"> <span
                                         class="input-group-btn">
-							<button type="button" class="btn btn-default btn-open"
-                                    ng-click="openEndDatePicker($event, inquiry, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+                                    <button type="button" class="btn btn-default btn-open"
+                                            ng-click="openEndDatePicker($event, inquiry, '$fromOpened')">
+                                        <i class="fa fa-calendar"></i>
+                                    </button>
+                                </span>
                                 </div>
                             </div>
                             <div class="col-xs-6">

+ 2 - 2
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;
@@ -269,7 +269,7 @@
     display: none;
   }
   .com_tab 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;

+ 2 - 2
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;
@@ -198,7 +198,7 @@
     display: none;
   }
   .com_tab 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;

+ 2 - 2
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;
@@ -160,7 +160,7 @@
     display: none;
   }
   .com_tab 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;

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html

@@ -84,7 +84,7 @@
         color: #fff !important;
     }
     .oder01: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;

+ 2 - 2
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;
@@ -153,7 +153,7 @@
     display: none;
   }
   .com_tab 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;

+ 2 - 2
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;
@@ -172,7 +172,7 @@
     display: none;
   }
   .com_tab 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;

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/apCheckList.html

@@ -17,7 +17,7 @@
 
   .add-apCheckList .table-header-wrap {
     background: #f9f9f9;
-    /*overflow-x: hidden;*/
+    overflow-x: hidden;
     overflow-y: scroll;
   }
 

+ 2 - 3
src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_details.html

@@ -324,11 +324,10 @@
               <span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
               <div style="margin-left: 50px;" class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
             </div>
-            <div class="input-group form-group" ng-if="inquiryItem.$editing" style="width: 100%;
-    margin-bottom: 0;position: relative;top: -14px;">
+            <div class="input-group form-group" ng-if="inquiryItem.$editing" style="width: 100%;margin-bottom: 0;position: relative;top: -14px;">
               <div class="input-group-addon">上传附件:</div>
               <input type="file" ng-model="inquiryItem.myFiles" ng-file-select
-                     ng-multiple="false" class="form-control input-sm input-group" name="file" style="width: 200px;    line-height: 29px;">
+                     ng-multiple="false" class="form-control input-sm input-group" name="file" style="width: 200px;line-height: 29px;">
             </div>
           </td>
           <td class="text-center">

+ 3 - 4
src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html

@@ -292,10 +292,9 @@
   <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-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 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">

+ 3 - 4
src/main/webapp/resources/view/vendor/b2b/sale/sale_badIn.html

@@ -291,10 +291,9 @@
   <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-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 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">

+ 3 - 29
src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html

@@ -290,22 +290,12 @@
 <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%" 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>-->
+      <ul class="fl" style="width: 100%">
         <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 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()" style="cursor:pointer">
               <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
@@ -315,22 +305,6 @@
           </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">

+ 3 - 4
src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html

@@ -287,10 +287,9 @@
   <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-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 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">

+ 3 - 4
src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html

@@ -292,10 +292,9 @@
   <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-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 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">

+ 3 - 4
src/main/webapp/resources/view/vendor/b2b/sale/sale_returns.html

@@ -291,10 +291,9 @@
   <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-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 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">

+ 2 - 2
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;
@@ -291,7 +291,7 @@
 		display: none;
 	}
 	.com_tab 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;

+ 3 - 3
src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html

@@ -222,7 +222,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;
@@ -233,7 +233,7 @@
 		display: none;
 	}
 	.com_tab 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;
@@ -764,7 +764,7 @@
 				<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" ng-click="downFile(attach.id)">{{::attach.name}}</a>
 						<a style="color: #ff2222" ng-click="removeFile(inquiryMould, attach)">删除</a>
 					</div>
 				</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -223,7 +223,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;
@@ -234,7 +234,7 @@
 		display: none;
 	}
 	.com_tab 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;

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/sale_send.html

@@ -418,7 +418,7 @@
 					</div>
 				</td>
 				<td class="br-l" colspan="2" style="padding-left: 20px;">
-					<div>单据编号:<a style="color: #5078cb;" href="#/sale/order/{{::item.orderItem.order.id}}" ng-bind="::item.orderItem.order.code"></a></div>
+					<div>单据编号:<a style="color: #5078cb;" href="#/order/{{::item.orderItem.order.id}}" ng-bind="::item.orderItem.order.code"></a></div>
 					<div>
 						第 <span ng-bind="::item.orderItem.number"></span> 行
 						&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="::item.orderItem.qty"></span>

+ 2 - 2
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;
@@ -257,7 +257,7 @@
 		display: none;
 	}
 	.com_tab 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;

+ 2 - 2
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;
@@ -280,7 +280,7 @@
 		display: none;
 	}
 	.com_tab 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;

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/messagePersonal.html

@@ -95,7 +95,7 @@
         color: #fff !important;
     }
     .oder01: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;

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

@@ -245,7 +245,7 @@
 		color: #fff;
 	}
 	.com_tab 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;