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

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

@@ -244,7 +244,10 @@ define(['app/app'], function(app) {
 					return ;
 				}
 				$scope.order = data;
-        $scope.sendGoodsList = $scope.order.inIds.split(',')
+        $scope.sendGoodsList = []
+				if ($scope.order.inIds) {
+          $scope.sendGoodsList = $scope.order.inIds.split(',')
+        }
         $scope.acceptGoods = $scope.order.signReceive
         $scope.ChooseItem = $scope.sendGoodsList.length > 0 ? $scope.sendGoodsList[0] : ''
 				if ($scope.acceptGoods) {

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

@@ -3868,11 +3868,18 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       }
       var flag = true
       for (var i = 0; i < $scope.productUpOff.goods.prices.length; i++) {
-        if (!$scope.productUpOff.goods.prices[i].start || !$scope.productUpOff.goods.prices[i].rMBPrice) {
-          toaster.pop('warning','提示','价格梯度不能为空')
+        if (!$scope.productUpOff.goods.prices[i].start
+            || !$scope.productUpOff.goods.prices[i].rMBPrice && $scope.store.enType !== 'HK' ) {
+          toaster.pop('warning', '提示', '价格梯度不能为空')
           flag = false
           break;
         }
+        else if (!$scope.productUpOff.goods.prices[i].start
+              || !$scope.productUpOff.goods.prices[i].uSDPrice && $scope.store.enType === 'HK') {
+            toaster.pop('warning', '提示', '价格梯度不能为空')
+            flag = false
+            break;
+        }
         else if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) > Number($scope.productUpOff.goods.prices[i + 1].start)) {
           toaster.pop('warning','提示','输入值会导致梯度重叠，请重新修改')
           flag = false
@@ -3883,12 +3890,22 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return
       }
       if ($scope.productUpOff.goods.prices.length === 1) {
-        $scope.productUpOff.goods.prices[0].rMBNTPrice = ''
-        $scope.productUpOff.goods.prices[0].end = '999999999'
+       if ($scope.store.enType === 'HK') {
+         $scope.productUpOff.goods.prices[0].uSDNTPrice = ''
+         $scope.productUpOff.goods.prices[0].end = '999999999'
+       }else {
+         $scope.productUpOff.goods.prices[0].rMBNTPrice = ''
+         $scope.productUpOff.goods.prices[0].end = '999999999'
+       }
       } else {
         for (var i = 0; i < $scope.productUpOff.goods.prices.length; i++) {
-          $scope.productUpOff.goods.prices[i].rMBNTPrice = ''
-          $scope.productUpOff.goods.prices[i].end = '999999999'
+          if ($scope.store.enType === 'HK') {
+            $scope.productUpOff.goods.prices[i].uSDNTPrice = ''
+            $scope.productUpOff.goods.prices[i].end = '999999999'
+          }else {
+            $scope.productUpOff.goods.prices[i].rMBNTPrice = ''
+            $scope.productUpOff.goods.prices[i].end = '999999999'
+          }
           if ($scope.productUpOff.goods.prices[i + 1]) {
             $scope.productUpOff.goods.prices[i].end = parseInt(
                 $scope.productUpOff.goods.prices[i + 1].start) - 1

src/main/webapp/resources/view/admin/trade/trade_invoicefromorder.html

@@ -224,8 +224,8 @@ input[type="radio"]:checked+label:after, input[type="checkbox"]:checked+label:af
 							<td class="text-center">{{invoice.buyername}}</td>
 							<td class="text-center text-num">{{invoice.currency}}
 								{{invoice.price}}</td>
-							<td class="text-center">{{invoice.number}}</td>
-							<td class="text-center">{{invoice.creattime | date:"yyyy-MM-dd HH:mm"}}</td>
+							<td class="text-center">{{invoice.qty}}</td>
+							<td class="text-center">{{invoice.createtime | date:"yyyy-MM-dd HH:mm"}}</td>
 							<td class="text-center">{{invoice.status |statusAndTypeFilter}}</td>
 							<td class="text-center">{{invoice.sourceid}}</td>
 							<td class="text-center" ng-show="active=='tobeshipped'">

src/main/webapp/resources/view/admin/trade/trade_invoicefrompurc.html

@@ -56,8 +56,8 @@
 							<td class="text-center"><span ng-bind="invoice.selfSeller ? '自营' : '代售'"></span></td>
 							<td class="text-center">{{invoice.sellername}}</td>
 							<td class="text-center text-num">{{invoice.currencyName}} {{invoice.price}}</td>
-							<td class="text-center">{{invoice.number}}</td>
-							<td class="text-center">{{invoice.creattime | date: "yyyy-MM-dd HH:mm"}}</td>
+							<td class="text-center">{{invoice.qty}}</td>
+							<td class="text-center">{{invoice.createtime | date: "yyyy-MM-dd HH:mm"}}</td>
 							<td class="text-center">{{invoice.orid}}</td>
 							<td class="text-center" ng-show="active=='inbound'">
 								<a ng-show="active=='inbound'" ng-click="ensureAccept(invoice)">

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

@@ -923,7 +923,7 @@
 						</span>
 						<span class="border-bottom-cfcfcf wd03 text-left" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]" ng-bind="::detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 						<span class="border-bottom-cfcfcf wd03 text-left" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]" ng-bind="::detail.number | number" class="wd03 text-left"></span>
-						<span class="border-bottom-cfcfcf wd03 text-left" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]" ng-bind="::detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+						<span class="border-bottom-cfcfcf wd03 text-left" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]" ng-bind="::detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{::detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
 						<span class="logistics_xq" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length - 1 || $index==2}">
 							<div ng-if="$index == 0">
 								<div ng-bind="::order.status | statusFilter"></div>

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

