处理BUG

src/main/resources/dev/sys.properties

@@ -53,7 +53,7 @@ inquiryServiceInnerUrl=http://218.17.158.219:24000
 messageServiceUrl=http://192.168.253.12:24000/message/
 
 #b2b
-b2b=http://218.17.158.219/b2b-test
+b2b=http://218.17.158.219:9000/b2b-test
 b2bDomain=218.17.158.219:9000/b2b-test
 
 #lottery

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

@@ -413,6 +413,7 @@ define(['app/app'], function (app) {
             $defer.resolve(page.content);
           }
           $scope.totalCount = page.totalElement;
+          $scope.totalData = page;
         }, function (response) {
           $scope.loading = false;
           toaster.pop('error', '数据加载失败', response.data);

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;
   }
 
@@ -245,7 +245,7 @@
 
 </style>
 
-<div class="pane base-info-content fr" id="order-detail-list">
+<div class="pane base-info-content fr">
     <div class="add-apCheckList">
     <div class="pub-com_head">
       <span>新增对账单</span>
@@ -384,8 +384,7 @@
       <div class="table-header-wrap">
         <table class="table table-bordered">
           <tr>
-            <th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox"
-                                                                  ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+            <th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
             <th width="100">本次<br>对账数</th>
             <th width="70">客户<br>名称</th>
             <th width="60">单据<br>编号</th>
@@ -446,8 +445,7 @@
             <td width="40">{{::check.orderprice}}</td>
             <td width="30">{{::check.currency}}</td>
             <td width="40" align="center">{{::check.taxrate}}</td>
-            <td width="60">{{::(check.qty || 0)*(check.orderprice || 0) |
-              number:2}}</td>
+            <td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>
             <td width="60">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
           </tr>
           <tr ng-if="!data || data.length==0">

src/main/webapp/resources/view/vendor/b2b/modal/apcheck_customer.html

@@ -43,7 +43,7 @@
 	display: inline-block;
 }
 </style>
-<div class="modal-body" style="padding-top: 0;">
+<div class="modal-body" style="padding-top: 0;margin-bottom:30px;">
 	<div class="modal-header" style="margin-bottom: 10px;">
 		<h3 class="modal-title">
 			<span>对账 - 选择客户</span>
@@ -71,7 +71,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr ng-repeat="customer in $data" ng-click="select(customer)" style="text-decoration: none;" ng-disabled = "customer.apcheck == 0" title="点击选择该客户">
+			<tr ng-repeat="customer in $data" ng-click="select(customer)" style="text-decoration: none;cursor: pointer;" ng-disabled = "customer.apcheck == 0" title="点击选择该客户">
 				<td class="text-center" >
 					<span ng-bind="::customer.myEnterprise.uu"></span>
 				</td>
@@ -88,4 +88,15 @@
 			</tr>
 		</tbody>
 	</table>
+	<div ng-if="totalData.totalElement > 0" class="text-mns text-right">
+		显示&nbsp;{{(totalData .page - 1 ) * totalData.size + 1}}-{{totalData.all >= 10 ? totalData.page *  totalData.size: (totalData.page - 1 ) * totalData.size + totalData.all}}&nbsp;条，共&nbsp;{{totalData.totalElement}}&nbsp;条
+	</div>
 </div>
+<style>
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: -10px;
+		right: 20px;
+	}
+</style>

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

@@ -296,7 +296,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>
+        <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

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

@@ -295,7 +295,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>
+        <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

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

@@ -295,7 +295,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>
+        <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

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

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

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

@@ -296,7 +296,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>
+        <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

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

@@ -295,7 +295,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>
+        <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

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

@@ -614,7 +614,7 @@
 					</div>
 					<div style="margin-bottom: 2px">
 						<span>
-							物料名称{{::notice.orderItem.product.title}}
+							物料名称：{{::notice.orderItem.product.title}}
 						</span>
 					</div>
 					<div class="text-muted text-ellipsis" style="width: 320px;margin-bottom: 2px">

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

@@ -405,6 +405,9 @@
 						物料规格：
 						<span ng-bind="::item.product.spec"></span>
 					</div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode" ><b>客户采购单号：</b><div ng-bind="::item.custPurchaseCode"></div></div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName" ><b>收货客户：</b><div ng-bind="::item.acceptCustName"></div></div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress" ><b>客户收货地址：</b><div ng-bind="::item.acceptCustAddress"></div></div>
 					<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
@@ -802,13 +805,13 @@
 	})
 </script>
 <style>
-	.Boom18 {
-		bottom: 18px;
-	}
 	.text-mns {
 		padding-right: 15px;
 		position: absolute;
-		bottom: 20px;
+		bottom: 64px;
 		right: 20px;
 	}
+	.Boom18 {
+		bottom: 18px;
+	}
 </style>

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

@@ -1062,7 +1062,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>
+				<li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2B客户出入库</a></li>
 			</ul>
 		</div>
 		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">

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

@@ -1156,7 +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>
+                <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,7 +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>
+                <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,7 +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>
+                <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>