订单管理

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

@@ -275,7 +275,7 @@ public class ShOrderManageAction implements IMINAction {
 		// 格式化
 		ls = Service.lookup(IFormatService.class).formatDateTime(ls, "createTime");
 		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc','state':'statedesc','pickupStt':'pickupSttdesc'}").format(ls);
-		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_TYPE',statedesc:'ORDER_STATE',pickupSttdesc:'ORDER_PICKUP_STT'}");
+		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_MODE',statedesc:'ORDER_STATE',pickupSttdesc:'ORDER_PICKUP_STT'}");
 
 
 		Map<String, String> lss = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrderStatisticsNew(p);

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

@@ -114,7 +114,7 @@
 			}
 		});
 		form = layui.form;
-		initSelect('state', "PAY_STATE", "state", '', true,'支付状态');
+		initSelect('state', "PAY_STATE", "state", '00', true,'支付状态');
 		initSelect('payMode', "PAY_MODE", "payMode", '', true,'支付方式');
 		initSelect('gameRule', "GAME_RULE", "gameRule", '', true,'购买方式');
 		initSelect('pickupStt', "PICKUP_STT", "pickupStt", '', true,'出货状态');
@@ -149,7 +149,7 @@
 			// ,height: 315
 			,url: 'ShOrderManageAction/queryOrderNew' //数据接口
 			,method: 'post'
-			,where:{MINView:"JSON"}
+			,where:{MINView:"JSON","state":"00"}
 			,page: true //开启分页
 			,cols: [[ //表头
 				{field:'num', title: '序号',width:'5%', type:'numbers', fixed: true, align: 'center'}
@@ -374,7 +374,7 @@
 	}
 	function removeSearch(t) {
 		if ($(t).attr("name") == 'subjects') {
-			initSelect('state', "PAY_STATE", "state", '', true,'支付状态');
+			initSelect('state', "PAY_STATE", "state", '00', true,'支付状态');
 			initSelect('payMode', "PAY_MODE", "payMode", '', true,'支付方式');
 			initSelect('gameRule', "GAME_RULE", "gameRule", '', true,'购买方式');
 			initSelect('pickupStt', "PICKUP_STT", "pickupStt", '', true,'出货状态');