youhua

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

@@ -310,6 +310,7 @@ public class invCardManageAction implements IMINAction {
 				.getMybatisMapper(OrderManageMapper.class).selectPickupRecord(m,rows);
 		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
 		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
+		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "pickUpTime");
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());

src/main/webapp/admin/pickupRecordManage/pickupRecord.html

@@ -88,7 +88,7 @@
                     ,{field: 'detailsId', title: '订单号', width:'12%'}
                     ,{field: 'aisle', title: '货道号', width:'15%'}
                     ,{field: 'imeiAddr', title: '机台号', width:'10%', sort: true}
-                    ,{field: 'detailsId', title: '取货码',width:'8%'}
+                    ,{field: 'pickupNo', title: '取货码',width:'8%'}
                     ,{field: 'productName', title: '商品信息', width:'12%'}
                     ,{field: 'sallPrice', title: '商品价格', width:'12%'}
                     ,{field: 'sttDesc', title: '状态', width:'12%'}