订单

src/main/java/com/minpay/db/table/own/mapper/ShOrderMapper.java

@@ -0,0 +1,12 @@
+package com.minpay.db.table.own.mapper;
+
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ShOrderMapper extends  IMINMybatisEntityMapper{
+	//查询订单列表
+	List<Map<String, String>> queryOrder(Map<String, String> map, MINRowBounds row);
+}

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

@@ -0,0 +1,101 @@
+package com.minpay.shouhuo;
+
+import com.minpay.common.bean.User;
+import com.minpay.common.constant.Constant;
+import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.ILogService;
+import com.minpay.common.service.IPublicService;
+import com.minpay.common.util.RegexUtil;
+import com.minpay.db.table.mapper.VmRechargeRuleMapper;
+import com.minpay.db.table.model.VmRechargeRule;
+import com.minpay.db.table.model.VmRechargeRuleExample;
+import com.minpay.db.table.own.mapper.OrderInfMapper;
+import com.minpay.db.table.own.mapper.ShOrderMapper;
+import com.mysql.jdbc.StringUtils;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.MINHttpServletRequestContext;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.constant.IMINTransactionEnum;
+import com.startup.minpay.frame.data.format.MINCopyFormat;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+import com.startup.minpay.frame.target.MINValidator;
+import com.startup.minpay.util.DateTime;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单管理
+ * @author xbh
+ *
+ */
+@MINComponent
+public class ShOrderManageAction implements IMINAction {
+	public final static String	QUERY_ORDER				= "queryOrder";
+
+	/**
+	 *查询订单
+	 * @param session
+	 * @param page
+	 * @param limit
+	 * @param equipmentId	机器编号
+	 * @param equipmentName	机器名称
+	 * @param freightwayId	货道编号
+	 * @param payMode		支付方式
+	 * @param dates			日期（区间）
+	 * @param playerId		玩家id
+	 * @param state			状态
+	 * @param fapRequest
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = QUERY_ORDER)
+	public MINActionResult queryOrder(
+			MINSession session,
+			@MINParam(key = "page", defaultValue = "1") int page,
+			@MINParam(key = "limit", defaultValue = "3") int limit,
+			@MINParam(key = "equipmentId") String equipmentId,
+			@MINParam(key = "equipmentName") String equipmentName,
+			@MINParam(key = "freightwayId") String freightwayId,
+			@MINParam(key = "payMode") String payMode,
+			@MINParam(key = "dates") String dates,
+			@MINParam(key = "playerId") String playerId,
+			@MINParam(key = "state") String state,
+			@MINParam(key = "orderNo") String orderNo,
+			MINHttpServletRequestContext fapRequest
+	) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		// 创建查询条件
+		Map<String, String> p = new HashMap<String, String>();
+		p.put("equipmentId",equipmentId);
+		p.put("equipmentName",equipmentName);
+		p.put("freightwayId",freightwayId);
+		p.put("payMode",payMode);
+		p.put("playerId",playerId);
+		p.put("state",state);
+		p.put("dates", dates);
+		p.put("orderNo", orderNo);
+		// 查询OrderInfMapper.xml
+		List<Map<String, String>> ls = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrder(p,rows);
+		// 格式化
+		ls = Service.lookup(IFormatService.class).formatDateTime(ls, "createTime");
+		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc'}").format(ls);
+		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_TYPE'}");
+		// 设置返回值
+		res.set(IMINBusinessConstant.F_PAGING_LAY, ls);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+	}
+
+
+}

src/main/webapp/admin/orderManage/orderManage.html

@@ -3,267 +3,226 @@
 
 <head>
 	<meta charset="utf-8">
-	<title>融资订单查询</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+	<title>订单管理</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 </head>
 
 <body class="content">
-	<div class="order-body">
+<div class="order-body">
 	<div class="order-tiaojian back-gray">
-			<div class="tiaojian-part1" id = "conditions">
-				<div class="fl f12-gray4-op">所选条件：</div>
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr demoTable">
+			<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
+			<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form"  action="javascript:void(0)"  id = "orderForm">
+		<div class="order-select back-border" id="content">
+
+			<div class="layui-inline">
+				<label class="f12-gray4">订单编号：</label>
+				<input onchange = "changeSelectCon(0,this,'inp')" class="search-select" type="tel" name="orderNo"  id ="orderNo" lay-verify="orderNo"  autocomplete="off" placeholder="请输入订单编号" class="y-left-input">
 			</div>
-			<div class="tiaojian-part2 fr demoTable">
-				<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
-				<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
-				<button class="layui-btn order-bnt2" data-type="export">数据导出</button>
-				<a href="#" id="toggle" class="top">收起</a>
+			<div class="layui-inline">
+				<label class="f12-gray4">创建时间：</label>
+				<input  class="search-select" type="text"  id="dates" placeholder="日期（区间）"   readonly />
 			</div>
-		</div>
-		<form class="layui-form"  action="javascript:void(0)"  id = "orderForm">
-			<div class="order-select back-border" id="content">
-				<div class="layui-inline">
-					<label class="f12-gray4">订单编号：</label>
-					<input onchange = "changeSelectCon(0,this,'inp')" class="search-select" type="tel" name="orderNo"  id ="orderNo" lay-verify="orderNo"  autocomplete="off" placeholder="请输入融资订单编号" class="y-left-input">
-				</div>
-				<div class="layui-inline">
-					<label class="f12-gray4">日期：</label>
-					<input  class="search-select" type="text"  id="dates" placeholder="日期（区间）"   readonly />
-				</div>
-				<div class="layui-inline">
-					<label class="f12-gray4">状态：</label>
-					<div  class=""  style="display:inline-block" id = 'state'></div>
-				</div>
-				<div class="d-dashed" style="margin: 10px 0;"></div>
-				<div class="layui-inline">
-					<label class="f12-gray4">企业名称：</label>
-					<input onchange = "changeSelectCon(3,this,'inp')"   class="search-select" type="tel" name="corName"  id ="corName" lay-verify="corName"  autocomplete="off" placeholder="请输入企业名称" class="layui-input">
-				</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">状态：</label>
+				<div  class=""  style="display:inline-block" id = 'state'></div>
 			</div>
-		</form>
-				
-	</div>
-	
-	<div class="shadow-content" style="margin:1.5rem;">
-			<table id="orderManage" lay-filter="tableFilter"></table>
-	</div>
+
+			<div class="layui-inline">
+				<label class="f12-gray4">机台号：</label>
+				<input onchange = "changeSelectCon(3,this,'inp')"   class="search-select" type="tel" name="equipmentId"  id ="equipmentId" lay-verify="equipmentId"  autocomplete="off" placeholder="请输入机器号" class="layui-input">
+			</div>
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">机器名称：</label>
+				<input onchange = "changeSelectCon(4,this,'inp')"   class="search-select" type="tel" name="equipmentName"  id ="equipmentName" lay-verify="equipmentName"  autocomplete="off" placeholder="请输入机器名称" class="layui-input">
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">货道号：</label>
+				<input onchange = "changeSelectCon(5,this,'inp')"   class="search-select" type="tel" name="freightwayId"  id ="freightwayId" lay-verify="freightwayId"  autocomplete="off" placeholder="请输入货道号" class="layui-input">
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">支付方式：</label>
+				<div  class=""  style="display:inline-block" id = 'payMode'></div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">玩家ID：</label>
+				<input onchange = "changeSelectCon(7,this,'inp')"   class="search-select" type="tel" name="personId"  id ="personId" lay-verify="personId"  autocomplete="off" placeholder="请输入玩家ID" class="layui-input">
+			</div>
+		</div>
+	</form>
+
+</div>
+
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="orderManage" lay-filter="tableFilter"></table>
+</div>
 </body>
 <script src="../../js/min-loader-next.js"></script>
 <script type="text/html" id="barDemo">
-		<a class="layui-btn layui-btn-xs" lay-event="look">订单详情</a>
-   	</script>
-   	<script type="text/html" id="productName">
-		<div class="layui-table-cell laytable-cell-1-orderno" onclick="productName({{d.orderno}})" >
-			{{#  if(isEmpty(d.productName)){ }}
-				无数据
-			{{#  }else { }}
-				{{d.productName}}
-			{{#  }}}
-		</div>
-   	</script>
-   	
+	<a class="layui-btn layui-btn-xs" lay-event="look">订单详情</a>
+</script>
 <script>
 	$("#toggle").click(function() {
 		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
-			"<i class='iconfont up iconSelect_drop-down'/></i>");
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
 		$("#content").slideToggle();
 	});
-	var mainOrderState = getTempVal("mainOrderState");
-	// 首页跳转数据
-	if (isEmpty(mainOrderState)) {
-		mainOrderState = " ";
-	} else {
-		setTempVal("mainOrderState"," ");
-	}
 	layui.use(['table','laydate','form'], function(){
 		var laydate = layui.laydate;
 		//日期范围
 		laydate.render({
-		    elem: '#dates'
-		   ,range: true
-		   ,format:'yyyyMMdd'
-		   ,done: function(value, date, endDate){
-    			  changeSelectCon(1,"dates",'date',value)
-  			  }
+			elem: '#dates'
+			,range: true
+			,format:'yyyyMMdd'
+			,done: function(value, date, endDate){
+				changeSelectCon(1,"dates",'date',value)
+			}
 		});
 		form = layui.form;
-		initSelect('state', "ORDER_STT", "state", mainOrderState, true);
-		if (mainOrderState != " ") {
-			changeSelectCon(2, $("select[name='state']"), "sel");
-		}
+		initSelect('state', "IS_DRAW", "state", '', true);
+		initSelect('payMode', "PAY_TYPE", "payMode", '', true);
 		form.on('select(state)', function(data){
-   			changeSelectCon(2, data.elem, "sel");
-   		}); 
-		 form.render();
+			changeSelectCon(2, data.elem, "sel","state");
+		});
+		form.on('select(payMode)', function(data){
+			changeSelectCon(6, data.elem, "sel","payMode");
+		});
+		form.render();
 	});
-     var table;
-      layui.use('table', function(){
-		  table = layui.table;
-		  // 加载数据
-		  table.render({
+	var table;
+	layui.use('table', function(){
+		table = layui.table;
+		// 加载数据
+		table.render({
 			id: 'orderManage'
-		    ,elem: '#orderManage'
-		    ,limit:10
-		   // ,height: 315
-		     ,url: 'OrderManageAction/queryOrder' //数据接口
-		    ,method: 'post'
-		    ,where:{MINView:"JSON",allFlag:"1",state:mainOrderState.trim()}
-		    ,page: true //开启分页
-		    ,cols: [[ //表头
-		      {field:'num', title: '序号',width:'5%', type:'numbers', fixed: true, align: 'center'}
-		      ,{field: 'orderno', title: '融资订单编号', width:'10%', sort: true, fixed: 'left'}
-		      ,{field: 'productName', title: '产品信息', width:'12%',templet: '#productName'}
-		      //,{field: 'productNum', title: '货品数量', width:'8%'}
-		      ,{field: 'apprivePassDate', title: '审批通过日期', width: '14%'}
-		      ,{field: 'companyName', title: '企业名称', width: '14%'}
-		      ,{field: 'term', title: '期限(天)', width: '8%', }
-		      ,{
-		    	  field: 'expiredDate', 
-		    	  title: '到期日', 
-		    	  width: '14%',
-		    	  templet:function(d){
-		    		  if(d.term > 90 && typeof(d.expiredDate) != "undefined"){
-		    			  return d.expiredDate.substring(0,10);　
-		    		  } else if(typeof(d.expiredDate) != "undefined"){
-		    			  return d.expiredDate;
-		    		  } else {
-		    			  return "";
-		    		  }
-		    	  }
-	    	  }
-		      ,{field: 'sttDesc', title: '状态', width: '10%', sort: true}
-		      ,{field: 'overdueState', title: '宽限期', width: '8%', sort: true}
-		      ,{field: 'operate', title: '操作', width: '14%', toolbar: '#barDemo',fixed: 'right'}
-		    ]]
-		    ,done: function(res, curr, count){
-		        //如果是异步请求数据方式，res即为你接口返回的信息。
-		        //如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
-		        console.log(res);
-		        
-		        //得到当前页码
-		        console.log(curr); 
-		        
-		        //得到数据总量
-		        console.log(count);
-		      }
-		    ,even: true //开启隔行背景
-		    
-		  });
-		  
-		 // 监听工具条（操作）
-		  table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
-		    var data = obj.data; //获得当前行数据
-		    var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
-		    var tr = obj.tr; //获得当前行 tr 的DOM对象
-		    if(layEvent === 'look'){ //详情
-		    	lookDetail(data);
-		    }
-		  });
-		  
-	     var $ = layui.$, active = {
-	   		    getCheckData: function(){ //获取选中数据
-	   		    	
-	   		      var checkStatus = table.checkStatus('orderManage')
-	   		      ,data = checkStatus.data;
-	   		      layer.alert(JSON.stringify(data));
-	   		    }
-	   		    ,getCheckLength: function(){ //获取选中数目
-	   		      var checkStatus = table.checkStatus('orderManage')
-	   		      ,data = checkStatus.data;
-	   		      layer.msg('选中了：'+ data.length + ' 个');
-	   		    }
-	   		    ,isAll: function(){ //验证是否全选
-	   		      var checkStatus = table.checkStatus('orderManage');
-	   		      layer.msg(checkStatus.isAll ? '全选': '未全选')
-	   		    }
-	   			//搜索
-	   		    ,reload: function(){
-	   		    	loadAA();
-	   		    }
-				//重置
-	   		    ,reset : function(){
-	   		    	$('#orderForm')[0].reset();
-	   		    	$("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件：</div>');
-	   		    }
-				,export : function(){
-					exportExcel();
-				}
-	 	};
+			,elem: '#orderManage'
+			,limit:10
+			// ,height: 315
+			,url: 'ShOrderManageAction/queryOrder' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON"}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', fixed: true, align: 'center'}
+				,{field: 'id', title: '订单编号', width:'10%', sort: true, fixed: 'left'}
+				,{field: 'productName', title: '产品信息', width:'12%'}
+				,{field: 'equipmentId', title: '机器号', width:'8%'}
+				,{field: 'equipmentName', title: '机器名称', width:'8%'}
+				,{field: 'equrelId', title: '货道编号', width:'8%'}
+				,{field: 'personId', title: '玩家ID', width:'8%'}
+				,{field: 'personName', title: '消费者信息', width:'8%'}
+				,{field: 'isDrawdesc', title: '状态', width:'8%'}
+				,{field: 'payModedesc', title: '支付类型', width:'8%'}
+				,{field: 'orderAmt', title: '订单价格', width:'8%'}
+				,{field: 'createTime', title: '创建时间', width: '14%'}
+				,{field: 'operate', title: '操作', width: '14%', toolbar: '#barDemo',fixed: 'right'}
+			]]
+			,done: function(res, curr, count){
+				//如果是异步请求数据方式，res即为你接口返回的信息。
+				//如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
+				console.log(res);
+
+				//得到当前页码
+				console.log(curr);
+
+				//得到数据总量
+				console.log(count);
+			}
+			,even: true //开启隔行背景
+
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			var tr = obj.tr; //获得当前行 tr 的DOM对象
+			if(layEvent === 'look'){ //详情
+				lookDetail(data);
+			}
+		});
+
+		var $ = layui.$, active = {
+			getCheckData: function(){ //获取选中数据
+
+				var checkStatus = table.checkStatus('orderManage')
+						,data = checkStatus.data;
+				layer.alert(JSON.stringify(data));
+			}
+			,getCheckLength: function(){ //获取选中数目
+				var checkStatus = table.checkStatus('orderManage')
+						,data = checkStatus.data;
+				layer.msg('选中了：'+ data.length + ' 个');
+			}
+			,isAll: function(){ //验证是否全选
+				var checkStatus = table.checkStatus('orderManage');
+				layer.msg(checkStatus.isAll ? '全选': '未全选')
+			}
+			//搜索
+			,reload: function(){
+				loadAA();
+			}
+			//重置
+			,reset : function(){
+				$('#orderForm')[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) : '';
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
 		});
-	      
-	 });
-   	function lookDetail(data) {
-     		// 寄存当前数据
-		layui.sessionData("ROW_DATA", {key:"NOW_ROW", value : data.orderno});
-		openMainTabPage('215003-02', '订单详情', 'orderManage/details.html', '', '020001', loadAA);
-  		/* layer.open({
-  		      type: 2,
-  		      title: '查看订单详情',
-  		      shadeClose: true,
-  		      shade:0.6,
-  		      area: ['85%', '85%'],
-  		      content: 'detail.html'
-  		}); */
-   	}
-	
-	//产品
-	function productName(orderno) {
-		var data ={};
-		data.orderno = orderno;
+
+	});
+	function lookDetail(data) {
 		// 寄存当前数据
-		layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
-		layer.open({
-		      type: 2,
-		      title: '产品列表',
-		      shadeClose: true,
-		      shade:0.6,
-		      area: ['45%', '45%'],
-		      content: 'productList.html'
-		});
-	}
-	
-	function exportExcel(){
-		//状态
-   	 	var state = $("#state").find("option:selected").val();
-   		//时间
-   		var dates = $("#dates").val();
-   		//订单号
-   		var orderNo = $("#orderNo").val();
-   		//企业名称
-   		var corName = $("#corName").val();
-   		window.open(encodeURI("../../OrderManageAction/exportExcel?orderNo="+orderNo+"&corName="+corName+"&state="+state+"&dates="+dates));
+		layui.sessionData("ROW_DATA", {key:"NOW_ROW", value : data});
+		openMainTabPage('101006-01', '订单详情', 'orderManage/details.html', '', '101006', loadAA);
 	}
