JiangChongBo 2 år sedan
förälder
incheckning
dec18eec0b

+ 12 - 12
src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -356,18 +356,18 @@ public class ProductNewController extends BaseController {
         List<CmShop> shopList = productService.findSepcialShopList();
         Map<String, Object> classify = productService.findClassify(1);
         //设置产品能否退货状态   (产品:私密产品  , 耗材    仪器:私密  , 配件 默认不能)
-        if(null!=classify&&classify.size()>0){
-            List<CmBigtype> bigTypeList= (List<CmBigtype>) classify.get("bigTypeList");
-            if(null!=bigTypeList&&bigTypeList.size()>0){
-                bigTypeList.forEach(b ->{
-                    if("1014".equals(b.getBigTypeID())||"1021".equals(b.getBigTypeID())||"1016".equals(b.getBigTypeID())||"1023".equals(b.getBigTypeID())){
-                        product.setReturnGoodsStutas(2);
-                    }else{
-                        product.setReturnGoodsStutas(1);
-                    }
-                });
-            }
-        }
+//        if(null!=classify&&classify.size()>0){
+//            List<CmBigtype> bigTypeList= (List<CmBigtype>) classify.get("bigTypeList");
+//            if(null!=bigTypeList&&bigTypeList.size()>0){
+//                bigTypeList.forEach(b ->{
+//                    if("1014".equals(b.getBigTypeID())||"1021".equals(b.getBigTypeID())||"1016".equals(b.getBigTypeID())||"1023".equals(b.getBigTypeID())){
+//                        product.setReturnGoodsStutas(2);
+//                    }else{
+//                        product.setReturnGoodsStutas(1);
+//                    }
+//                });
+//            }
+//        }
         List<Province> provinceList = areaService.loadProvince();
         List<CmProductCombination> combinationList = cmProductCombinationService.findProductCombinationList();
 

+ 68 - 21
src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -526,6 +526,10 @@
 			margin-left: 27px !important;
 			margin-top: 14px;
 		}
