Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/prod/commodity/constant/ErrorInfoConstant.java

@@ -16,11 +16,12 @@ public enum  ErrorInfoConstant {
     BREAK_UP_INFO("C列:请选择可拆卖情况是或否"),
     RESERVE_NUMBER_INFO("D列:库存须填写小于10亿的正整数"),
     PRODUCE_DATE_INFO("E列:生产日期不能为空"),
+    PACKAGE_NOT_EXIST_INFO("F列:包装方式不存在"),
     PACKAGE_METHOD_INFO("F列:包装方式只能填写中英文"),
     PACKAGE_EMPTY_INFO("F列:包装方式不能为空"),
     PERSON_PACKAGE_EMPTY_INFO("C列:规格信息不能为空"),
     DELIVERY_EMPTY_INFO("G-H列:存在交期的信息为空"),
-    DELIVERY_VALUE_INFO("G-H列:交期只能填写1-31之间的整数值"),
+    DELIVERY_VALUE_INFO("G-H列:交期只能填写1-999之间的整数值"),
     PRICE_INFO("K列:单价必须是小于1万的正数"),
     MIN_PACKAGE_INFO("I列:最小包数量包含非数字字符"),
     REPEAT_IN_EXCEL("表格中已存在相同的产品");

src/main/java/com/uas/platform/b2c/prod/commodity/constant/ShortConstant.java

@@ -10,7 +10,7 @@ public class ShortConstant {
     /**
      * 最长交期
      */
-    public static final Short maxDelivery = 31;
+    public static final Short maxDelivery = 999;
 
     /**
      * 最短交期

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -19,6 +19,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -34,6 +35,17 @@ import java.util.regex.Pattern;
 @Table(name = "trade$releasebybatch")
 public class ReleaseProductByBatch implements Serializable {
 
+	/**
+	 * 可用包装方式列表
+	 */
+	private static final List<String> PACKAGING_LIST;
+
+	static {
+		String[] array = {"Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装",
+				"Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装"};
+		PACKAGING_LIST = Arrays.asList(array);
+	}
+
 	/**
 	 * 验证产品型号
 	 */
@@ -576,14 +588,17 @@ public class ReleaseProductByBatch implements Serializable {
 		setProductDate(productData);
 	}
 
-	public void setPackagingByExcel(Object value ,boolean isAPerson) {
+	public void setPackagingByExcel(Object value, boolean isAPerson) {
 		if (!StringUtils.isEmpty(value)) {
 			String packaging = value.toString();
 			if (!isAPerson) {
-				Matcher matcher = chineseAndEnglishPattern.matcher(packaging);
-				if (!matcher.find()) {
-					addErrmsg(ErrorInfoConstant.PACKAGE_METHOD_INFO.getInfo());
+				if (!PACKAGING_LIST.contains(packaging)) {
+					addErrmsg(ErrorInfoConstant.PACKAGE_NOT_EXIST_INFO.getInfo());
 				}
+//				Matcher matcher = chineseAndEnglishPattern.matcher(packaging);
+//				if (!matcher.find()) {
+//					addErrmsg(ErrorInfoConstant.PACKAGE_METHOD_INFO.getInfo());
+//				}
 			}
 		} else {
 			if (!isAPerson) {
@@ -593,13 +608,7 @@ public class ReleaseProductByBatch implements Serializable {
 			}
 		}
 		String packagingData = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(value));
-		if (!isAPerson) {
-			try {
-				packagingData = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(packagingData, 10);
-			} catch (UnsupportedEncodingException e) {
-				throw new RuntimeException(e + "指定字符集不支持");
-			}
-		} else {
+		if (isAPerson) {
 			try {
 				packagingData = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(packagingData, 150);
 			} catch (UnsupportedEncodingException e) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -246,14 +246,14 @@ public class GoodsServiceImpl implements GoodsService {
         if (goods.getPackaging() == null) {
             throw new IllegalOperatorException("包装信息为空");
         }
-        if (goods.getPackaging().length() > 10) {
-            throw new IllegalOperatorException("包装信息操作约定的10个字符");
-        }
-        if (!PatternUtil.matchChineseAndEnglish(goods.getPackaging())) {
-            throw new IllegalOperatorException("包装信息只能包含中文和英文");
-        }
-        if (goods.getProduceDate().length() > 11) {
-            throw new IllegalOperatorException("产品生产日期不能超过11个字符");
+//        if (goods.getPackaging().length() > 10) {
+//            throw new IllegalOperatorException("包装信息操作约定的10个字符");
+//        }
+//        if (!PatternUtil.matchChineseAndEnglish(goods.getPackaging())) {
+//            throw new IllegalOperatorException("包装信息只能包含中文和英文");
+//        }
+        if (goods.getProduceDate().length() > 12) {
+            throw new IllegalOperatorException("产品生产日期不能超过12个字符");
         }
         if (goods.getOriginal() == null) {
             throw new IllegalOperatorException("必须选择库存类型");

src/main/java/com/uas/platform/b2c/prod/store/controller/StoreInController.java

@@ -60,6 +60,17 @@ public class StoreInController {
 		return storeService.findByEnUU(enUU);
 	}
 
+	/**
+	 * 根据所属公司获取店铺信息
+	 *
+	 * @param enUU	所属公司UU
+	 */
+	@RequestMapping(value = "/byEnUU/uuid", method = RequestMethod.GET)
+	public String findUUidByEnUU(Long enUU) {
+		logger.info(String.format("Find uuid of store by enUU %d.", enUU));
+		return storeService.findUUidByEnUU(enUU);
+	}
+
 	/**
 	 * 依据店铺编号UUID获取店铺信息
 	 *

src/main/java/com/uas/platform/b2c/prod/store/service/StoreInService.java

@@ -38,6 +38,13 @@ public interface StoreInService {
 	 */
 	StoreIn findByEnUU(Long enUU);
 
+	/**
+	 * 根据enuu返回店铺的uuid
+	 * @param enUU	企业enuu
+	 * @return
+	 */
+	String findUUidByEnUU(Long enUU);
+
 	/**
 	 * 依据店铺编号UUID获取店铺信息
 	 *

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -184,6 +184,25 @@ public class StoreInServiceImpl implements StoreInService {
 		}
 	}
 
+	@Override
+	public String findUUidByEnUU(Long enUU) {
+		if (enUU == null) {
+			return sysConf.getStoreid();
+		}
+
+		List<StoreIn> storeIns = storeDao.findByEnUU(enUU);
+		if (CollectionUtils.isEmpty(storeIns)) {
+			return sysConf.getStoreid();
+		} else {
+			StoreIn store = storeIns.get(0);
+			if (StoreStatus.OPENED.equals(store.getStatus())) {
+				return store.getUuid();
+			} else {
+				return sysConf.getStoreid();
+			}
+		}
+	}
+
 	@Override
 	public StoreIn findByUuid(String uuid) {
 		logger.info("Start to execute find.");

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java

@@ -13,6 +13,7 @@ import com.uas.platform.b2c.trade.seek.model.SeekPurchaseByBatch;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseBomService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -63,6 +64,10 @@ public class SeekPurchaseBomController {
      */
     @RequestMapping(value = "/importBom", method = RequestMethod.POST)
     public ResultMap importBom(FileUpload uploadItem) {
+        User user = SystemSession.getUser();
+        if (user == null) {
+            throw new IllegalOperatorException("请先登录");
+        }
         String fileName = uploadItem.getFile().getOriginalFilename();
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         String bomName = fileName.substring(0, fileName.lastIndexOf("."));

src/main/webapp/resources/js/common/query/storeInfo.js

@@ -88,6 +88,10 @@ define([ 'ngResource' ], function() {
                     filter : 'enUU'
                 }
             },
+			getUuidByEnuu: {
+				url: 'store-service/byEnUU/uuid',
+				method: 'GET'
+			},
             // 分页获取店铺信息
             findStoresByPage : {
                 url : 'api/store-service/stores',

src/main/webapp/resources/js/vendor/app.js

@@ -954,25 +954,27 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 配送规则提示共用控制器
 	 */
-	app.controller('rule_tip_ctrl', ['$scope', 'toaster', '$modalInstance', 'type', 'tipModal', function ($scope, toaster, $modalInstance, type, tipModal) {
+	app.controller('rule_tip_ctrl', ['$scope', 'toaster', '$modalInstance', 'type', 'tipModal', 'success', 'uuid', function ($scope, toaster, $modalInstance, type, tipModal, success, uuid) {
 		$scope.tipModal = tipModal;
 		$scope.type = type;
+		$scope.success = success;
+		$scope.uuid = uuid;
 
 		$scope.cancelDelete = function () {
 			$scope.tipModal = false;
 			$modalInstance.dismiss();
 		};
 
-		$scope.hrefToRule = function () {
+		$scope.hrefToNext = function (url) {
 			$modalInstance.dismiss();
-			window.location.href = 'vendor#vendor_deliveryRule';
+			window.location.href = url;
 		};
 
 		/**
 		 * 监听点击的事件
 		 */
 		document.onclick = function (event) {
-			if($scope.tipModal) {
+			if ($scope.tipModal) {
 				if(event) {
 					var tag = event.target;
 					if(tag) {

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

@@ -120,6 +120,12 @@ define(['app/app', 'calendar'], function(app) {
                                 },
                                 tipModal : function() {
                                     return true;
+                                },
+                                success : function () {
+                                    return false;
+                                },
+                                uuid: function () {
+                                    return null;
                                 }
                             }
                         });

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

@@ -38,6 +38,18 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		 * @type {number}
 		 */
 		$scope.maxReserve = 999999999;
+
+		$scope.packageArray = ["请选择", "Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装",
+			"Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装"];
+
+		$scope.showText = function (item) {
+			$scope.goods.editPackaging = item;
+		};
+		
+		$scope.showClickText = function (goods, item) {
+			goods.editPackaging = item;
+		};
+
 		/**
 		 * 最小包装量的最大值
 		 */
@@ -1284,27 +1296,27 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
                 toaster.pop('warning', '提示', '标签信息超过了20个字符');
                 return result;
             }
-            if (!goods.editPackaging) {
+            if (!goods.editPackaging || goods.editPackaging == '请选择') {
                 goods.editPackagingInvalid = true;
-                toaster.pop('warning', '提示', '请填写包装方式');
-                return result;
-            }
-            if (!pattern.test(goods.editPackaging)) {
-                goods.editPackagingInvalid = true;
-                toaster.pop('warning', '提示', '包装方式仅能包含中文和英文字符');
-                return result;
-            }
-            if (goods.editPackaging.length > 10) {
-                goods.editPackagingInvalid = true;
-                toaster.pop('warning', '提示', '包装方式不能超过10个字符');
+                toaster.pop('warning', '提示', '请选择包装方式');
                 return result;
             }
+            // if (!pattern.test(goods.editPackaging)) {
+            //     goods.editPackagingInvalid = true;
+            //     toaster.pop('warning', '提示', '包装方式仅能包含中文和英文字符');
+            //     return result;
+            // }
+            // if (goods.editPackaging.length > 10) {
+            //     goods.editPackagingInvalid = true;
+            //     toaster.pop('warning', '提示', '包装方式不能超过10个字符');
+            //     return result;
+            // }
             if (!goods.editProduceDate) {
                 goods.editProduceDateInvalid = true;
                 toaster.pop('warning', '提示', '请填写生产日期');
                 return result;
             }
-            if (goods.editProduceDate.length > 11) {
+            if (goods.editProduceDate.length > 12) {
                 goods.editProduceDateInvalid = true;
                 toaster.pop('warning', '提示', '生产日期不能超过12个字符');
                 return result;
@@ -1450,31 +1462,31 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
         $scope.compareNum = function(min, max, type, goods) {
             if(!min) {
                 goods.editMinDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }else if(!max) {
                 goods.editMaxDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }
             if(!$scope.isInt.test(min)) {
                 goods.editMinDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }
             if(!$scope.isInt.test(max)) {
                 goods.editMaxDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }
-            if(min < 1 || min > 31) {
+            if(min < 1 || min > 999) {
                 goods.editMinDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的值');
                 return false;
             }
-            if(max < 1 || max > 31) {
+            if(max < 1 || max > 999) {
                 goods.editMaxDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期的时间必须是1-31之内');
+                toaster.pop('warning', '提示', '交期的时间必须是1-999之内');
                 return false;
             }
             if(Number(min) > Number(max)) {
@@ -1630,6 +1642,12 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 								},
 								tipModal : function() {
 									return true;
+								},
+								success : function () {
+									return false;
+								},
+								uuid: function () {
+									return null;
 								}
 							}
 						});
@@ -2519,7 +2537,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 					}
                     if(!$scope.isInt.test(min)) {
 						if(!$scope.$$nonProduct.enterSaveButton) {
-							toaster.pop('warning', '提示', '交期请输入1-31的整数');
+							toaster.pop('warning', '提示', '交期请输入1-999的整数');
 							goods.editMinDeliveryinValid = true;
 						}
                     }
@@ -2535,7 +2553,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 					}
                     if(!$scope.isInt.test(max)) {
 						if(!$scope.$$nonProduct.enterSaveButton) {
-							toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+							toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
 							goods.editMaxDeliveryinValid = true;
 						}
                     }
@@ -2543,14 +2561,14 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
                 }
 
             }
-            if(day > 31 || day < 1) {
+            if(day > 999 || day < 1) {
 				if(!$scope.$$nonProduct.enterSaveButton) {
 					if(isMin) {
 						goods.editMinDeliveryinValid = true;
 					}else {
 						goods.editMaxDeliveryinValid = true;
 					}
-					toaster.pop('warning', '提示', '交期的值必须在1-31天');
+					toaster.pop('warning', '提示', '交期的值必须在1-999天');
 				}
                 return ;
             }

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

@@ -1453,7 +1453,13 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 								},
 								tipModal : function() {
 									return true;
-								}
+								},
+                                success : function () {
+                                    return false;
+                                },
+                                uuid: function () {
+                                    return null;
+                                }
 							}
 						});
 						return ;

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

@@ -9,6 +9,9 @@ define([ 'app/app' ], function(app) {
         //数字的正则表达式
         var intPattern = /^[1-9]+$/;
 
+        $scope.packageArray = ["Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装",
+            "Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装"];
+
         //只包含中文和英文的字符
         var pattern = /^[\u4e00-\u9fa5a-zA-Z]+$/;
         $scope.param = {
@@ -876,6 +879,12 @@ define([ 'app/app' ], function(app) {
                             },
                             tipModal : function() {
                                 return true;
+                            },
+                            success : function () {
+                                return false;
+                            },
+                            uuid: function () {
+                                return null;
                             }
                         }
                     });
@@ -983,22 +992,22 @@ define([ 'app/app' ], function(app) {
             }
             if(!$scope.isInt.test(min)) {
                 commodity.editMinDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }
             if(!$scope.isInt.test(max)) {
                 commodity.editMaxDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                 return false;
             }
-            if(min < 1 || min > 31) {
+            if(min < 1 || min > 999) {
                 commodity.editMinDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期只能填写1-31之间的值');
+                toaster.pop('warning', '提示', '交期只能填写1-999之间的值');
                 return false;
             }
-            if(max < 1 || max > 31) {
+            if(max < 1 || max > 999) {
                 commodity.editMaxDeliveryinValid = true;
-                toaster.pop('warning', '提示', '交期的时间必须是1-31之内');
+                toaster.pop('warning', '提示', '交期的时间必须是1-999之内');
                 return false;
             }
             if(Number(min) > Number(max)) {
@@ -1034,7 +1043,7 @@ define([ 'app/app' ], function(app) {
                     if(!$scope.isInt.test(min)) {
                         if(!$scope.enterSaveButton) {
                             commodity.editMinDeliveryinValid = true;
-                            toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                            toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                         }
                     }
                     return ;
@@ -1049,16 +1058,16 @@ define([ 'app/app' ], function(app) {
                     if(!$scope.isInt.test(max)) {
                         if (!$scope.enterSaveButton) {
                             commodity.editMaxDeliveryinValid = true;
-                            toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                            toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                         }
                     }
                     return ;
                 }
 
             }
-            if(day > 31 || day < 1) {
+            if(day > 999 || day < 1) {
                 if(!$scope.enterSaveButton) {
-                    toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
+                    toaster.pop('warning', '提示', '交期只能填写1-999之间的整数值');
                     if(isMin) {
                         commodity.editMinDeliveryinValid = true;
                     }else {
@@ -1161,22 +1170,22 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('warning', '提示', '请填写包装方式');
                 return result;
             }
-            if (!pattern.test(goods.editPackaging)) {
-                goods.editPackagingInvalid = true;
-                toaster.pop('warning', '提示', '包装方式仅能包含中文和英文字符');
-                return result;
-            }
-            if (goods.editPackaging.length > 10) {
-                goods.editPackagingInvalid = true;
-                toaster.pop('warning', '提示', '包装方式不能超过10个字符');
-                return result;
-            }
+            // if (!pattern.test(goods.editPackaging)) {
+            //     goods.editPackagingInvalid = true;
+            //     toaster.pop('warning', '提示', '包装方式仅能包含中文和英文字符');
+            //     return result;
+            // }
+            // if (goods.editPackaging.length > 10) {
+            //     goods.editPackagingInvalid = true;
+            //     toaster.pop('warning', '提示', '包装方式不能超过10个字符');
+            //     return result;
+            // }
             if (!goods.editProduceDate) {
                 goods.editProduceDateInvalid = true;
                 toaster.pop('warning', '提示', '请填写生产日期');
                 return result;
             }
-            if (goods.editProduceDate.length > 11) {
+            if (goods.editProduceDate.length > 12) {
                 goods.editProduceDateInvalid = true;
                 toaster.pop('warning', '提示', '生产日期不能超过12个字符');
                 return result;

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

@@ -15,6 +15,7 @@ define([ 'app/app' ], function(app) {
                 $state.reload();
             }
         };
+
         if ($location.$$search.type && $location.$$search.type == 'self') {
             $rootScope.$$productOn.tab = 'bathOnPerson';
         } else if ($location.$$search.type && $location.$$search.type == 'company'){
@@ -205,6 +206,16 @@ define([ 'app/app' ], function(app) {
             });
         });
 
+        // 返回店铺的uuid，未开店则返回寄售uuid
+        $q.all([getAuthentication()]).then(function() {
+            //获取店铺的信息
+            StoreInfo.getUuidByEnuu({enUU : $rootScope.userInfo.enterprise.uu}, function(data) {
+                $scope.storeUuid = data.data;
+            }, function(response) {
+                toaster.pop('error', '获取店铺的信息失败, ' + response.data);
+            });
+        });
+
 
         //选择文件
         $scope.selectFile = function(value) {
@@ -302,27 +313,25 @@ define([ 'app/app' ], function(app) {
         $scope.publish = function(event) {
             if ($scope.pageParams.totalElements > 0) {
                 ReleaseProductByBatch.batchRelease({batch : $scope.result.batch}, null, function(data) {
-                    if ($scope.needShowTip){
-                        $scope.relTableParams.page(1);
-                        $scope.relTableParams.reload();
-                        $scope.result.success = 0;//设置成0，让前端用户不能点击
-                        $modal.open({
-                            animation : true,
-                            templateUrl : 'static/view/common/modal/product_upload_modal.html',
-                            controller : 'rule_tip_ctrl',
-                            resolve : {
-                                type : function() {
-                                    return 'upload';
-                                },
-                                tipModal : function() {
-                                    return true;
-                                }
+                    $modal.open({
+                        animation : true,
+                        templateUrl : 'static/view/common/modal/product_upload_modal.html',
+                        controller : 'rule_tip_ctrl',
+                        resolve : {
+                            type : function() {
+                                return 'upload';
+                            },
+                            tipModal : function() {
+                                return true;
+                            },
+                            success : function () {
+                                return $scope.needShowTip;
+                            },
+                            uuid: function () {
+                                return $scope.storeUuid;
                             }
-                        });
-                        return ;
-                    }
-                    // toaster.pop("success", "提示", "发布成功 ：" + data.data + "条");
-                    toaster.pop("success", "提示", "发布成功");
+                        }
+                    });
                     $scope.relTableParams.page(1);
                     $scope.relTableParams.reload();
                     $scope.result.success = 0;//设置成0，让前端用户不能点击
@@ -339,7 +348,7 @@ define([ 'app/app' ], function(app) {
 
         function publicPersonProduct() {
             ReleaseProductByBatch.batchReleasePerson({batch : $scope.result.batch}, null, function(data) {
-                if ($scope.needShowTip){
+                if ($scope.needShowTip) {
                     $scope.relTableParams.page(1);
                     $scope.relTableParams.reload();
                     //$scope.result.success = 0;//设置成0，让前端用户不能点击
@@ -353,6 +362,12 @@ define([ 'app/app' ], function(app) {
                             },
                             tipModal : function() {
                                 return true;
+                            },
+                            success : function () {
+                                return false;
+                            },
+                            uuid: function () {
+                                return null;
                             }
                         }
                     });

src/main/webapp/resources/view/common/modal/product_upload_modal.html

@@ -6,20 +6,24 @@
         background-color: white;
         top: 55%;
         left: 50%;
-        height: 160px;
+        /*height: 160px;*/
         width: 290px;
         margin: -145px 0 0 -80px;
+        border: none;
     }
     .com-del-box{
-        height: 160px;
+        /*height: 160px;*/
         width: 290px;
     }
     .com-del-box .title {
+        width: 100%;
         height: 30px;
         background-color: #5078cb;
         text-align: right;
         padding-right: 15px;
         line-height: 30px;
+        border-top-left-radius: 5px;
+        border-top-right-radius: 5px;
     }
     .com-del-box .title a {
         color: white;
@@ -30,6 +34,7 @@
         width: 100%;
         text-align: center;
         margin: 0 auto;
+        box-shadow: 0 5px 15px rgba(0,0,0,.5);
     }
     .com-del-box .content p{
         font-size: 14px;
@@ -58,7 +63,7 @@
         text-align: center;
     }
     .com-del-box .content div a{
-        display: inline-block;
+        /*display: inline-block;*/
         margin-right: 15px ;
         width: 74px;
         height: 28px;
@@ -66,13 +71,16 @@
         text-align: center;
         font-size: 14px;
         color: #fff;
-    }
-    .com-del-box .content div a:first-child {
-        background: #c8c6c6;
-    }
-    .com-del-box .content div a:last-child {
+        padding: 3px;
         background: #5078cb;
     }
+   .com-del-box .content div a:first-child {
+        margin-right: 15px;
+    }
+    /*.com-del-box .content div a {*/
+        /*background: #5078cb;*/
+        /*border-radius: 0.5px;*/
+    /*}*/
     .modal{
         box-shadow: none!important ;
     }
@@ -95,31 +103,41 @@
         background-color: white;
         top: 55%;
         left: 50%;
-        height: 160px;
+        /*height: 160px;*/
         width: 290px;
         margin: -145px 0 0 -80px;
     }
     .com-del-box{
-        height: 160px;
+        /*height: 160px;*/
         width: 290px;
     }
     .com-del-box .product .info{
         margin: 0 auto;
         width: 100%;
         font-size: 16px;
-        font-weight: bold;
         color: #5078cb;
     }
     .com-del-box .product .info i{
         margin-right: 12px;
         font-size: 20px;
+        font-weight: bold;
+    }
+    .com-del-box .product .info span{
+        color: #333;
+    }
+    .com-del-box .product a:first-child{
+        margin-left: 14px;
+        padding: 5px 10px;
+        border-radius: 2px;
+    }
+    .com-del-box .product a:last-child{
+        padding: 5px 10px;
+        border-radius: 2px;
     }
     .com-del-box .product p{
         margin-bottom: -5px;
     }
-    .com-del-box .content div a:first-child{
-        margin-right: 0 !important;
-    }
+    /*.modal-dialog .modal-content*/
 </style>
 <div class="com-del-box" name="rule_model">
     <div class="title">
@@ -127,8 +145,9 @@
     </div>
     <!--产品导入-->
     <div class="content product">
-        <div class="info"><i class="fa fa-check-circle"></i>上架成功</div>
-        <p><span>您当前尚未设置配送规则，买家将无法下单，建议尽快设置！</span></p>
-        <div><a name="rule_href" ng-click="hrefToRule()">立即设置</a></div>
+        <div class="info"><i class="fa fa-check-circle"></i><span>上架成功</span></div>
+        <p ng-if="success"><span>您当前尚未设置配送规则，买家将无法下单，建议尽快设置 <a name="rule_href" ng-click="hrefToNext('vendor#vendor_deliveryRule')" style="color: blue;">前往设置</a></span></p>
+        <div style="margin-top: 10px;"><a name="rule_href" ng-click="hrefToNext('vendor#/vendor_material')" class="product-btn">前往企业库</a>
+        <a name="rule_href" ng-href="{{'store/' + uuid}}" class="product-btn">前往店铺首页</a></div>
     </div>
 </div>

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -759,7 +759,7 @@
 						</label>
 						<a ng-click="deleteById()">批量删除</a>
 						<!--<a ng-click="">申请样品</a>-->
-						<a ng-click="collect()">移入收藏</a>
+						<!--<a ng-click="collect()">移入收藏</a>-->
 						<a ng-click="deleteInvalid()">清空失效产品</a>
 					</div>
 					<div class="fr">
@@ -779,7 +779,7 @@
 						</label>
 						<a ng-click="deleteById()">批量删除</a>
 						<!--<a ng-click="">申请样品</a>-->
-						<a ng-click="collect()">移入收藏</a>
+						<!--<a ng-click="collect()">移入收藏</a>-->
 						<a ng-click="deleteInvalid()">清空失效产品</a>
 					</div>
 					<div class="fr">

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

@@ -694,7 +694,7 @@
                     <td class="operate">
                         <!--<a ng-click="setLinkBoxIndex($index)">联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>-->
                         <div ng-if="userInfo.enterprise.uu != seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-click="setSeekActive(seek, true, index)">我要报价</div>
-                        <div class="disable" ng-if="userInfo.enterprise.uu == seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" ng-disabled="true">我要报价</div>
+                        <div class="disable" ng-if="userInfo.enterprise.uu == seek.inquiry.enUU && seek.quoted != 1 && seek.remainingTime > 0" title="此为贵公司的求购" ng-disabled="true">我要报价</div>
                         <span ng-if="seek.quoted == 1">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
                         <!--<img ng-if="seek.quoted == 1" src="static/img/seekPurchase/recieved.png" alt="">-->
                     </td>

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

@@ -393,6 +393,43 @@
 	.edit-content div.floatLeft .input-list{
 		float: left;
 	}
+	.edit-content .input-list .dropdown{
+		position: relative;
+	}
+	.edit-content .input-list .button-select{
+		width: 96px;
+		height: 24px;
+		border: 1px solid #a9a9a9;
+		font-size: 12px;
+		text-align: center;
+	    padding: 0;
+	}
+	.edit-content .input-list .select-package{
+		width: 96px;
+		height: 24px;
+		border: 1px solid #a9a9a9;
+		font-size: 12px;
+		text-align: center;
+		border-radius: 3px;
+		padding-left: 6px;
+	}
+	.edit-content .input-list .button-option{
+		position: absolute;
+		top: 22px;
+		left: 69px;
+		height: 63px;
+		min-width: 119px;
+		overflow: auto;
+	}
+	.edit-content .input-list .button-option li{
+		height: 30px;
+		line-height: 30px;
+		padding: 0;
+	}
+	.edit-content .produceDate-fix{
+		position: relative;
+		top: 4px;
+	}
 	.edit-content div.margin10{
 		padding-top: 24px;
 	}
@@ -1686,7 +1723,7 @@
 						</td>
 					</tr>
 					<!--展开内容-->
-					<tr ng-if="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
+					<tr ng-show="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
 						<td colspan="7" style="padding: 0;">
 							<div class="show-content">
 								<div class="content-body">
@@ -1715,15 +1752,24 @@
                                                     <div class="content margin10">
                                                         <!--<p class="title">包装/生产日期</p>-->
                                                         <div class="input-list">
-                                                            <span class="tit">包装：</span><input type="text" class="form-control" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
-                                                                                               ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>
+                                                            <span class="tit">包装：</span><!--<input type="text" class="form-control" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+                                                                                               ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
+															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'"  class="select-adder select-package" title="包装">
+																<option ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</option>
+															</select>
+															<!--<div class="dropdown">
+																<input class="btn btn-default dropdown-toggle button-select select-adder" id="dropdownMenu2" type="text" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
+																<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu2">
+																	<li ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</li>
+																</ul>
+															</div>-->
                                                         </div>
-                                                        <div class="input-list">
+                                                        <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"
                                                                                                  ng-class="{'error' : goods.editProduceDateInvalid}"
                                                                                                  ng-change="editProduceDateFa(goods, false)"/>
                                                         </div>
-                                                        <div class="clearfix">
+                                                        <div class="clearfix produceDate-fix">
                                                             <span>可拆卖:</span>
                                                             <span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
                                                                                            ng-click="toggleIsBreadUp(goods, false)"></button></span>
@@ -1782,12 +1828,12 @@
                                                         <p class="title height29">交期(天)：</p>
                                                         <div class="input-list">
                                                             <p>
-											<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)"
+											<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)"
                                                          ng-model="goods.editMinDelivery"
                                                          ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)"
                                                          ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
                                                                 <span style="margin-left: 4px;">–</span>
-                                                                <span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
+                                                                <span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
                                                                              ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
                                                             </p>
                                                         </div>
@@ -1883,7 +1929,7 @@
 													自定义标签 : <input maxlength="20" type="text" ng-model="goods.editTag" ng-blur="blurTag(goods)" ng-change="changeTag(goods)" placeholder="请设置产品标签"></div>
 											</td>
 										</tr>
-										<tr class="edit-content edits" ng-if="goods.edit">
+										<tr class="edit-content edits" ng-show="goods.edit">
 											<td colspan="10" style="background:#f0f7fd;">
                                                 <div class="blue-bg">
 													<div></div>
@@ -1897,11 +1943,20 @@
 													<div class="content margin10">
 														<!--<p class="title">包装/生产日期</p>-->
 														<div class="input-list">
-															<span class="tit">包装：</span><input type="text" class="form-control" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+															<span class="tit">包装:</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
 																							   ng-class="{'error' : goods.editPackagingInvalid}"
-																							   ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>
+																							   ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
+															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package" title="包装">
+																<option ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</option>
+															</select>
+															<!--<div class="dropdown">
+																<input class="btn btn-default dropdown-toggle button-select select-adder" type="text" id="dropdownMenu1" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
+																<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu1">
+																	<li ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</li>
+																</ul>
+															</div>-->
 														</div>
-														<div class="input-list">
+														<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"
 																								 ng-class="{'error' : goods.editProduceDateInvalid}"
 																								 ng-change="editProduceDateFa(goods, true)"/>
@@ -1910,7 +1965,7 @@
 															<!--<option value="0">不可拆卖</option>-->
 															<!--</select>-->
 														</div>
-														<div class="clearfix">
+														<div class="clearfix produceDate-fix ">
 															<span>可拆卖:</span>
 															<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
 																						 ng-click="toggleIsBreadUp(goods, true)"></button></span>
@@ -1974,10 +2029,10 @@
 														<p class="title height29">交期(天)：</p>
 														<div class="input-list">
 															<p>
-																<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMinDelivery"
+																<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMinDelivery"
 																			 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)" ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
 																<span style="margin-left: 4px;">–</span>
-																<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery"
+																<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery"
 																			 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)" ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
 															</p>
 														</div>

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

@@ -643,6 +643,15 @@
         margin-top: 4px;
         float: left;
     }
+    .content-show .select-item{
+        width: 88px;
+        height: 24px;
+        border: 1px solid #a9a9a9;
+        font-size: 12px;
+        text-align: center;
+        border-radius: 3px;
+        padding-left: 6px;
+    }
     .wanted_list01 .tab table tr.edit-forms td .bg-show .width20{
         width: 20px;
     }
@@ -957,7 +966,11 @@
                                 </div>
                                 <div class="content-show width120">
                                     <div>
-                                        <span><input type="text" ng-blur="editPackaging(commodity, true)" ng-change="changePackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/></span>
+                                        <span><!--<input type="text" ng-blur="editPackaging(commodity, true)" ng-change="changePackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/>-->
+                                            <select ng-model="commodity.editPackaging" class="select-adder select-item" title="包装">
+                                                <option ng-repeat="item in packageArray" ng-click="showText(goods, item)">{{item}}</option>
+                                            </select>
+                                        </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>
@@ -1015,15 +1028,15 @@
                                 <div class="content-show width90">
                                     <div ng-if="onsale.currency == 'RMB'">
                                         <!--<span>大陆：</span>-->
-                                        <span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>
+                                        <span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
                                         <span>-</span>
-                                        <span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>
+                                        <span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
                                     </div>
                                     <div ng-if="onsale.currency == 'USD'">
                                         <!--<span>香港：</span>-->
-                                        <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>
+                                        <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
                                         <span>-</span>
-                                        <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>
+                                        <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
                                     </div>
                                 </div>
                                 <div class="content-show width70">
@@ -1038,12 +1051,10 @@
                                 </div>
                                 <div class="content-show width60">
                                     <div>
-                                    <span
-                                            name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
+                                    <span name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
                                     </div>
                                     <div>
-                                    <span
-                                            name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
+                                    <span name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
                                     </div>
                                 </div>
                             </div>