src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -340,7 +340,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("creatdDtes", creatdDtes);
 		m.put("pickUpDates", pickUpDates);
 		m.put("pickUpState", pickUpState);
-		m.put("branchId", branchId);
+		if(!"88888888".equals(branchId)) {
+			m.put("branchId", branchId);
+		}
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectOrderDetail(m,rows);

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -17,15 +17,14 @@
 		d.VOI_PICKUP_STT 		"stt",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
-		r.VCI_COST_PRICE 		"costPrice",
-		e.VEQ_IMEI_ADDR 		"imeiAddr",
-		r.VCI_AISLE 			"aisle"
-	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p,vm_equipment_inf e
+		r.VCI_COST_PRICE 		"costPrice"
+	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
 		and o.VOD_ORDER_ID = d.VOI_ID
-		and r.VCI_EQUIPMENT_ID = e.VEQ_ID
-		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		<if test="branchId != null and branchId != ''">
+			and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		</if>
     	<if test="pickupNo != null and pickupNo != ''">
 			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
@@ -49,6 +48,7 @@
 		and VCI_EXEIT_STATE = "00"
 		and VOI_STATE = "00"
 		and VCI_STATUS = "00"
+		and VOI_IS_DRAW = "01"
 		and VOI_PICKUP_STT in ("00", "01")
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
@@ -64,15 +64,12 @@
 		p.VCI_NAME 				"userName",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
-		r.VCI_COST_PRICE 		"costPrice",
-		e.VEQ_IMEI_ADDR 		"imeiAddr",
-		r.VCI_AISLE 			"aisle"
-		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r,vm_equipment_inf e
+		r.VCI_COST_PRICE 		"costPrice"
+		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
 		and oi.VOI_PERSON_ID = p.VCI_ID
 		and od.VOD_PRO_EQU_REL_ID = r.VCI_ID
-		and r.VCI_EQUIPMENT_ID = e.VEQ_ID
 		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		<if test="machineNo != null and machineNo != ''">
 			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}

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;