Merge remote-tracking branch 'origin/developer' into developerB

src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -42,6 +42,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 采美百科产品/仪器Controller
@@ -113,12 +115,21 @@ public class CmBaikeProductController extends BaseController {
 		CmBaikeType cmBaikeType = new CmBaikeType();
 		cmBaikeType.setTypeSort(cmBaikeProduct.getCommodityType());
 		cmBaikeType.setStatus(1);
+		//去除义项名，词条概述格式
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
 		// 分类列表
 		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
 		// 商品类型
 		String commodityType = "产品";
 		// 参数列表
 		List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
+		//去除信息栏内容格式
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
 		cmBaikeProduct.setParamList(paramList);
 		// 产品/仪器认证图片列表
 		List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -145,6 +156,14 @@ public class CmBaikeProductController extends BaseController {
 		String sensitiveWords = infoDao.getSensitiveWords(4);
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
+		//去除正文内容格式
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
@@ -361,6 +380,17 @@ public class CmBaikeProductController extends BaseController {
 		return map;
 	}
 
+	/**
+	 * 去除字符串格式
+	 * @param chara
+	 * @return
+	 */
+	public String removerFormat(String chara){
+		if(StringUtils.isNotEmpty(chara)){
+			chara=chara.replaceAll("\n","<br/>");
+		}
+		return chara;
+	}
 	/**
 	 * 有数据变动时需要清除缓存
 	 */
@@ -378,11 +408,20 @@ public class CmBaikeProductController extends BaseController {
 	 */
 	@RequestMapping(value = "check")
 	public String checkInfo(CmBaikeProduct cmBaikeProduct,Model model) {
+		//去除义项名，词条概述格式
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
 		model.addAttribute("cmBaikeProduct", cmBaikeProduct);
 		// 商品类型
 		String commodityType = cmBaikeProduct.getCommodityType() == 1 ? "产品" : "仪器";
 		// 参数列表
 		List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
+		//去除信息栏内容格式
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
 		cmBaikeProduct.setParamList(paramList);
 		// 产品/仪器认证图片列表
 		List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -400,6 +439,14 @@ public class CmBaikeProductController extends BaseController {
 		});
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
+		//去除正文内容格式
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
@@ -441,6 +488,12 @@ public class CmBaikeProductController extends BaseController {
 				cmBaikeProduct.setReferenceList(refrence);
 			}
 		}
+		// 分类列表
+		CmBaikeType cmBaikeType = new CmBaikeType();
+		cmBaikeType.setTypeSort(cmBaikeProduct.getCommodityType());
+		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
+		model.addAttribute("typeList", typeList);
+		// 敏感词
 		cmBaikeProduct.setVideoList(videoList);
 //		model.addAttribute("materialInfo", materialInfo);
 		model.addAttribute("commodityType", commodityType);
@@ -466,12 +519,21 @@ public class CmBaikeProductController extends BaseController {
 	 */
 	@RequestMapping(value = "toAuditPage")
 	public String toAuditPage(CmBaikeProduct cmBaikeProduct,Model model) {
+		//去除义项名，词条概述格式
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
         model.addAttribute("cmBaikeProduct", cmBaikeProduct);
         cmBaikeProduct.setPublishSource(2);
         // 商品类型
         String commodityType = cmBaikeProduct.getCommodityType() == 1 ? "产品" : "仪器";
         // 参数列表
         List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
+		//去除信息栏内容格式
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
         cmBaikeProduct.setParamList(paramList);
         // 产品/仪器认证图片列表
         List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -502,9 +564,14 @@ public class CmBaikeProductController extends BaseController {
 		String sensitiveWords = infoDao.getSensitiveWords(4);
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
-//		Gson g=new Gson();
-//		String textInfoStr=g.toJson(textInfo);
-//		cmBaikeProduct.setTextInfolistStr(textInfoStr);
+		//去除正文内容格式
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){

src/main/java/com/caimei/modules/order/entity/CmDiscernReceipt.java

@@ -88,6 +88,7 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
 
     private String bankNameType; // 银行账户名称
 
+    private Integer returnGoodsStutas;//退货状态  1  能退货  2 不能退货
 
 
     public String getPaYee() {
@@ -630,5 +631,11 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
         this.bankNameType = bankNameType;
     }
 
+    public Integer getReturnGoodsStutas() {
+        return returnGoodsStutas;
+    }
 
+    public void setReturnGoodsStutas(Integer returnGoodsStutas) {
+        this.returnGoodsStutas = returnGoodsStutas;
+    }
 }

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchase.java

@@ -55,7 +55,7 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private List<List<CmReturnedPurchaseProduct>> cmReturnedPurchaseProductList;    //退款退货商品列表(用于前端接收)
     private List<ShopOrderReturned> shopOrderReturnedList;    //退款退货商品列表
     private List<CmReturnedPurchaseProduct> productList;    //退款退货商品列表
-
+    private Integer returnGoodsStutas;//能否退货  1 能 2 不能
     private String bankAccountName;//银行账户名
     private String bankAccountNo;//开户银行账户
     private String openBank;//开户银行
@@ -525,4 +525,12 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     public void setBankNameType(String bankNameType) {
         this.bankNameType = bankNameType;
     }
+
+    public Integer getReturnGoodsStutas() {
+        return returnGoodsStutas;
+    }
+
+    public void setReturnGoodsStutas(Integer returnGoodsStutas) {
+        this.returnGoodsStutas = returnGoodsStutas;
+    }
 }

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -82,7 +82,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Integer zeroCostFlag;//订单0成本标识
     private Integer userBeans;//采美豆抵扣运费数量(100:1)
     // -----------------  v5.0.0 end
-
+    private Integer returnGoodsStutas;//能否退货  1 能 2 不能
     //-------------        虚拟字段   ----------------------------
     private Integer settleRecordNum;   //佣金结算数量
     private String shopName;            //供应商
@@ -1221,5 +1221,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setProductCode(Integer productCode) {
         this.productCode = productCode;
     }
+
+    public Integer getReturnGoodsStutas() {
+        return returnGoodsStutas;
+    }
+
+    public void setReturnGoodsStutas(Integer returnGoodsStutas) {
+        this.returnGoodsStutas = returnGoodsStutas;
+    }
 }
 

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -122,6 +122,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private String splitCode;// 商品分账号
     private String skuStr;
     private List<CmSku> skuList;
+    private Integer returnGoodsStutas;//能否退货  1 能 2 不能
 
 
 
@@ -1022,4 +1023,12 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     public void setSplitCode(String splitCode) {
         this.splitCode = splitCode;
     }
+
+    public Integer getReturnGoodsStutas() {
+        return returnGoodsStutas;
+    }
+
+    public void setReturnGoodsStutas(Integer returnGoodsStutas) {
+        this.returnGoodsStutas = returnGoodsStutas;
+    }
 }

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -87,6 +87,7 @@ public class Product extends DataEntity<Product> {
     private Integer combinationID;//商品组合Id
     private String productDetail; //普通机构商品详情1同资质机构商品详情，2用普通机构商品详情
     private String splitCode; //  该商品分账商户号
+    private Integer returnGoodsStutas;//退货状态 1 能退货  2 不能退货
     private List<CmSku> skuList;
     //-----------------  虚拟字段 ----
     private Integer skuId;
@@ -1732,4 +1733,12 @@ public class Product extends DataEntity<Product> {
     public void setTaxRate(Double taxRate) {
         this.taxRate = taxRate;
     }
+
+    public Integer getReturnGoodsStutas() {
+        return returnGoodsStutas;
+    }
+
+    public void setReturnGoodsStutas(Integer returnGoodsStutas) {
+        this.returnGoodsStutas = returnGoodsStutas;
+    }
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -355,6 +355,19 @@ public class ProductNewController extends BaseController {
         List<CmBrand> brandList = productService.findBrandList();
         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);
+//                    }
+//                });
+//            }
+//        }
         List<Province> provinceList = areaService.loadProvince();
         List<CmProductCombination> combinationList = cmProductCombinationService.findProductCombinationList();
 

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -116,6 +116,7 @@
         co.sendOutStatus AS sendOutStatus,
         co.receiptStatus AS receiptStatus,
         co.productCount AS productCount,
+        p.returnGoodsStutas as returnGoodsStutas,
         (SELECT IFNULL(sum(cop.shouldPayFee),0)
         FROM cm_order_product cop
         WHERE cop.orderId=co.orderID) AS

src/main/resources/mappings/modules/order/OrderProductMapper.xml

@@ -91,7 +91,8 @@
         a.svipPriceFlag,
 		a.svipPriceType,
 		a.svipDiscount,
-		a.svipReduction
+		a.svipReduction,
+        p.returnGoodsStutas
     </sql>
 
     <sql id="orderProductJoins">

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -1718,7 +1718,8 @@
             newProductType=#{newProductType},
             showFlag=#{showFlag},
             announType=#{announType},
-            splitCode = #{splitCode}
+            splitCode = #{splitCode},
+            returnGoodsStutas=#{returnGoodsStutas}
         </set>
         where productID = #{productID}
     </update>

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -102,7 +102,8 @@
         a.qualificationNo,
         a.productName,
         a.qualificationTime,
-        a.qualificationLink
+        a.qualificationLink,
+        a.returnGoodsStutas
     </sql>
 
     <sql id="productJoins">
@@ -366,7 +367,8 @@
                             costPrice,
                             costProportional,
                             costCheckFlag,
-                            precisehKey)
+                            precisehKey,
+                            returnGoodsStutas)
         VALUES (#{id},
                 #{brandID},
                 #{tinyTypeID},
@@ -421,7 +423,8 @@
                 #{costPrice},
                 #{costProportional},
                 #{costCheckFlag},
-                #{precisehKey})
+                #{precisehKey},
+                #{returnGoodsStutas})
     </insert>
     <update id="update">
         UPDATE product

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来更改标题部分的颜色
@@ -931,7 +935,7 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/baike/cmBaikeProduct/?commodityType=${cmBaikeProduct.commodityType}">采美词条</a></li>
-	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'编辑':'添加'}</a></li>
+	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'审核':'添加'}</a></li>
 </ul><br/>
 <%--	<div>--%>
 <%--		<button onclick="showlog_result(true,'展示正确内容的弹框')">展示正确弹框</button>--%>