+		.video{
+			margin-left: 95px;
+			margin-top: 80px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -1233,12 +1237,10 @@
 				</div>
 			</c:forEach>
 		</div>
-	</div>
-	<div class="control-group">
-		<div class="control-group">
-			<label class="control-label keyClass">相关视频(各视频大小不超过50M,最多上传6个)</label>
+		<div class="control-label">
+			<label class="control-label keyClass" style="margin-left: 90px">概述视频(各视频大小不超过50M,最多上传6个)</label>
 		</div>
-		<div class="control-group">
+		<div class="control-group video">
 			<label class="control-label">标题:</label>
 			<div class="controls">
 				<input id="fileTitle" htmlEscape="false" type="text">
@@ -1256,8 +1258,6 @@
 					<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">
 				</div>
 			</div>
-		</div>
-		<div class="control-group">
 			<div id='file-list-display' style="margin-left:180px">
 				<c:if test="${not empty cmBaikeProduct.videoList}">
 					<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">
@@ -1270,10 +1270,46 @@
 			</div>
 		</div>
 	</div>
+<%--	<div class="control-group">--%>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label keyClass">概述视频(各视频大小不超过50M,最多上传6个)</label>--%>
+<%--		</div>--%>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label">标题:</label>--%>
+<%--			<div class="controls">--%>
+<%--				<input id="fileTitle" htmlEscape="false" type="text">--%>
+<%--			</div>--%>
+<%--			<label class="control-label" style="margin-top:10px">视频路径:</label>--%>
+<%--			<div class="controls" style="margin-top:10px;width: 600px;">--%>
+<%--				<input id="uploadFileName" type="text" style="display: inline;" placeholder="支持mp4" disabled="true" class="input-xlarge required" />--%>
+<%--				<div class="upload">--%>
+<%--					<input type="file" name="file" id="productFile" accept=".mp4" >选择文件--%>
+<%--				</div>--%>
+<%--				<div class="add-submit">--%>
+<%--					<input id="addSubmit" type="button" value="上传"/>上传&nbsp;--%>
+<%--				</div>--%>
+<%--				<div class="upload-loading">--%>
+<%--					<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--		<div class="control-group">--%>
+<%--			<div id='file-list-display' style="margin-left:180px">--%>
+<%--				<c:if test="${not empty cmBaikeProduct.videoList}">--%>
+<%--					<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">--%>
+<%--						<p>${videoFile.fileTitle}--%>
+<%--							<span class="del"><a onclick="previewVideo('${videoFile.ossUrl}')">预览</a></span>--%>
+<%--							<span class="del" onclick="dataDelete(this,'${videoFile.id}')">删除</span>--%>
+<%--						</p>--%>
+<%--					</c:forEach>--%>
+<%--				</c:if>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--	</div>--%>
 	<%--信息栏--%>
 	<div class="control-group paramList" id="paramList">
-		<label class="control-label titleClass">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
-		<div class="controls add-button"><button class="btn btn-primary" type="button">增加信息项</button></div>
+		<label class="control-label titleClass" style="margin-left: 90px">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
+		<div class="controls add-button"><button class="btn btn-primary" type="button" style="margin-left: 20px">增加信息项</button></div>
 		<div class="controls param-controls not-overflow"></div>
 	</div>
 	<%--正文--%>
@@ -1527,15 +1563,26 @@
 	}
 	// 初始化信息栏
 	function initParamList(){
-		<c:forEach items="${cmBaikeProduct.paramList}" var="videoFile" varStatus="statusIndex">
-		var index=${statusIndex.index}
+		var te='${cmBaikeProduct.paramList}';
+		if(''==te ||null==te ||te=='[]') {
+			var paramList=[{},{},{}]
+			paramList.forEach(function(item, index){
 				paramItemIndex = index
-		var paramItem = createParamItem(index)
-		$('#paramList .param-controls').append(paramItem)
-		createContentEdit('#param-' + index,'${videoFile.content}')
-		console.log('${videoFile.name}')
-		$('#paramName-'+index).val('${videoFile.name}')
-		</c:forEach>
+				var paramItem = createParamItem(index)
+				$('#paramList .param-controls').append(paramItem)
+				createContentEdit('#param-' + index)
+			})
+		}else{
+			<c:forEach items="${cmBaikeProduct.paramList}" var="videoFile" varStatus="statusIndex">
+			var index=${statusIndex.index}
+					paramItemIndex = index
+			var paramItem = createParamItem(index)
+			$('#paramList .param-controls').append(paramItem)
+			createContentEdit('#param-' + index,'${videoFile.content}')
+			console.log('${videoFile.name}')
+			$('#paramName-'+index).val('${videoFile.name}')
+			</c:forEach>
+		}
 		// paramList.forEach(function(item, index){
 		// 	paramItemIndex = index
 		// 	var paramItem = createParamItem(index)
@@ -1562,7 +1609,7 @@
 			input = $('<input type="text" />')
 			input.attr('id', inputId)
 			input.attr('name', 'textInfolist[' + index + '].dictionaryContent')
-			var placeholder = type == 1 ? '一级目录' : '二级目录'
+			var placeholder = type == 1 ? '一级标题' : '二级标题'
 			input.attr('placeholder', placeholder)
 			inputType=$('<input type="text" />')
 			inputType.attr('name','textInfolist[' + index + '].dictionaryType')
@@ -1570,9 +1617,9 @@
 			inputType.attr('style','display: none')
 		}
 		var control = $('<div class="bk-textInfo-control"></div>')
-		var first = $('<span>一级目录</span>')
-		var second = $('<span>二级目录</span>')
-		var content = $('<span>内容</span>')
+		var first = $('<span>+一级标题</span>')
+		var second = $('<span>+二级标题</span>')
+		var content = $('<span>+内容</span>')
 		var deleteBtn = $('<span>删除</span>')
 		control.append([first, second, content, deleteBtn])
 		textInfoItem.append([input,inputType,control])

