自助上架

@@ -33,7 +33,7 @@
         <bind name="pattern" value="'%' + selfShelvesReq.productName + '%'" />
         <bind name="pattern" value="'%' + selfShelvesReq.productName + '%'" />
            and product_name like #{pattern}
            and product_name like #{pattern}
         </if>
         </if>
-        <if test="selfShelvesReq.productCode != null and selfShelvesReq.productName != '' ">
+        <if test="selfShelvesReq.productCode != null and selfShelvesReq.productCode != '' ">
            and product_code=#{selfShelvesReq.productCode}
            and product_code=#{selfShelvesReq.productCode}
         </if>
         </if>
         <if test="selfShelvesReq.status != null">
         <if test="selfShelvesReq.status != null">

@@ -101,6 +101,7 @@ function updateAudit(id, status){
 		status : status
 		status : status
     }, function(data) {
     }, function(data) {
         if (data.code == 200) {
         if (data.code == 200) {
+        	document.getElementById("btnList").style.display= "none";
             window.self.$.messager.show({
             window.self.$.messager.show({
                 title : "提示",
                 title : "提示",
                 msg : "审核成功！"
                 msg : "审核成功！"

@@ -46,20 +46,20 @@ $(function() {
         width: 150,
         width: 150,
         editable : false,
         editable : false,
         data: [
         data: [
-			{"text" : "全部", "value" : -1}
-			,{"text" : "待审核", "value" : 0}
-			,{"text" : "已通过", "value" : 1}
-			,{"text" : "不通过", "value" : 2}
+			 {"text" : "待审核", "value" : 1},
+			 {"text" : "已通过", "value" : 2},
+			 {"text" : "不通过", "value" : 3}
 		]
 		]
     });
     });
 	
 	
 	$("#searchBtn").linkbutton({
 	$("#searchBtn").linkbutton({
         iconCls : "icon-search",
         iconCls : "icon-search",
         onClick : function() {
         onClick : function() {
+        	var status = $("#status").myCombobox("getValue")-1;
             $("#mainListTable").datagrid("load", {
             $("#mainListTable").datagrid("load", {
             	productName : $("#productName").val(),
             	productName : $("#productName").val(),
             	productCode : $("#productCode").val(),
             	productCode : $("#productCode").val(),
-            	status : $("#status").myCombobox("getValue") ==-1?null:$("#status").myCombobox("getValue")
+            	status : status == -1 ? null : status
             });
             });
         }
         }
     });
     });
@@ -68,6 +68,9 @@ $(function() {
     $("#allBtn").linkbutton({
     $("#allBtn").linkbutton({
         iconCls: "icon-import",
         iconCls: "icon-import",
         onClick: function () {
         onClick: function () {
+        	$("#productName").textbox('setValue','');
+        	$("#productCode").textbox('setValue','');
+        	$("#status").combobox('setValue','');
         	$("#mainListTable").datagrid("load", {});
         	$("#mainListTable").datagrid("load", {});
         }
         }
     });
     });