@@ -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>
 	<%--正文--%>
@@ -1376,7 +1412,7 @@
 	<div class="control-group">
 		<label class="control-label keyClass">浏览量：</label>
 		<div class="controls">
-			<form:input path="basePv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
+			<form:input path="actualPv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
 		</div>
 	</div>
 	<div class="control-group">
@@ -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])

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来更改标题部分的颜色
@@ -931,7 +935,7 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/baike/cmBaikeProduct/?commodityType=${cmBaikeProduct.commodityType}">采美词条</a></li>
-	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'编辑':'添加'}</a></li>
+	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'查看':'添加'}</a></li>
 </ul><br/>
 <%--	<div>--%>
 <%--		<button onclick="showlog_result(true,'展示正确内容的弹框')">展示正确弹框</button>--%>
@@ -1183,8 +1187,9 @@
 	<div class="control-group">
 		<label class="control-label">词条名称：</label>
 		<div class="controls">
-			<form:input path="name" htmlEscape="false" class="input-xlarge "/>
-			<label id="nameSensitiveWords" class="red"></label>
+			${cmBaikeProduct.name}
+<%--			<form:input path="name" htmlEscape="false" class="input-xlarge "/>--%>
+<%--			<label id="nameSensitiveWords" class="red"></label>--%>
 		</div>
 	</div>
 	<%--义项名--%>
