1、修改库存管理样式

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

@@ -47,7 +47,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     ;
 
     $scope.showClickText = function(goods, item) {
-      goods.editPackaging = item;
+      goods.Packinfo = item;
     }
     ;
 
@@ -124,7 +124,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
 
     $scope.setPriceMinAmount = setPriceMinAmount;
     $scope.setPriceMaxAmount = setPriceMaxAmount;
-    $scope.setPriceMinPackAmount = setPriceMinPackAmount;
+    // $scope.setPriceMinPackAmount = setPriceMinPackAmount;
 
     $scope.checkMinDelivery = checkMinDelivery;
     $scope.checkMaxDelivery = checkMaxDelivery;
@@ -2300,54 +2300,48 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         $scope.isNotBreakUp(goods, edit);
       }
     }
-
-    $scope.updateStartNumber = function(goods) {
-      goods.editPrices[0].start = goods.editMinBuyQty;
-    }
-    ;
-
     /**
      * 设置最小包数量
      *
      * @param goods		商品信息
      */
-    function setPriceMinPackAmount(goods) {
-      goods.editMinPackQtyInValid = false;
-      if (typeof goods.editMinPackQty == 'undefined') {
-        if (!$scope.$$nonProduct.enterSaveButton) {
-          toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
-        }
-        return false;
-      }
-      if (!$scope.isInt.test(goods.editMinPackQty)) {
-        if (!$scope.$$nonProduct.enterSaveButton) {
-          goods.editMinPackQtyInValid = true;
-          toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
-        }
-        return false;
-      }
-      if (parseInt(goods.editMinPackQty) < 1) {
-        if (!$scope.$$nonProduct.enterSaveButton) {
-          goods.editMinPackQtyInValid = true;
-          toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
-        }
-        return false;
-      }
-      if (parseInt(goods.editMinPackQty) > $scope.maxPackQty) {
-        if (!$scope.$$nonProduct.enterSaveButton) {
-          toaster.pop('warning', '提示', '包装数量必须小于' + $scope.maxPackQty);
-          goods.editMinPackQtyInValid = true;
-        }
-        return false;
-      }
-      if (goods.editMinBuyQty) {
-        if (!goods.editBreakUp) {
-          $scope.isNotBreakUp(goods);
-        }
-      }
-      goods.editMinPackQtyPre = goods.editMinPackQty;
-      goods.editMinPackQtyInValid = false;
-    }
+    // function setPriceMinPackAmount(goods) {
+    //   goods.editMinPackQtyInValid = false;
+    //   if (typeof goods.editMinPackQty == 'undefined') {
+    //     if (!$scope.$$nonProduct.enterSaveButton) {
+    //       toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
+    //     }
+    //     return false;
+    //   }
+    //   if (!$scope.isInt.test(goods.editMinPackQty)) {
+    //     if (!$scope.$$nonProduct.enterSaveButton) {
+    //       goods.editMinPackQtyInValid = true;
+    //       toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
+    //     }
+    //     return false;
+    //   }
+    //   if (parseInt(goods.editMinPackQty) < 1) {
+    //     if (!$scope.$$nonProduct.enterSaveButton) {
+    //       goods.editMinPackQtyInValid = true;
+    //       toaster.pop('warning', '提示', '包装数量必须是大于0的整数');
+    //     }
+    //     return false;
+    //   }
+    //   if (parseInt(goods.editMinPackQty) > $scope.maxPackQty) {
+    //     if (!$scope.$$nonProduct.enterSaveButton) {
+    //       toaster.pop('warning', '提示', '包装数量必须小于' + $scope.maxPackQty);
+    //       goods.editMinPackQtyInValid = true;
+    //     }
+    //     return false;
+    //   }
+    //   if (goods.editMinBuyQty) {
+    //     if (!goods.editBreakUp) {
+    //       $scope.isNotBreakUp(goods);
+    //     }
+    //   }
+    //   goods.editMinPackQtyPre = goods.editMinPackQty;
+    //   goods.editMinPackQtyInValid = false;
+    // }
 
     /**
      * 设置价格梯度的最大数量
@@ -2957,6 +2951,14 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       }
     }
     ;
+    /**
+     * 是否可拆卖
+     * @param commodity
+     */
+    $scope.updateStartNumber = function(goods) {
+      goods.editPrices[0].start = goods.editMinBuyQty;
+    }
+    ;
 
     /**
      * 如果不拆分需要重新计算最小起订量的信息
@@ -3361,7 +3363,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
 
     $scope.onCodeChange = function(code, index) {
-      if (!index) {
+      if (index === undefined) {
         if (code === '') {
           $scope.Regul.CodeList = []
           return false
@@ -3397,7 +3399,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
     // 品牌change事件
     $scope.onBrandChange = function(brand, index) {
-      if (!index) {
+      if (index === undefined) {
         if (brand === '') {
           $scope.Regul.BrandList = []
           return false
@@ -3506,7 +3508,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.replaceMaterialList[index].showSimilarBrandList = flag;
     }
     $scope.setCode = function(code, index) {
-      if (!index) {
+      if (index === undefined) {
         $scope.Regul.cmpcode = code
         $scope.Regul.CodeList = []
       } else {
@@ -3659,14 +3661,17 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.Regul = {
       IsLookOrUpdate: 'update'
     }
+    $scope.setPriceMinPackAmount = function(num) {
+      $scope.Regul.minPackNumber = num
+    }
+
     $scope.editRegulPicture = function(Regulpic, commodity) {
-      for (var i = 0; i < $scope.currenctMaterial.length; i++) {
-        $scope.currenctMaterial[i].editRegulShow = false
-      }
+      if (commodity.editRegulShow ) return
+      $scope.clearCheckBox()
       commodity.editRegulShow = true
-	    var ChooseItem = commodity
-      $scope.Regul.iniUrlImg = 'static/img/vendor/images/upload_file_icon.png'
-      $scope.Regul.Regulpic =  (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach) || ChooseItem.attach || 'static/img/vendor/images/upload_file_icon.png'; // 图片
+	    var ChooseItem = _deepCopy(commodity)
+      $scope.Regul.iniUrlImg = 'static/img/vendor/images/upload.png'
+      $scope.Regul.Regulpic =  (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach) || ChooseItem.attach || 'static/img/vendor/images/upload.png'; // 图片
       $scope.Regul.Ischange = (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach) ? true : false // 是否存在规格书
       $scope.Regul.showAction = true  // 个人产品库和企业产品 还是在售产品
       $scope.Regul.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
@@ -3678,7 +3683,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.Regul.CodeList = [] // 型号数组
       $scope.Regul.RegulChange = (ChooseItem.standard === 1 && $scope.Regul.Ischange) ? false : true // 规格书是否可以编辑
       $scope.Regul.ChooseItem = ChooseItem
-      $scope.Regul.Productpic = 'static/img/vendor/images/upload_file_icon.png' // 物料图片
+      $scope.Regul.Productpic = 'static/img/vendor/images/upload.png' // 物料图片
+      $scope.Regul.Packinfo = '' // 包装信息
+      $scope.Regul.minPackNumber = 1 // 最小包装数
+      $scope.Regul.productData = '' // 生产日期
     }
 
     // 修改规格书
@@ -3689,6 +3697,151 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.onUploadSuccessProduct = function(data) {
       $scope.Regul.Productpic = data.path;
     }
+    $scope.productUpOff = {}
+    // 编辑上下架
+    $scope.dateArea = 'formMe';
+    $scope.editProductUpOff = function(commodity, index) {
+      if (commodity.editProductUpOff) return
+      $scope.clearCheckBox()
+      commodity.editProductUpOff = true
+      $scope.productUpOff = _deepCopy(commodity)
+      $scope.productUpOff.minPackNumber = 10 // 最小包装数
+      $scope.productUpOff.MinBuyQty = 0  // 最小起订量
+      $scope.productUpOff.BreakUp = false// 可不可拆卖
+      $scope.productUpOff.GrounDing = false
+      $scope.productUpOff.selfSale = $scope.storeInfo.uuid !== 'undefind' && $scope.storeInfo.storeName.indexOf('优软测试二') < 0 && $scope.storeInfo.storeName.indexOf('优软商城') < 0 ? 1 : 2
+      commodity.dateArea = $scope.productUpOff.selfSale  === 1 ? 'formMe' : 'autoMonth' // 自营还是销售
+      $scope.productUpOff.priceInfo = [{count: 1, price: 100}, {count: 2, price: 200}, {count: 4, price: 200}]
+    }
+    // 最小起订量修改 梯度1的值等于最小起订量
+    $scope.ProductupdateStartNumber = function(productUpOff) {
+      $scope.productUpOff.priceInfo[0].count = productUpOff
+    }
+    // 最小起订量失去焦点
+    $scope.ProductblurMinBuyQty = function(MinBuyQty) {
+      if (!MinBuyQty) return
+      if (!$scope.productUpOff.BreakUp) {
+        $scope.productUpOff.MinBuyQty = $scope.productUpOff.minPackNumber
+        toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
+        $scope.ProductupdateStartNumber($scope.productUpOff.MinBuyQty)
+      }
+    }
+    // 可拆卖 上下架开关
+    $scope.productToggleIsBreadUp = function(pom) {
+      $scope.productUpOff[pom] = !$scope.productUpOff[pom]
+      if (pom === 'BreakUp') {
+        // 重置最小起订量
+        $scope.ProductblurMinBuyQty()
+      }
+    }
+    // 清空当前打开的状态
+    $scope.clearCheckBox = function() {
+      for (var i = 0; i < $scope.currenctMaterial.length; i++) {
+        $scope.currenctMaterial[i].editProductUpOff = false
+        $scope.currenctMaterial[i].editRegulShow = false
+      }
+    }
+    // 选择寄售还是自营
+    $scope.productChangeSelfType = function(num, type) {
+      $scope.productUpOff.selfSale = num
+    }
+    // 上下架保存按钮
+    $scope.productSave = function() {
+      $scope.productUpOff.EditMinBuyQty = false
+      if (!$scope.productUpOff.MinBuyQty || $scope.productUpOff.MinBuyQty === 0) {
+        toaster.pop('warning','提示','最小起订量不能为空')
+        $scope.productUpOff.EditMinBuyQty = true
+        return;
+      }
+      $scope.productUpOff.editMaxDeliveryinValid = $scope.productUpOff.editMinDeliveryinValid = false
+      if (!$scope.productUpOff.MinDelivery || !$scope.productUpOff.MaxDelivery) {
+        toaster.pop('warning','提示','交期不能为空')
+        if (!$scope.productUpOff.MinDelivery) {
+          $scope.productUpOff.editMinDeliveryinValid = true
+        }
+        if (!$scope.productUpOff.MaxDelivery) {
+          $scope.productUpOff.editMaxDeliveryinValid = true
+        }
+        return;
+      }
+
+      if (($scope.productUpOff.MinDelivery < 1 || $scope.productUpOff.MinDelivery > 31) || ($scope.productUpOff.MaxDelivery < 0 || $scope.productUpOff.MaxDelivery > 31)) {
+        toaster.pop('warning', '提示', '交期只能填写1-31之间的值');
+        return false;
+      }
+
+      if ($scope.productUpOff.MinDelivery === 0 || $scope.productUpOff.MaxDelivery === 0) {
+        toaster.pop('warning','提示','交期不能为0')
+        return;
+      }
+      var flag = true
+      for (var i = 0; i < $scope.productUpOff.priceInfo.length; i++) {
+        if (!$scope.productUpOff.priceInfo[i].count || !$scope.productUpOff.priceInfo[i].price) {
+          toaster.pop('warning','提示','价格梯度不能为空')
+          flag = false
+          break;
+        }
+        else if ($scope.productUpOff.priceInfo[i + 1] && $scope.productUpOff.priceInfo[i].count < $scope.productUpOff.priceInfo[i + 1].count) {
+          toaster.pop('warning','提示','价格梯度不能为空')
+          flag = false
+          break;
+        }
+      }
+      if (!flag) {
+        return
+      }
+
+      // 先判断是自营店铺 还是 寄售店铺
+      var _selfSale = $scope.storeInfo.uuid ? 1 : 2
+      if ($scope.storeInfo.uuid) { // 如果是自营店铺
+        if ($scope.productUpOff.selfSale === 1) { // 用户选择了自营
+          _selfSale = 1
+        } else if (_selfSale === 2) { // 用户选择了寄售
+          _selfSale = 2
+        }
+      }
+    }
+
+    /**
+     * 删除对应的分段.
+     * @param commodity
+     */
+    $scope.productDeleteFragment = function(goods, index) {
+      if (index > -1 && index < goods.length) {
+        if (goods.length < 2) {
+          toaster.pop('warning', "提示", "商品至少需要一个分段");
+          return;
+        }
+        var price = goods.splice(index, 1)
+      }
+    }
+    ;
+
+    /**
+     * 增加对应的分段。
+     * @param commodity
+     */
+    $scope.productAddFragment = function(goods) {
+      if (goods.length > 2) {
+        toaster.pop('warning', "提示", "商品最多只能有三个分段");
+        return;
+      }
+      goods.push({count: '', price: ''})
+
+    }
+    // 对象深度拷贝
+    function _deepCopy(target) {
+      if (typeof target !== 'object') return
+      // 判断目标类型，来创建返回值
+      var newObj = target instanceof Array ? [] : {}
+      for (var item in target) {
+        // 只复制元素自身的属性，不复制原型链上的
+        if (target.hasOwnProperty(item)) {
+          newObj[item] = typeof target[item] === 'object' ? _deepCopy(target[item]) : target[item]
+        }
+      }
+      return newObj
+    }
   }
   ]);
 

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