@@ -577,7 +577,7 @@
 						</span>
 							<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName">$1.23</span>
 							<span style="width: 10%;" ng-bind="detail.number">100</span>
-							<span class="wd01 red" style="overflow: hidden;white-space: nowrap;width: 13%" titl="{{detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName}}" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+							<span class="wd01 red" style="overflow: hidden;white-space: nowrap;width: 13%;text-overflow: ellipsis;" title="{{detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName}}" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 							<!--物料编码-->
 							<span class="wd01" style="line-height: 18px;">
 								<!--<em ng-if="!detail.goodsnumber">&nbsp;</em>-->

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

@@ -509,8 +509,8 @@
 							</em>
 						</span>
 							<span style="width: 10%;" ng-bind="detail.number">100</span>
-							<span style="overflow: hidden;white-space: nowrap;width: 15%" ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
-							<span style="overflow: hidden;white-space: nowrap;width: 15%" ng-show="isChange" class="wd01 red" ng-bind="detail.detailTotal | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.detailTotal | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
+							<span style="overflow: hidden;white-space: nowrap;width: 15%;    text-overflow: ellipsis;" ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
+							<span style="overflow: hidden;white-space: nowrap;width: 15%;    text-overflow: ellipsis;s" ng-show="isChange" class="wd01 red" ng-bind="detail.detailTotal | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.detailTotal | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
 							<!--物料编码-->
 							<!--<span class="wd01" style="line-height: 18px;">-->
 								<!--<em ng-if="!detail.goodsnumber">&nbsp;</em>-->

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

@@ -767,8 +767,8 @@
                 </em>
               </span>
               <span style="width: 10%;" ng-bind="detail.number">100</span>
-              <span style="white-space: nowrap;overflow: hidden;" ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
-              <span style="white-space: nowrap;overflow: hidden;" ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
+              <span style="white-space: nowrap;overflow: hidden;    text-overflow: ellipsis;" ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
+              <span style="white-space: nowrap;overflow: hidden;    text-overflow: ellipsis;" ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName" title="{{detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName}}"></span>
 
               <span class="wd01" style="line-height: 18px;">
                 <!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->

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

@@ -1172,9 +1172,9 @@
 										</li>
 										<li style="font-size: 14px;color: #333;background: #fff;" class='priceInfoList' ng-repeat="price in material.goods.prices">
 											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">{{price.start}}+</span>
-											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice}}">
+											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice || price.uSDPrice}}">
 												{{!store.enType || store.enType === 'HK' ? '$' : '¥'}}
-												{{price.rMBPrice || price.uSDNTPrice }}</span>
+												{{price.rMBPrice || price.uSDPrice}}</span>
 											<div class="clearfix"></div>
 										</li>
 										<li style="font-size: 14px;color: #333;background: #fff;" class='priceInfoList' ng-if="!material.goods || material.goods.prices.length === 0">
@@ -1465,7 +1465,8 @@
 																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" maxlength="9" ng-disabled="$index === 0" ng-readonly="$index === 0" ng-model="price.start" ng-blur="productPriceInfoBlur($index, price.start)" />
 															</span>
 															<span class="fl w50" style="width: 50%">
-																<input text="text" autocomplete="off" validata-price ng-blur="changePrices(productUpOff.goods.prices, price.rMBPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.rMBPrice" />
+																<input  ng-if="store.enType !== 'HK'" type="text" autocomplete="off" validata-price ng-blur="changePrices(productUpOff.goods.prices, price.rMBPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.rMBPrice" />
+																<input  ng-if="store.enType === 'HK'" type="text" autocomplete="off" validata-price ng-blur="changePrices(productUpOff.goods.prices, price.uSDPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.uSDPrice" />
 															</span>
 															<div class="clearfix"></div>
 															<div class="input-list ng-scope" style="height: 24px;line-height: 24px;position: absolute;right: -38px;top: 3px">

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

@@ -1402,7 +1402,7 @@
                         </span>
 						<span style="text-align: left;" ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 						<span ng-bind="detail.number | number"></span>
-						<span title="{{detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName}}" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="overflow: hidden;white-space: nowrap;"></span>
+						<span title="{{detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName}}" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="overflow: hidden;white-space: nowrap;    text-overflow: ellipsis;"></span>
 						<span class="border01 click_shop">
                             <div ng-if="$index == 0">
                                 <a class="operate-height">