@@ -1232,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">
@@ -1255,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">
@@ -1268,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>
 	<%--正文--%>
@@ -1298,8 +1336,8 @@
 						<span class="del">${videoFile.websiteName}.</span>
 						<span class="del">${videoFile.publishTime}.</span>
 						<span class="del">${videoFile.acitationTime}.</span>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 				<c:if test="${videoFile.referenceType eq '2'}">
@@ -1311,8 +1349,8 @@
 						<span class="del">${videoFile.press}.</span>
 						<span class="del">${videoFile.publicationYear}.</span>
 						<span class="del">${videoFile.acitationWeb}.</span>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 				<c:if test="${videoFile.referenceType eq '3'}">
@@ -1325,8 +1363,8 @@
 								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
 							</div>
 							--%>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 			</c:forEach>
@@ -1360,46 +1398,38 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词：</label>
 		<div class="auto-input">
-			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
+			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge" readonly="true"/>
 		</div>
 	</div>
-	<%--关联供应商--%>
+	<%--基础浏览量--%>
 	<div class="control-group">
-		<label class="control-label">关联供应商：</label>
+		<label class="control-label keyClass">浏览量：</label>
 		<div class="controls">
-			<form:select path="shopId" class="input-xlarge ">
-				<form:option value="" label="请选择供应商"/>
-				<form:options items="${cmBaikeProduct.shopList}" class="input-xlarge" itemLabel="name" itemValue="shopID" htmlEscape="false"/>
-			</form:select>
+			<form:input path="actualPv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
 		</div>
 	</div>
