wanglm před 4 roky
rodič
revize
ea11fb5604

+ 21 - 18
src/main/webapp/admin/invCardManage/invCardManage.html

@@ -29,7 +29,7 @@
             </div>
             <div class="layui-inline">
                 <label class="f12-gray4">货道号 :</label>
-                <input type="tel" name="equrelId" id ="equrelId" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入货道号" class="search-select">
+                <input type="tel" name="equrelId" id ="equrelId" onchange = "changeSelectCon(2,this,'inp')" placeholder="请输入货道号" class="search-select">
             </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
             <div class="layui-inline">
@@ -75,7 +75,7 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(3,"creatdDtes",'date',value)
+    			  changeSelectCon(4,"creatdDtes",'date',value)
   			}
 		});
 
@@ -84,13 +84,13 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(4,"pickUpDates",'date',value)
+    			  changeSelectCon(5,"pickUpDates",'date',value)
   			}
 		});
 		form = layui.form;
 		initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
 		form.on('select(pickUpState)', function(data){
-   			changeSelectCon(2, data.elem, "sel","pickUpState");
+   			changeSelectCon(3, data.elem, "sel","pickUpState");
    		});
 		form.render();
 	})
@@ -128,10 +128,23 @@
 		        console.log(curr);
 		        //得到数据总量
 		        console.log(count);
-		      }
+            }
 		    ,even: true //开启隔行背景
-		  });
+        });
 
+        var $ = layui.$, active = {
+            reload: function(){
+                reLoadFun();
+            }
+            ,reset: function(){
+                $('#formName')[0].reset();
+                $("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件:</div>');
+            }
+        };
+        $('.layui-btn').on('click', function(){
+            var type = $(this).data('type');
+            active[type] ? active[type].call(this) : '';
+        });
 		 // 监听工具条(操作)
 		table.on('tool(tableFilter)', function(obj){ //注:tool是工具条事件名,tableFilter是table原始容器的属性 lay-filter="对应的值"
 			var data = obj.data; //获得当前行数据
@@ -182,16 +195,6 @@
 				});
 			}
 		});
-
-		var $ = layui.$, active = {
- 		    reload: function(){
- 		    	reLoadFun();
- 		    }
- 		    ,reset: function(){
- 		    	$('#formName')[0].reset()
- 		    }
-	 	};
-
 	});
 
 	function reLoadFun() {
@@ -202,7 +205,7 @@
     	var pickUpDates = $("#pickUpDates").val();
     	var creatdDtes = $("#creatdDtes").val();
          //执行重载
-     	table.reload('userManage', {
+     	table.reload('cardManage', {
 	        page: {
 	          curr: 1 //重新从第 1 页开始
 	        }
@@ -248,7 +251,7 @@
 			}
 		}
 	}
-	var array = new Array('机台号','取货码','状态','创建日期','取货日期');
+	var array = new Array('机台号','取货码','货道号','状态','创建日期','取货日期');
 	function getSelectConHtml(index, t, type,dateValue){
 		var name;
 		var value;