+ 50 - 13
src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -526,6 +526,10 @@
 			margin-left: 27px !important;
 			margin-top: 14px;
 		}
+		.video{
+			margin-left: 95px;
+			margin-top: 80px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -1233,12 +1237,10 @@
 				</div>
 			</c:forEach>
 		</div>
-	</div>
-	<div class="control-group">
-		<div class="control-group">
-			<label class="control-label keyClass">相关视频(各视频大小不超过50M,最多上传6个)</label>
+		<div class="control-label">
+			<label class="control-label keyClass" style="margin-left: 90px">概述视频(各视频大小不超过50M,最多上传6个)</label>
 		</div>
-		<div class="control-group">
+		<div class="control-group video">
 			<label class="control-label">标题:</label>
 			<div class="controls">
 				<input id="fileTitle" htmlEscape="false" type="text">
@@ -1256,8 +1258,6 @@
 					<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">
 				</div>
 			</div>
-		</div>
-		<div class="control-group">
 			<div id='file-list-display' style="margin-left:180px">
 				<c:if test="${not empty cmBaikeProduct.videoList}">
 					<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">
@@ -1269,11 +1269,48 @@
 				</c:if>
 			</div>
 		</div>
+
 	</div>
+<%--	<div class="control-group">--%>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label keyClass">相关视频(各视频大小不超过50M,最多上传6个)</label>--%>
+<%--		</div>--%>
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label">标题:</label>--%>
+<%--			<div class="controls">--%>
+<%--				<input id="fileTitle" htmlEscape="false" type="text">--%>
+<%--			</div>--%>
+<%--			<label class="control-label" style="margin-top:10px">视频路径:</label>--%>
+<%--			<div class="controls" style="margin-top:10px;width: 600px;">--%>
+<%--				<input id="uploadFileName" type="text" style="display: inline;" placeholder="支持mp4" disabled="true" class="input-xlarge required" />--%>
+<%--				<div class="upload">--%>
+<%--					<input type="file" name="file" id="productFile" accept=".mp4" >选择文件--%>
+<%--				</div>--%>
+<%--				<div class="add-submit">--%>
+<%--					<input id="addSubmit" type="button" value="上传"/>上传&nbsp;--%>
+<%--				</div>--%>
+<%--				<div class="upload-loading">--%>
+<%--					<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--		<div class="control-group">--%>
+<%--			<div id='file-list-display' style="margin-left:180px">--%>
+<%--				<c:if test="${not empty cmBaikeProduct.videoList}">--%>
+<%--					<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">--%>
+<%--						<p>${videoFile.fileTitle}--%>
+<%--							<span class="del"><a onclick="previewVideo('${videoFile.ossUrl}')">预览</a></span>--%>
+<%--							<span class="del" onclick="dataDelete(this,'${videoFile.id}')">删除</span>--%>
+<%--						</p>--%>
+<%--					</c:forEach>--%>
+<%--				</c:if>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--	</div>--%>
 	<%--信息栏--%>
 	<div class="control-group paramList" id="paramList">
-		<label class="control-label titleClass">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
-<%--		<div class="controls add-button"><button class="btn btn-primary" type="button">增加信息项</button></div>--%>
+		<label class="control-label titleClass" style="margin-left: 90px">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
+		<div class="controls add-button"><button class="btn btn-primary" type="button" style="margin-left: 20px">增加信息项</button></div>
 		<div class="controls param-controls not-overflow"></div>
 	</div>
 	<%--正文--%>
@@ -1554,7 +1591,7 @@
 			input = $('<input type="text" />')
 			input.attr('id', inputId)
 			input.attr('name', 'textInfolist[' + index + '].dictionaryContent')
-			var placeholder = type == 1 ? '一级目录' : '二级目录'
+			var placeholder = type == 1 ? '一级标题' : '二级标题'
 			input.attr('placeholder', placeholder)
 			inputType=$('<input type="text" />')
 			inputType.attr('name','textInfolist[' + index + '].dictionaryType')
@@ -1562,9 +1599,9 @@
 			inputType.attr('style','display: none')
 		}
 		var control = $('<div class="bk-textInfo-control"></div>')
