修改行业json

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

@@ -743,6 +743,7 @@ define([ 'app/app' ], function(app) {
             commodity.editMinPackQtyPre = commodity.minPackQty;
             commodity.editMinPackQtyDirty = false;
             commodity.editMinPackQtyInValid = false;
+            commodity.editspec = commodity.spec;
 
             commodity.editBreakUp = commodity.breakUp;
             commodity.editBreakUpPre = commodity.breakUp;

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

@@ -2121,7 +2121,7 @@
 															</div>-->
                                                         </div>
                                                         <div class="input-list produceDate-fix">
-                                                            <span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
+                                                            <span class="tit">生产日期：</span><input type="text" class="form-control" name="produceDate" ng-maxlength="12" title="生产日期" maxlength="12" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
                                                                                                  ng-class="{'error' : goods.editProduceDateInvalid}"
                                                                                                  ng-change="editProduceDateFa(goods, false)"/>
                                                         </div>
@@ -2145,7 +2145,7 @@
 										                    <span class="tit" style="width: 84px">最小包装数：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
                                                         </div>
 																											<div class="input-list">
-																												<span class="tit" style="width: 84px">规格：</span><input type="number" maxlength="40" oninput="if(value.length>40)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>
+																												<span class="tit" style="width: 84px">规格：</span><input maxlength="40" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>
 																											</div>
                                                     </div>
                                                     <div class="content">
@@ -2239,14 +2239,14 @@
 													</div>
 													<div class="content width140">
 														<p class="title"><span>包装：</span><span ng-bind="goods.packaging">盘装</span></p>
-														<p class="title"><span>生产日期：</span><span ng-bind="goods.produceDate">20160123</span></p>
+														<p class="title"><span>生产日期：</span><span ng-bind="goods.produceDate" title="{{goods.produceDate}}">20160123</span></p>
 														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
 													</div>
 													<div class="content width130">
 														<p class="title"><span style="width:84px">库存：</span><span ng-bind="goods.reserve">9023492</span></p>
 														<p class="title"><span style="width:84px">最小起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
 														<p class="title"><span style="width:84px">最小包装数：</span><span ng-bind="goods.minPackQty">980</span></p>
-														<p class="title"><span style="width:84px">规格：</span><span ng-bind="goods.spec">980</span></p>
+														<p class="title"><span style="width:84px">规格：</span><span ng-bind="goods.spec" title="{{goods.spec}}">980</span></p>
 													</div>
 													<div class="content width150">
 														<div class="title-price">
@@ -2353,7 +2353,7 @@
 														</div>
 														<div class="input-list">
 															<span class="tit"  style="width: 84px">规格：</span><input class="width70 form-control" name="spec" title="规格"  placeholder="数量" ng-model="goods.spec"
-																																		maxlength="40" oninput="if(value.length>40)value=value.slice(0,6)"
+																																		maxlength="20"
 																																		style="width: 70px;"/>
 														</div>
 													</div>

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

@@ -1206,7 +1206,7 @@
                                         </span>
                                     </div>
                                     <div>
-                                        <span><input type="text" ng-change="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="11" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>
+                                        <span><input type="text" ng-change="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="12" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>
                                     </div>
                                     <div>
                                         <span>可拆卖:</span>
@@ -1231,7 +1231,7 @@
                                     <div>
                                         <span style="width: 32px;">规格: </span>
                                         <span><input style="width:90px" type="text"
-                                                     ng-class="{'error' : !commodity.spec}" placeholder="请输入规格" maxlength="40" ng-model="commodity.spec" class="wid48 form-control"/></span>
+                                                     ng-class="{'error' : !commodity.spec}" placeholder="请输入规格" maxlength="20" ng-model="commodity.spec" class="wid48 form-control"/></span>
                                     </div>
                                 </div>
                                 <div class="content-show width135">

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

@@ -645,7 +645,7 @@
                                     <td>
                                         <div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
                                         <div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
-                                        <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackQty | number"></span></div>
+                                        <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>
                                         <!--<div>倍数/价格：&nbsp;-->
                                             <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
                                             <!--<span ng-if="batchCommodity.usdMinPackPrice">-->