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

src/main/resources/ptest/account.properties

@@ -8,6 +8,7 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
+sso.cookie.domain=usoftchina.com
 sso.login.url=https://tsso.usoftchina.com
 sso.logout.url=https://tsso.usoftchina.com/logquit
 sso.register.url=https://tsso.usoftchina.com/register/enterpriseRegistration

src/main/resources/ptest/sys.properties

@@ -41,19 +41,19 @@ recommendPort=80
 # upload file
 uploadFileUrl=http://dfs-api.ubtob.com
 # search file
-searchUrl=http://192.168.100.12:8080
+searchUrl=http://188.131.128.107:24006
 
 # message ip
 messageServiceIp=http://message.ubtob.com/
 # product public ip
-productServiceIp=http://192.168.100.11:8080
+productServiceIp=http://188.131.128.107:24002
 
 # Kafka
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
 
 #inquiry service url
 inquiryServiceUrl=https://tinquiry-api.usoftchina.com
-inquiryServiceInnerUrl=http://192.168.100.9:8080
+inquiryServiceInnerUrl=http://10.1.51.92:24000
 
 #public message  service url
 messageServiceUrl=https://tmessage-api.usoftchina.com

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

@@ -198,37 +198,37 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                     isArray: true
                 },
                 findSaleUsers: {
-                    url: b2bPath + 'vendorDistribute/:id',
+                    url: b2bPath + '/vendorDistribute/:id',
                     method: 'POST',
                     isArray: true
                 },
                 addSaleUserToVendor: {
-                    url: b2bPath + 'vendorDistribute/bindVendor/:id',
+                    url: b2bPath + '/vendorDistribute/bindVendor/:id',
                     method: 'POST'
                 },
                 addUserToVendor: {
-                    url: b2bPath + 'account/user/bindUserToVendor/:uu',
+                    url: b2bPath + '/account/user/bindUserToVendor/:uu',
                     method: 'POST'
                 },
                 transferSaleUserToVendor: {
-                    url: b2bPath + 'vendorDistribute/bindUserToVendor/:id',
+                    url: b2bPath + '/vendorDistribute/bindUserToVendor/:id',
                     method: 'POST'
                 },
                 transferUserToVendor: {
-                    url: b2bPath + 'account/user/transferUserToVendor/:uu',
+                    url: b2bPath + '/account/user/transferUserToVendor/:uu',
                     method: 'POST'
                 },
                 transferMyDistribute: {
-                    url: b2bPath + 'account/user/transferMyDistribute',
+                    url: b2bPath + '/account/user/transferMyDistribute',
                     method: 'POST'
                 },
                 findDistribute: {
-                    url: b2bPath + 'account/user/findDistribute',
+                    url: b2bPath + '/account/user/findDistribute',
                     method: 'GET',
                     isArray: true
                 },
                 getDistribute: {
-                    url: b2bPath + 'account/user/getDistribute/:custUU',
+                    url: b2bPath + '/account/user/getDistribute/:custUU',
                     method: 'GET'
                 },
                 getEnTransfer: {

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -562,6 +562,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                           var materialUrl = $scope.seekUrl;
                           if ($scope.seekUrl == 'https://api-inquiry.usoftchina.com') {
                               materialUrl = 'https://api-product.usoftchina.com/';
+                          } else {
+                              materialUrl = 'https://tproduct-api.usoftchina.com/'
                           }
                           $http({
                               method: 'get',

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -412,6 +412,7 @@ define(['app/app'], function (app) {
                   }
                   $scope.inquiryItem = seek;
                   $scope.inquiryItem.leadtime = '';
+                  $scope.inquiryItem.taxrate = '';
                   $scope.inquiryItem.replies = [
                     {
                       lapQty: '',
@@ -428,7 +429,6 @@ define(['app/app'], function (app) {
 
           $scope.onLeadtimeInput = function () {
             var time = $scope.inquiryItem.leadtime.toString();
-            // console.info();
             if (time.length > 3) {
               $scope.inquiryItem.leadtime = Number(time.substring(0, 3));
             }
@@ -440,7 +440,23 @@ define(['app/app'], function (app) {
             } else {
               $scope.validSayPrice.leadtime = true;
             }
-          }
+          };
+
+              $scope.onTaxrateInput = function () {
+                  var time = $scope.inquiryItem.taxrate.replace(/[^\-?\d.]/g, '');
+                  if (time.length > 2) {
+                      $scope.inquiryItem.taxrate = Number(time.substring(0, 2));
+                  }
+              }
+              $scope.onTaxrateBlur = function () {
+                  if ($scope.inquiryItem.taxrate < 0 || $scope.inquiryItem.taxrate >= 100 || $scope.inquiryItem.taxrate.toString().indexOf('.') !== -1) {
+                      $scope.validSayPrice.taxrate = false;
+                      toaster.pop('error', '税率请填写0-99之间的正整数');
+                  } else {
+                      $scope.validSayPrice.taxrate = true;
+                  }
+              };
+
             $scope.onReplaceBrandBlur = function () {
               if (!$scope.inquiryItem.replaceBrand || $scope.inquiryItem.replaceBrand.length == 0) {
                 $scope.validSayPrice.replaceBrand = false;
@@ -701,7 +717,7 @@ define(['app/app'], function (app) {
                 return false;
               }
             }
-            return $scope.validSayPrice.leadtime && $scope.validSayPrice.repliesLapQty && $scope.validSayPrice.repliesPrice && validReplace;
+            return $scope.validSayPrice.leadtime && $scope.validSayPrice.taxrate && $scope.validSayPrice.repliesLapQty && $scope.validSayPrice.repliesPrice && validReplace;
           }
 
           $scope.setReplies = function (type, index) {

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

@@ -141,7 +141,7 @@
 						<td class="text-center" title="{{vendor.saleContacts.toString()}}">
 							<span ng-repeat="users in vendor.saleContacts | limitTo: 3">{{users}}<br/></span>
 							<span ng-if="vendor.saleContacts.length > 3">...</span>
-							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">-</span>
+							<span ng-if="!vendor.saleContacts || vendor.saleContacts.length === 0">待分配</span>
 						</td>
 						<td class="text-center">
 							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)">下采购单</a><br/>

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

@@ -1127,10 +1127,9 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="220">品牌/物料名称</th>
-                <th width="220">型号/规格</th>
+                <th width="260">品牌/物料名称</th>
+                <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
-                <th width="80">税率%</th>
                 <th width="120">截止日期</th>
                 <th width="140">操作</th>
             </tr>
@@ -1169,13 +1168,6 @@
                         </div>
                     </div>
                 </td>
-                <td>
-                    <div class="row-wrap il-content">
-                        <div class="il-box-small il-box">
-                            <div title="{{seek.taxrate}}" class="item">{{seek.taxrate || '-'}}</div>
-                        </div>
-                    </div>
-                </td>
                 <td>
                     <div class="row-wrap">
                         <!--<div ng-bind="seek.endDate | date:'yyyy-MM-dd'"></div>
@@ -1297,7 +1289,8 @@
                                 <thead>
                                 <tr ng-if="currentSeek.$status == 2">
                                     <th width="273">卖家</th>
-                                    <th width="233">交期(天)</th>
+                                    <th width="173">交期(天)</th>
+                                    <th width="80">税率%</th>
                                     <th width="234">价格梯度</th>
                                     <!--<th width="195">生产日期</th>-->
                                     <th width="221">操作</th>
@@ -1308,6 +1301,7 @@
                                     <th width="96">型号</th>
                                     <th width="80">规格</th>
                                     <th width="81">交期(天)</th>
+                                    <th width="80">税率%</th>
                                     <th width="102">价格梯度</th>
                                     <th width="100">报价时间</th>
                                     <!--<th width="195">生产日期</th>-->
@@ -1320,7 +1314,8 @@
                                     <tbody>
                                     <tr ng-repeat="of in offer track by $index" ng-if="currentSeek.$status == 2 && of.isReplace != 1">
                                         <td width="273" ng-bind="of.vendName" title="{{of.vendName}}"></td>
-                                        <td width="233" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="173" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="80" class="red-text" ng-bind="of.taxrate">4-6</td>
                                         <td width="234" class="seek-replies">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
                                             <div class="red-text">
@@ -1366,6 +1361,7 @@
                                         <td width="96" ng-bind="of.replaceCmpCode || '-'" title="{{of.replaceCmpCode}}"></td>
                                         <td width="80" ng-bind="of.replaceSpec || '-'" title="{{of.replaceSpec}}"></td>
                                         <td width="81" class="red-text" ng-bind="of.leadtime">4-6</td>
+                                        <td width="80" class="red-text" ng-bind="of.taxrate">4-6</td>
                                         <td width="102" class="seek-replies">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
                                             <div class="red-text">

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

@@ -1142,6 +1142,10 @@
                         <span><i>*</i>交期：</span>
                         <input type="number" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="天数">
                     </div>
+                    <div class="form-item form-right">
+                        <span><i>*</i>税率：</span>
+                        <input type="number" style="width:133px;margin-right:5px;" class="form-control" ng-change="onTaxrateInput()" ng-blur="onTaxrateBlur()" ng-model="inquiryItem.taxrate" placeholder="税率">%
+                    </div>
                     <div class="form-item form-upload">
                         <!--
                         <label>