@@ -1608,8 +1608,9 @@
 		background: #dff3fd;
 	}
 	/*增加价格超过三个按钮变灰*/
-	.public-tab.table>tbody>tr>td div.plusBtn a.add[disabled] i, .public-tab.table>tbody>tr>td div.plusBtn a.reduce[disabled] i{
+	div.plusBtn a.add[disabled] i, div.plusBtn a.reduce[disabled] i{
 		color: #c7c7c7 !important;
+		cursor: not-allowed;
 	}
 	/*删除弹出框*/
 	.modal{
@@ -2194,14 +2195,14 @@
 								</td>
 								<td class="edit">
 									<div style="text-align: center">
-										<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
+										<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload.png', material)">
 											<span>编辑物料</span>
 											<!--编辑物料-->
 										</span>
 									</div>
 									<!---->
 									<div style="text-align: center">
-										<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper">
+										<span ng-click="editProductUpOff(material, $index)">
 											<span>编辑上下架</span>
 										</span>
 									</div>
@@ -2265,8 +2266,8 @@
 								<!--</td>-->
 
 							</tr>
-							<!--编辑物料 ng-show="material.editRegulShow"-->
-							<tr style="height: auto">
+							<!--编辑物料 -->
+							<tr style="height: auto" ng-show="material.editRegulShow">
 								<td colspan="7">
 									<div style="border: 1px solid #5078cb;margin: 0 10px;">
 										<div style="background: #f8f8f8;height: 39px;line-height: 39px;">编辑物料</div>
@@ -2351,7 +2352,8 @@
 															<input type="text"
 																		 oninput="if(value.length>6)value=value.slice(0,6)"
 																		 placeholder="请输入最小包装数"
-																		 ng-blur="setPriceMinPackAmount(Regul.spec)"
+																		 ng-model="Regul.minPackNumber"
+																		 ng-blur="setPriceMinPackAmount(Regul.minPackNumber)"
 																		 class="form-control inputText" maxlength="50"/>
 														</div>
 													</div>
@@ -2361,6 +2363,7 @@
 															<!-- 可编辑状态 -->
 															<input type="text"
 																		 placeholder="请输入生产日期"
+																		 ng-model="Regul.productData"
 																		 class="form-control inputText" maxlength="12"/>
 														</div>
 													</div>
@@ -2368,8 +2371,8 @@
 														<div class="name pull-left">包装方式：</div>
 														<div class="pull-left">
 															<!-- 可编辑状态 -->
-															<select style="text-indent: 12px" ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package inputText" title="包装">
-																<option style="text-indent: 12px" ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</option>
+															<select style="text-indent: 12px" ng-model="Regul.Packinfo" ng-init="Regul.Packinfo='请选择'" 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>
 													</div>
@@ -2406,7 +2409,7 @@
 														<div class="pull-left">
 															<div class="update-big-img clearboth">
 																<div class="previewImage">
-																	<input type="file" image-upload class="uploadImage" on-success="onUploadSuccessProduct($data, $file)" max-size="1024" errorSizeMsg="'文件大小不能超过20M'">
+																	<input type="file" image-upload class="uploadImage" on-success="onUploadSuccessProduct($data, $file)" max-size="1048576" error-size-msg="文件大小不能超过1M">
 																	<img ng-src="{{Regul.Productpic}}" alt="商品图片" style="height: 78px;width: 78px;">
 																	<div class="cover" style="background: rgba(0,0,0,0)">
 																		<i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
@@ -2427,12 +2430,121 @@
 											</ul>
 											<div class="editRegulControll">
 												<div>确定</div>
-												<div>取消</div>
+												<div ng-click="clearCheckBox()">取消</div>
 											</div>
 										</div>
 									</div>
 								</td>
 							</tr>
+							<!-- 编辑上下架  todo 单价的地方记得判断香港店铺 -->
+							<tr style="height: auto" ng-show="material.editProductUpOff">
+								<td colspan="7">
+									<div style="border: 1px solid #5078cb;margin: 0 10px;padding-bottom: 10px">
+										<div style="background: #f8f8f8;height: 39px;line-height: 39px;">编辑上下架</div>
+										<div style="padding:10px 20px 0px;border-bottom: 1px solid #dcdcdc" >
+											<ul class="pull-left">
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">最小起订量：</div>
+														<div class="pull-left">
+															<!-- 可编辑状态 -->
+															<input type="text"
+																		 placeholder="请输入最小起订量"
+																		 maxlength="6"
+																		 class="form-control inputText"
+																		 oninput="if(value.length>6)value=value.slice(0,6)"
+																		 ng-model="productUpOff.MinBuyQty"
+																		 ng-change="ProductupdateStartNumber(productUpOff.MinBuyQty)"
+																		 ng-blur="ProductblurMinBuyQty(productUpOff.MinBuyQty)"
+																		 ng-class="{'error' : productUpOff.EditMinBuyQty}"
+															/>
+														</div>
+													</div>
+													<div class="pull-left clearboth">
+														<div class="name pull-left">交期(天)：</div>
+														<input type="text"
+																	 placeholder="天数"
+																	 maxlength="3"
+																	 class="form-control inputText"
+																	 oninput="if(value.length>3)value=value.slice(0,3)"
+																	 ng-model="productUpOff.MinDelivery"
+																	 ng-blur="changeDelivery(productUpOff.MinDelivery,productUpOff.MaxDelivery, true, productUpOff)"
+																	 ng-class="{'error' : productUpOff.editMinDeliveryinValid}"
+																	 style="width: 80px;display: inline-block;"
+														/>&nbsp;-&nbsp;<input type="text"
+																	 style="width: 80px;display: inline-block;"
+																	 placeholder="天数"
+																	 maxlength="3"
+																	 class="form-control inputText"
+																	 oninput="if(value.length>3)value=value.slice(0,3)"
+																	 ng-model="productUpOff.MaxDelivery"
+																	 ng-blur="changeDelivery(productUpOff.MinDelivery, productUpOff.MaxDelivery, true, productUpOff)"
+																	 ng-class="{'error' : productUpOff.editMaxDeliveryinValid}"
+														/>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">可拆卖：</div>
+														<span class="switch"><button ng-class="{'active' : productUpOff.BreakUp}" ng-click="productToggleIsBreadUp('BreakUp', false)"></button></span>
+													</div>
+													<div class="pull-left clearboth" style="margin-left: 101px;">
+														<div class="name pull-left">销售方式：</div>
+														<div class="pull-left">
+															<label class="com-check-radio">
+																<input type="radio" id="{{'autoMonth' + $index}}" ng-click="productChangeSelfType(1, 'formMe')" name="date" ng-checked="material.dateArea === 'formMe'">
+																<label style="vertical-align: top" for="{{'autoMonth' + $index}}"></label>
+																自营
+															</label>
+															<label class="com-check-radio">
+																<input type="radio" id="{{'autoMonth_' + $index}}" ng-click="productChangeSelfType(2, 'autoMonth')" name="date" ng-checked="material.dateArea === 'autoMonth'">
+																<label style="vertical-align: top" for="{{'autoMonth_' + $index}}"></label>
+																寄售
+															</label>
+														</div>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">上架：</div>
+														<span class="switch"><button ng-class="{'active' : productUpOff.GrounDing}" ng-click="productToggleIsBreadUp('GrounDing', false)"></button></span>
+													</div>
+												</li>
+											</ul>
+											<ul class="pull-left" style="margin-left: 20px;">
+												<li class="wuliao_list clearboth">
+													<div class="name pull-left">价格梯度：</div>
+													<div class="list pull-left" style="width: 280px;border: 1px solid #dcdcdc;">
+														<div style="background: #f1f3f6;font-size: 14px;color: #333;">
+															<span class="fl w50" style="width: 50%">分段数量</span>
+															<span class="fl w50" style="width: 50%">分段价格</span>
+															<div class="clearfix"></div>
+														</div>
+														<div class="plusBtn" style="font-size: 14px;color: #333;background: #fff;border-top: 1px solid #dcdcdc;position:relative" ng-repeat="price in productUpOff.priceInfo">
+															<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">
+																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center" ng-model="price.count" />
+															</span>
+															<span class="fl w50" style="width: 50%">
+																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center" ng-model="price.price" />
+															</span>
+															<div class="clearfix"></div>
+															<div class="input-list ng-scope" style="height: 24px;line-height: 24px;margin-bottom: 5px;position: absolute;right: -38px;top: 0px">
+																<a class="reduce" ng-disabled="productUpOff.priceInfo.length < 2" ng-click="productDeleteFragment(productUpOff.priceInfo, $index)" disabled="disabled"><i class="fa fa-minus-circle restrict-color" ng-class="{ 'restrict-color': productUpOff.priceInfo.length === 1 }"></i></a>
+																<a class="add" ng-click="productAddFragment(productUpOff.priceInfo)" ng-disabled="productUpOff.priceInfo.length >= 3"><i class="fa fa-plus-circle" ng-class="{ 'restrict-color': $index === 2 }"></i></a>
+															</div>
+														</div>
+													</div>
+												</li>
+											</ul>
+											<div style="clear:both"></div>
+										</div>
+										<div class="editRegulControll">
+											<div ng-click="productSave()">确定</div>
+											<div ng-click="clearCheckBox()">取消</div>
+										</div>
+									</div>
+								</td>
+							</tr>
 							<tr ng-show="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
 								<td colspan="8" style="padding: 0;">
 									<div class="show-content">
@@ -3253,7 +3365,7 @@
 			text-align: left
 		}
 		.update-big-img .prompt div {
-			line-height: 16px;
+			line-height: 18px;
 		}
 
 		.update-big-img .previewImage img {