-		var first = $('<span>一级目录</span>')
-		var second = $('<span>二级目录</span>')
-		var content = $('<span>内容</span>')
+		var first = $('<span>+一级标题</span>')
+		var second = $('<span>+二级标题</span>')
+		var content = $('<span>+内容</span>')
 		var deleteBtn = $('<span>删除</span>')
 		control.append([first, second, content, deleteBtn])
 		textInfoItem.append([input,inputType,control])

+ 69 - 21
src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -390,7 +390,7 @@
 			line-height: 30px;
 			font-size: 14px;
 			color: #333333;
-			margin: 0;
+			margin-left: 80px;
 		}
 
 		#file-list-display p .del {
@@ -526,6 +526,10 @@
 			margin-left: 27px !important;
 			margin-top: 14px;
 		}
+		.video{
+			margin-left: 95px;
+			margin-top: 80px;
+		}
 	</style>
 	<script type="text/javascript">
 		//显示弹框,并且根据结果是true或false来更改标题部分的颜色
@@ -1233,13 +1237,11 @@
 					</div>
 				</c:forEach>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="control-group">
-				<label class="control-label keyClass">相关视频(各视频大小不超过50M,最多上传6个)</label>
+			<div class="control-label">
+				<label class="control-label keyClass" style="margin-left: 90px">概述视频(各视频大小不超过50M,最多上传6个)</label>
 			</div>
-			<div class="control-group">
-				<label class="control-label">标题:</label>
+			<div class="control-group video">
+			<label class="control-label">标题:</label>
 				<div class="controls">
 					<input id="fileTitle" htmlEscape="false" type="text">
 				</div>
@@ -1256,8 +1258,6 @@
 						<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">
 					</div>
 				</div>
-			</div>
-			<div class="control-group">
 				<div id='file-list-display' style="margin-left:180px">
 					<c:if test="${not empty cmBaikeProduct.videoList}">
 						<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">
@@ -1269,11 +1269,48 @@
 					</c:if>
 				</div>
 			</div>
+
 		</div>
+<%--		<div class="control-group">--%>
+<%--			<div class="control-group">--%>
+<%--				<label class="control-label keyClass">相关视频(各视频大小不超过50M,最多上传6个)</label>--%>
+<%--			</div>--%>
+<%--			<div class="control-group">--%>
+<%--				<label class="control-label">标题:</label>--%>
+<%--				<div class="controls">--%>
+<%--					<input id="fileTitle" htmlEscape="false" type="text">--%>
+<%--				</div>--%>
+<%--				<label class="control-label" style="margin-top:10px">视频路径:</label>--%>
+<%--				<div class="controls" style="margin-top:10px;width: 600px;">--%>
+<%--					<input id="uploadFileName" type="text" style="display: inline;" placeholder="支持mp4" disabled="true" class="input-xlarge required" />--%>
+<%--					<div class="upload">--%>
+<%--						<input type="file" name="file" id="productFile" accept=".mp4" >选择文件--%>
+<%--					</div>--%>
+<%--					<div class="add-submit">--%>
+<%--						<input id="addSubmit" type="button" value="上传"/>上传&nbsp;--%>
+<%--					</div>--%>
+<%--					<div class="upload-loading">--%>
+<%--						<img alt="gif" src="/static/images/upload.gif" width="32px" border="none">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--			<div class="control-group">--%>
+<%--				<div id='file-list-display' style="margin-left:180px">--%>
+<%--					<c:if test="${not empty cmBaikeProduct.videoList}">--%>
+<%--						<c:forEach items="${cmBaikeProduct.videoList}" var="videoFile" varStatus="statusIndex">--%>
+<%--							<p>${videoFile.fileTitle}--%>
+<%--								<span class="del"><a onclick="previewVideo('${videoFile.ossUrl}')">预览</a></span>--%>
+<%--								<span class="del" onclick="dataDelete(this,'${videoFile.id}')">删除</span>--%>
+<%--							</p>--%>
+<%--						</c:forEach>--%>
+<%--					</c:if>--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--		</div>--%>
 		<%--信息栏--%>
 		<div class="control-group paramList" id="paramList">
