Merge remote-tracking branch 'origin/master'

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

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -56,7 +56,7 @@
 
 <!--操作功能-->
 <script type="text/html" id="barDemo">
-    {{#  if(d.stt == '00'){ }}
+    {{#  if(d.stt == '00'|| d.stt == '03'){ }}
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="doPickup">取货</a>
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="doTovoid">作废</a>
     {{#  }; }}
@@ -111,14 +111,14 @@
 				,{field: 'orderNo', title: '订单号', width:'10%'}
 		      	,{field: 'productName', title: '商品信息', width:'12%'}
 		      	,{field: 'sallPrice', title: '商品价格', width:'12%'}
-		      	,{field: 'machineNo', title: '机台号', width:'12%'}
-		      	,{field: 'equrelId', title: '货道号', width:'15%'}
+		      	,{field: 'imeiAddr', title: '机台号', width:'12%'}
+		      	,{field: 'aisle', title: '货道号', width:'15%'}
 		      	,{field: 'userName', title: '消费者信息',width:'15%'}
 		      	,{field: 'orderAmt', title: '支付金额',width:'15%'}
 		      	,{field: 'createTime', title: '创建时间',width:'8%'}
 		      	,{field: 'pickupNo', title: '取货码',width:'8%'}
-		      	,{field: 'pickUpTime', title: '取货时间', width: '25%',}
-		      	,{field: 'sttdesc', title: '状态',width:'8%'}
+		      	,{field: 'pickUpTime', title: '取货时间', width: '15%',}
+		      	,{field: 'sttDesc', title: '状态',width:'8%'}
 		      	,{field: 'operate', title: '操作',width:'8%', toolbar: '#barDemo'}
 		    ]]
 		    ,done: function(res, curr, count){
@@ -191,6 +191,7 @@
  		    	$('#formName')[0].reset()
  		    }
 	 	};
+
 	});
 
 	function reLoadFun() {
@@ -257,8 +258,8 @@
 		if (type == "date") {
 			value = dateValue;
 		}
-		if(type == "sel" && dateValue =="state"){
-			value = $("#state").find("option:selected").text();
+		if(type == "sel" && dateValue =="pickUpState"){
+			value = $("#pickUpState").find("option:selected").text();
 		}
 		if (type == "date") {
 			name = $("#"+t).attr("id");

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

@@ -87,11 +87,11 @@
                     ,{field: 'vciId', title: '用户ID', width:'12%'}
                     ,{field: 'orderNo', title: '订单号', width:'12%'}
                     ,{field: 'equrelId', title: '货道号', width:'15%'}
-                    ,{field: 'machineNo', title: '机台号', width:'10%', sort: true}
-                    ,{field: 'pickupNo', title: '取货码',width:'8%'}
+                    ,{field: 'imeiAddr', title: '机台号', width:'10%', sort: true}
+                    ,{field: 'aislereLoadFun', title: '取货码',width:'8%'}
                     ,{field: 'productName', title: '商品信息', width:'12%'}
                     ,{field: 'sallPrice', title: '商品价格', width:'12%'}
-                    ,{field: 'sttdesc', title: '状态', width:'12%'}
+                    ,{field: 'sttDesc', title: '状态', width:'12%'}
                     ,{field: 'pickUpTime', title: '取货时间', width:'15%'}
                 ]]
                 ,done: function(res, curr, count){