-	<%--发布时间--%>
 	<div class="control-group">
-		<label class="control-label keyClass">发布时间：</label>
+		<label class="control-label keyClass">供应商：</label>
 		<div class="controls">
-			<input name="publishTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
-				   value="<fmt:formatDate value="${cmBaikeProduct.publishTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-				   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/>
+				${cmBaikeProduct.shopName}
 		</div>
 	</div>
-	<%--基础浏览量--%>
 	<div class="control-group">
-		<label class="control-label keyClass">基础浏览量：</label>
+		<label class="control-label keyClass">审核：</label>
 		<div class="controls">
-			<form:input path="basePv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits "/>
+			<input type="radio" name="auditStatus" value="2" onclick="updateAuditStatus(2)" ${empty cmBaikeProduct.auditStatus?'checked=checked':cmBaikeProduct.auditStatus eq 1?'checked=checked':''}> 审核通过
+			<input type="radio" name="auditStatus" value="3" onclick="updateAuditStatus(3)" ${cmBaikeProduct.auditStatus eq 3?'checked=checked':''}> 审核失败
 		</div>
 	</div>
-	<%--状态--%>
-	<div class="control-group">
-		<label class="control-label keyClass">状态：</label>
+	<div class="control-group" id="failReasonDiv" style="${empty cmBaikeProduct.auditStatus or cmBaikeProduct.auditStatus eq 1?'display: none':''}">
+		<label class="control-label"><font color="red">*</font>失败原因</label>
 		<div class="controls">
-			<form:radiobutton path="status" label="发布" value="1" checked="${empty cmBaikeProduct.status?'checked':''}"/>
-			<form:radiobutton path="status" label="保存草稿箱" value="0"/>
+			<textarea type="text" id="failReason" name="failReason" required style="width: 400px;height: 90px">${cmBaikeProduct.failReason}</textarea>
 		</div>
 	</div>
 	<%--提交数据 --%>
 	<div class="form-actions">
-		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+<%--		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;--%>
 		<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 	</div>
 </form:form>
@@ -1561,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')
@@ -1569,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])
@@ -2070,6 +2100,14 @@
 			buttons: {"关闭": '-1'}
 		});
 	}
+	function updateAuditStatus(auditStatus) {
+		var elementById = document.getElementById("failReasonDiv");
+		if (auditStatus === 2) {
+			elementById.style.cssText = "display:none";
+		} else {
+			elementById.style.cssText = "";
+		}
+	}
 	//关键词联动
 	function autocomplete(text) {
 		var keywordlist=new Array();

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])

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -601,6 +601,9 @@
                                     <td rowspan="4" style="width: 295px;height: 125px">
                                         <img style="width: 100px;height: 100px" src="${newOrderProduct.image}">
                                         <font title="${newOrderProduct.name}">${fns:abbr(newOrderProduct.name,30)}</font>