-	
+
+
 	function loadAA() {
 		//状态
-   	 	var state = $("#state").find("option:selected").val();
-   		//时间
-   		var dates = $("#dates").val();
-   		//订单号
-   		var orderNo = $("#orderNo").val();
-   		//企业名称
-   		var corName = $("#corName").val();
-   	
-        //执行重载
-	    table.reload('orderManage', {
-	        page: {
-	        	curr: 1 //重新从第 1 页开始
-	        }
-	        ,where: {
-	        	orderNo : orderNo,
-	        	state : state,
-	        	dates : dates,
-	        	corName : corName,
-	        	allFlag:"1"
-	        }
-	     });
+		var state = $("#state").find("option:selected").val();
+		//时间
+		var dates = $("#dates").val();
+		//订单号
+		var orderNo = $("#orderNo").val();
+
+		var equipmentId = $("#equipmentId").val();
+		var equipmentName = $("#equipmentName").val();
+		var freightwayId = $("#freightwayId").val();
+		var payMode = $("#payMode").find("option:selected").val();
+		var playerId = $("#personId").val();
+		//执行重载
+		table.reload('orderManage', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				orderNo : orderNo,
+				state : state,
+				dates : dates,
+				equipmentId : equipmentId,
+				equipmentName : equipmentName,
+				freightwayId : freightwayId,
+				payMode : payMode,
+				playerId : playerId
+			}
+		});
 	}
 	function changeSelectCon(index, t, type, dateValue){
+		debugger;
 		if (type == "date") {
 			if (isEmpty(dateValue)) {
 				$("#search" + index).remove();
@@ -294,7 +253,7 @@
 			}
 		}
 	}
