Merge branch 'master' into dev

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

@@ -39,7 +39,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
      */
     $scope.maxReserve = 999999999;
 
-    $scope.packageArray = ["请选择", "Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装", "Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装", "其他"];
+    $scope.packageArray = ["Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装", "Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装", "其他"];
 
     $scope.showText = function(item) {
       $scope.goods.editPackaging = item;
@@ -3677,10 +3677,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
 
     $scope.editRegulPicture = function(Regulpic, commodity) {
-      if (commodity.erpReserve === '' ||  commodity.erpReserve === 0 || !commodity.erpReserve) {
-        toaster.pop('warning','提示','当前物料库存为0，请先入库')
-        return;
-      }
+      // if (commodity.erpReserve === '' ||  commodity.erpReserve === 0 || !commodity.erpReserve) {
+      //   toaster.pop('warning','提示','当前物料库存为0，请先入库')
+      //   return;
+      // }
       if (commodity.editRegulShow ) return
       $scope.clearCheckBox()
       commodity.editRegulShow = true

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

@@ -1313,7 +1313,7 @@
 														<div class="name pull-left">包装方式：</div>
 														<div class="pull-left">
 															<!-- 可编辑状态 -->
-															<select style="text-indent: 12px" ng-model="Regul.packaging" ng-init="Regul.packaging='请选择'" class="select-adder select-package inputText" title="包装">
+															<select style="text-indent: 12px" ng-model="Regul.packaging"  class="select-adder select-package inputText" title="包装">
 																<option style="text-indent: 12px" ng-repeat="item in packageArray" ng-click="showClickText(Regul, item)">{{item}}</option>
 															</select>
 														</div>