+                                        <c:if test="${newOrderProduct.returnGoodsStutas==2}">
+                                        <label style="color: red">(不能退货)</label>
+                                        </c:if>
                                     </td>
                                     <td style="width: 275px;">
                                         单价：￥<fmt:formatNumber type="number" value="${newOrderProduct.price}"  pattern="0.00" maxFractionDigits="2" />

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -403,7 +403,7 @@
                 </c:if>
             </li>
             <li class="operation-wrap">
-                <a href="${ctx}/order/detail?id=${order.orderID}">查看详情</a>
+                <a href="${ctx}/order/detail?id=${order.orderID}&returnGoodsStutas=${order.returnGoodsStutas}">查看详情</a>
             </li>
         </ul>
     </c:forEach>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -699,7 +699,7 @@
                                 </c:if>
                                 <c:if test="${order.toAudit ne 1}">
                                     <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
-                                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&refundType=1"
+                                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"
                                            <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
                                         </c:if>
                                         >申请退款</a>
@@ -810,7 +810,7 @@
                             </c:if>
                             <c:if test="${order.toAudit ne 1}">
                                 <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
-                                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1"
+                                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"
                                        <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
                                     </c:if>
                                     >申请退款</a>
@@ -977,6 +977,12 @@
                                 <div class="supplier-product-name"><label style="color: red">(不含税-能开票)</label></div>
                             </c:if>
                         </c:if>
+<%--                        <c:if test="${order.returnGoodsStutas==2}">--%>
+<%--                        <div class="supplier-product-name"><label style="color: red">(不能退货)</label></div>--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${order.returnGoodsStutas==1}">--%>
+<%--                            <div class="supplier-product-name"><label style="color: red">(能退货)</label></div>--%>
+<%--                        </c:if>--%>
                     </div>
                     <c:if test="${op.productID ne 999}">
                         <div class="supplier-product-info">

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

@@ -684,6 +684,16 @@
                 </form:select>
             </td>
         </tr>
+        <tr>
+            <th><span class="red">*</span>能否退货：</th>
+            <td colspan="3">
+                <form:select path="returnGoodsStutas" class="input-large required" id="goods">
+<%--                    ${product.returnGoodsStutas=="1" ? "selected" : ""}--%>
+                    <form:option value="1" label="能" />
+                    <form:option value="2" label="不能"/>
+                </form:select>
+            </td>
+        </tr>
         <tr>
             <th><span class="red">*</span>购买数量：</th>
             <td colspan="3">
@@ -1333,7 +1343,6 @@
     $(window).load(function () {
         loadInitType();
     });
-
     var step = ${product.step};
     var areaFlag = ${product.allAreaFlag};
     <%--var ladderPriceFlag = ${product.ladderPriceFlag};--%>
@@ -1658,8 +1667,7 @@
         loadSmallType();
         trainingShow();
     }
-
-
+    var conn=0;
     function loadSmallType(id) {
         if (id) {
             $("#bigType").val(id);
@@ -1682,6 +1690,7 @@
                         $("#smallType").prev().find(".select2-chosen").text(smalltypeList[i].name);
                         setTimeout(function () {
                             loadTinyType(currentSmalltype);
+                            // loadGoods();
                         }, 500);
                     } else {
                         $("#smallType").append("<option value='" + smalltypeList[i].smallTypeID + "'>" + smalltypeList[i].name + "</option>");
@@ -1700,6 +1709,7 @@
             document.getElementById("s2id_smallType").style.cssText = "display: none";
         }
         loadTinyType();
+        loadGoods(conn);
     }
 
     function loadTinyType(id) {
@@ -1736,7 +1746,51 @@
             $("#tinyType").removeClass("required");
         }
     }
-
+    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;