-	var array = new Array('订单编号','日期','状态','企业名称');
+	var array = new Array('订单编号','创建时间','状态','机台号','机器名称','货道号','支付方式','玩家ID');
 	function getSelectConHtml(index, t, type,dateValue){
 		var name;
 		var value;
@@ -305,7 +264,13 @@
 			value = dateValue;
 		}
 		if(type == "sel"){
-			value = $("#state").find("option:selected").text();
+			if(index == '2'){
+				value = $("#state").find("option:selected").text();
+			}
+			if(index == '6'){
+				value = $("#payMode").find("option:selected").text();
+			}
+
 		}
 		if (type == "date") {
 			name = $("#"+t).attr("id");
@@ -313,17 +278,18 @@
 			name = $(t).attr("id");
 		}
 		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
-						'<div class="fl">' + array[index] + '</div>' +
-						':<i>'+value+'</i>' +
-						'<svg class="icon" aria-hidden="true">' +
-						  '<use xlink:href="#iconicon_close1"></use>' +
-						'</svg>' +
-					'</div>';
+				'<div class="fl">' + array[index] + '</div>' +
+				':<i>'+value+'</i>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
 		return html;
 	}
 	function removeSearch(t) {
 		if ($(t).attr("name") == 'subjects') {
-			initSelect('state', "ORDER_STT", "state", ' ', true);
+			initSelect('state', "IS_DRAW", "state", ' ', true);
+			initSelect('payMode', "PAY_TYPE", "payMode", ' ', true);
 			form.render();
 			$(t).remove();
 		} else {
@@ -331,6 +297,6 @@
 			$(t).remove();
 		}
 	}
-    </script>
+</script>
 
 </html>