Duan_xu %!s(int64=2) %!d(string=hai) anos
pai
achega
6f1f198b16

+ 3 - 0
src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -1661,6 +1661,9 @@
 			</if>
 			<if test="trainingFee != null">
 				trainingFee = #{trainingFee},
+			</if>
+		    <if test="newvalidFlag !=null">
+				newvalidFlag=#{newvalidFlag},
 			</if>
 				splitCode = #{splitCode}
 		</set>

+ 16 - 2
src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -559,7 +559,15 @@
             alertx("该商品的品牌:"+name+",审核未通过。请通知供应商重新编辑提交品牌再审核商品或者直接修改品牌信息审核通过后再审核商品");
             return;
         }
-
+		var htmls = "<div id='auditBox'>"
+				+ "<div class='bd-row'>"
+				+ "    <span><font color='red'>*</font>商品上架审核:</span>"
+				+ "    <select name='validFlag' id='validFlag'>"
+				+ "        <option value=''>请选择</option>"
+				+ "        <option value='2'>审核通过</option>"
+				+ "        <option value='8'>审核未通过</option>"
+				+ "    <select/>"
+				+ "</div>";
         var html = "<div id='auditBox'>"
 					+ "<div class='bd-row'>"
 					+ "    <span><font color='red'>*</font>商品上架审核:</span>"
@@ -592,6 +600,7 @@
 				$("#err").hide()
 			}
 
+
             $.post("${ctx}/product/new/auditProduct", {
             	'productID': id,
                 'validFlag': f.validFlag,
@@ -605,7 +614,12 @@
                 }
             }, "JSON");
         };
-        $.jBox(html, {title: "审核", submit: submit});
+		if(newvalidFlag !=2){
+			$.jBox(html, {title: "审核", submit: submit});
+		}else {
+			$.jBox(htmls, {title: "审核", submit: submit});
+		}
+
     }
 
 	function validChange(id, flag) {