-			<label class="control-label titleClass">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
-			<div class="controls add-button"><button class="btn btn-primary" type="button">增加信息项</button></div>
+			<label class="control-label titleClass" style="margin-left: 90px">信息栏:(注:未填写的信息将不会显示在词条页上)</label>
+			<div class="controls add-button"><button class="btn btn-primary" type="button" style="margin-left: 20px">增加信息项</button></div>
 			<div class="controls param-controls not-overflow"></div>
 		</div>
 		<%--正文--%>
@@ -1527,15 +1564,26 @@
 	}
 	// 初始化信息栏
 	function initParamList(){
-		<c:forEach items="${cmBaikeProduct.paramList}" var="videoFile" varStatus="statusIndex">
-				var index=${statusIndex.index}
+		var te='${cmBaikeProduct.paramList}';
+		if(''==te ||null==te ||te=='[]') {
+			var paramList=[{},{},{}]
+			paramList.forEach(function(item, index){
 				paramItemIndex = index
 				var paramItem = createParamItem(index)
 				$('#paramList .param-controls').append(paramItem)
-				createContentEdit('#param-' + index,'${videoFile.content}')
-				console.log('${videoFile.name}')
-				$('#paramName-'+index).val('${videoFile.name}')
-		</c:forEach>
+				createContentEdit('#param-' + index)
+			})
+		}else{
+			<c:forEach items="${cmBaikeProduct.paramList}" var="videoFile" varStatus="statusIndex">
+			var index=${statusIndex.index}
+					paramItemIndex = index
+			var paramItem = createParamItem(index)
+			$('#paramList .param-controls').append(paramItem)
+			createContentEdit('#param-' + index,'${videoFile.content}')
+			console.log('${videoFile.name}')
+			$('#paramName-'+index).val('${videoFile.name}')
+			</c:forEach>
+		}
 		// paramList.forEach(function(item, index){
 		// 	paramItemIndex = index
 		// 	var paramItem = createParamItem(index)
@@ -1562,7 +1610,7 @@
 			input = $('<input type="text" />')
 			input.attr('id', inputId)
 			input.attr('name', 'textInfolist[' + index + '].dictionaryContent')
-			var placeholder = type == 1 ? '一级目录' : '二级目录'
+			var placeholder = type == 1 ? '一级标题' : '二级标题'
 			input.attr('placeholder', placeholder)
 			inputType=$('<input type="text" />')
 			inputType.attr('name','textInfolist[' + index + '].dictionaryType')
@@ -1570,9 +1618,9 @@
 			inputType.attr('style','display: none')
 		}
 		var control = $('<div class="bk-textInfo-control"></div>')
-		var first = $('<span>一级目录</span>')
-		var second = $('<span>二级目录</span>')
-		var content = $('<span>内容</span>')
+		var first = $('<span>+一级标题</span>')
+		var second = $('<span>+二级标题</span>')
+		var content = $('<span>+内容</span>')
 		var deleteBtn = $('<span>删除</span>')
 		control.append([first, second, content, deleteBtn])
 		textInfoItem.append([input,inputType,control])

+ 45 - 21
src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -1667,8 +1667,7 @@
         loadSmallType();
         trainingShow();
     }
