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

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

@@ -3710,6 +3710,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         toaster.pop('error', '型号为必填项');
         return;
       }
+      if (!$scope.Regul.minPackQty || $scope.Regul.minPackQty === '') {
+        toaster.pop('error', '最小包装数必填项');
+        return;
+      }
       $scope.Regul.cmpImg = $scope.Regul.RegulImg === 'static/img/vendor/images/upload.png' ? '' : $scope.Regul.RegulImg
       $scope.Regul.url = ($scope.Regul.Regulpic === $scope.Regul.iniUrlImg || $scope.Regul.Regulpic === $scope.Regul.iniRegulpic) ? '' : $scope.Regul.Regulpic
       var str = JSON.stringify($scope.Regul)
@@ -3763,8 +3767,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         $scope.productUpOff.goods = {
           prices: [{'start': $scope.productUpOff.minPackQty, rMBPrice: ''}],
           selfSale: 1,
-          breakUp: false,
-          autoPublish: false,
+          breakUp: true,
+          autoPublish: $scope.productUpOff.goods.status === 601 || $scope.productUpOff.goods.status === 602 || false,
           productid: $scope.productUpOff.id,
           minDelivery: 1,
           maxDelivery: 10,

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

@@ -1178,10 +1178,12 @@
 									</ul>
 								</td>
 								<td>
-									<div ng-if="!material.goods">自营</div>
-									<div ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
+									<div ng-if="!material.goods">
+										{{storeInfo.uuid != 'undefind' && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0 ? '自营': '寄售'}}
+									</div>
+									<div ng-if="material.goods" ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
 									<div>{{material.goods.breakUp ? '可拆卖' : '不可拆卖'}}</div>
-									<div>{{material.goods.autoPublish ? '已上架' : '已下架' }}</div>
+									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '已下架' }}</div>
 								</td>
 								<td class="edit">
 									<div style="text-align: center">