Просмотр исходного кода

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

wangcz 7 лет назад
Родитель
Сommit
d07ab13132

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_delivery_ctrl.js

@@ -748,7 +748,7 @@ define(['app/app'], function(app) {
         // $scope.isSendCount = 0
         // todo 已发货信息到时候需要根据当前对象获取信息
         $scope.ChangeSendCount = function(details, val, ind) {
-            if (val.indexOf('.')) {
+            if (val.indexOf('.') > 0) {
               toaster.pop('warning', '提示', '发货数量不能输入小数点')
                 return
             }

+ 15 - 3
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -3711,6 +3711,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('error', '型号为必填项');
         return;
       }
+      if ($scope.Regul.minPackQty <= 0) {
+        toaster.pop('error', '最小包装数必须大于0');
+        return;
+      }
       if (!$scope.Regul.minPackQty || $scope.Regul.minPackQty === '') {
         toaster.pop('error', '最小包装数必填项');
         return;
@@ -3760,24 +3764,32 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     // 编辑上下架
     $scope.dateArea = 'formMe';
     $scope.editProductUpOff = function(commodity, index) {
+      if (commodity.erpReserve === '' ||  commodity.minPackQty === 0) {
+        toaster.pop('warning','提示','当前物料库存为0,请先入库')
+        return;
+      }
+      if (commodity.minPackQty === 0  || commodity.minPackQty === '') {
+        toaster.pop('warning','提示','请先编辑物料,最小包装数选项')
+        return;
+      }
       if (commodity.editProductUpOff) return
       $scope.clearCheckBox()
       commodity.editProductUpOff = true
       $scope.productUpOff = _deepCopy(commodity)
       if (!$scope.productUpOff.goods) {
         $scope.productUpOff.goods = {
-          prices: [{'start': $scope.productUpOff.minPackQty, rMBPrice: ''}],
           selfSale: 1,
           breakUp: true,
           autoPublish: ($scope.productUpOff.goods && ($scope.productUpOff.goods.status === 601 || $scope.productUpOff.goods.status === 602)) || false,
           productid: $scope.productUpOff.id,
           minDelivery: 1,
           maxDelivery: 10,
-          minBuyQty: $scope.productUpOff.minPackQty,
-
+          minBuyQty: $scope.productUpOff.minPackQty || 1,
+          prices: [{'start': $scope.productUpOff.minPackQty || 1, rMBPrice: ''}],
         }
         // $scope.productAddFragment($scope.productUpOff.goods.prices)
       }
+      $scope.productUpOff.goods.prices[0].start = $scope.productUpOff.minPackQty || 1
       $scope.productUpOff.goods.selfSale = ($scope.storeInfo.uuid != 'undefind' && $scope.productUpOff.goods.storeid == $scope.storeInfo.uuid && $scope.storeInfo.storeName.indexOf('优软测试二') < 0 && $scope.storeInfo.storeName.indexOf('优软商城') < 0) ? 1: 0
       // $scope.productUpOff.dateArea = $scope.productUpOff.goods.selfSale === 1 ? 'formMe' : 'autoMonth' // 自营还是销售
       commodity.dateArea = $scope.productUpOff.goods.selfSale === 1 ? 'formMe' : 'autoMonth' // 自营还是销售

+ 4 - 4
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -440,9 +440,9 @@
 
 			<div class="sendGoodsList">
 				<li ng-repeat="item in sendGoodsList">
-					<label class="com-check-radio" >
-						<input type="radio" id="autoMonth0" name="date" ng-click="ChooseSendGoodsItem(item, $index)" ng-checked="CheckId === 'autoMonth'+$index">
-						<label style="vertical-align: top" for="autoMonth0"></label>
+					<label class="com-check-radio"   ng-click="ChooseSendGoodsItem(item, $index)">
+						<input type="radio" name="autoMonth" name="date" ng-checked="CheckId === 'autoMonth'+$index">
+						<label style="vertical-align: top"  name="autoMonth" ></label>
 						<div class="clearfix">
 							<div style="color: #666">发货单:</div><div style="color: #333">{{item}}</div>
 						</div>
@@ -563,7 +563,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" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></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" style="line-height: 18px;">
 								<!--<em ng-if="!detail.goodsnumber">&nbsp;</em>-->

+ 2 - 2
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 ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-							<span ng-show="isChange" class="wd01 red" ng-bind="detail.detailTotal | formateNumber : 6 | currencySysmbol : detail.currencyName"></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 class="wd01" style="line-height: 18px;">-->
 								<!--<em ng-if="!detail.goodsnumber">&nbsp;</em>-->

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

@@ -650,7 +650,7 @@
         <span>
           <em class="title">订单信息</em>
           <b>订单号:
-            <em ng-bind="::checkinvoice.orid" style="padding-right: 15px;" class="color333"></em>
+            <em ng-bind="::checkinvoice.orderid" style="padding-right: 15px;" class="color333"></em>
             <em>
               <font style="color: #333;">订单状态:</font>
               <em ng-bind="checkinvoice.status | statusAndTypeFilter"></em>

+ 5 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1172,11 +1172,13 @@
 										</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}}">
-												{{!store.enType || store.enType === 'HK' ? '$' : '¥'}}
-												{{price.rMBPrice}}</span>
+											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice || price.uSDNTPrice}}">
+												{{!store.enType || store.enType === 'HK' ? '$' : '¥'}}{{price.rMBPrice || price.uSDNTPrice }}</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">
+											暂无数据
+										</li>
 									</ul>
 								</td>
 								<td>

+ 1 - 1
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 ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></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 class="border01 click_shop">
                             <div ng-if="$index == 0">
                                 <a class="operate-height">