-
-    var  con=0
+    var conn=0;
     function loadSmallType(id) {
         if (id) {
             $("#bigType").val(id);
@@ -1691,7 +1690,7 @@
                         $("#smallType").prev().find(".select2-chosen").text(smalltypeList[i].name);
                         setTimeout(function () {
                             loadTinyType(currentSmalltype);
-                            loadGoods();
+                            // loadGoods();
                         }, 500);
                     } else {
                         $("#smallType").append("<option value='" + smalltypeList[i].smallTypeID + "'>" + smalltypeList[i].name + "</option>");
@@ -1710,7 +1709,7 @@
             document.getElementById("s2id_smallType").style.cssText = "display: none";
         }
         loadTinyType();
-        loadGoods();
+        loadGoods(conn);
     }
 
     function loadTinyType(id) {
@@ -1747,26 +1746,51 @@
             $("#tinyType").removeClass("required");
         }
     }
-    function loadGoods(){
-            var bigType = $("#bigType").val();
-            console.log(bigType)
-            $("#goods").html("");
-            $("#goods").prev().find(".select2-chosen").text("请选择");
-            $("#goods").append("<option value=''>请选择</option>");
-            var not='不能';
-            var ye='能';
-            if(typeof (bigType) != "undefined" && bigType != ""){
-                if(bigType=='1014'||bigType=='1016'||bigType=='1021'||bigType=='1023'){
-                    $("#goods").append("<option value='1'>" + '能' + "</option>");
-                    $("#goods").append("<option selected value='2'>" + not + "</option>");
-                    $("#goods").prev().find(".select2-chosen").text(not);
-                }else{
-                    $("#goods").append("<option selected value='1'>" + ye + "</option>");
-                    $("#goods").append("<option value='2'>" + '不能' + "</option>");
-                    $("#goods").prev().find(".select2-chosen").text(ye);
+    function loadGoods(id){
+            var bigType=null;
+            if(id==1){
+                bigType='${product.returnGoodsStutas}'
+                $("#goods").html("");
+                $("#goods").prev().find(".select2-chosen").text("请选择");
+                $("#goods").append("<option value=''>请选择</option>");
+                var not='不能';
+                var ye='能';
+                if(typeof (bigType) != "undefined" && bigType != ""){
+                    if(bigType=='2'){
+                        $("#goods").append("<option value='1'>" + '能' + "</option>");
+                        $("#goods").append("<option selected value='2'>" + not + "</option>");
+                        $("#goods").prev().find(".select2-chosen").text(not);
+                    }else{
+                        $("#goods").append("<option selected value='1'>" + ye + "</option>");
+                        $("#goods").append("<option value='2'>" + '不能' + "</option>");
+                        $("#goods").prev().find(".select2-chosen").text(ye);
+                    }
+                }
+            }else{
+                bigType = $("#bigType").val();
+                $("#goods").html("");
+                $("#goods").prev().find(".select2-chosen").text("请选择");
+                $("#goods").append("<option value=''>请选择</option>");
+                var not='不能';
+                var ye='能';
+                if(typeof (bigType) != "undefined" && bigType != ""){
+                    if(bigType=='1014'||bigType=='1016'||bigType=='1021'||bigType=='1023'){
+                        $("#goods").append("<option value='1'>" + '能' + "</option>");
+                        $("#goods").append("<option selected value='2'>" + not + "</option>");
+                        $("#goods").prev().find(".select2-chosen").text(not);
+                    }else{
+                        $("#goods").append("<option selected value='1'>" + ye + "</option>");
+                        $("#goods").append("<option value='2'>" + '不能' + "</option>");
+                        $("#goods").prev().find(".select2-chosen").text(ye);
+                    }
                 }
             }
+            conn++;
     }
+    <%--window.onload=function () {--%>
+    <%--    console.log('-----------------------onload')--%>
+    <%--    $("#goods").val('${product.returnGoodsStutas}')--%>
+    <%--}--%>
     //验证字符串最大长度
     function checkmaxlength(str) {
         var realLength = 0;