baibx пре 3 месеци
родитељ
комит
4cb3c17aea
1 измењених фајлова са 5 додато и 5 уклоњено
  1. 5 5
      com.sharemao.web.manager/src/main/webapp/view/module/order/packorder.jsp

+ 5 - 5
com.sharemao.web.manager/src/main/webapp/view/module/order/packorder.jsp

@@ -30,7 +30,7 @@
30
 					<input class="easyui-textbox" id="onum">
30
 					<input class="easyui-textbox" id="onum">
31
 				</li>
31
 				</li>
32
 				<li>
32
 				<li>
33
-					<label>银联单号</label>
33
+					<label>银联/支付宝单号</label>
34
 					<input class="easyui-textbox" id="transactionId">
34
 					<input class="easyui-textbox" id="transactionId">
35
 				</li>
35
 				</li>
36
 				<li>
36
 				<li>
@@ -64,7 +64,7 @@
64
 							<option value="${item.pkid}">${item.text}</option><br>
64
 							<option value="${item.pkid}">${item.text}</option><br>
65
 						</c:forEach>
65
 						</c:forEach>
66
 					</select>
66
 					</select>
67
-				</li>		
67
+				</li>
68
 				<li>
68
 				<li>
69
 					<label>设备分组</label>
69
 					<label>设备分组</label>
70
 					<select class="easyui-combobox" id="grpid" data-options="editable:true">
70
 					<select class="easyui-combobox" id="grpid" data-options="editable:true">
@@ -77,11 +77,11 @@
77
 				<li>
77
 				<li>
78
 					<label>操作者</label>
78
 					<label>操作者</label>
79
 					<input class="easyui-textbox" id="opt">
79
 					<input class="easyui-textbox" id="opt">
80
-				</li>							
80
+				</li>
81
 				<li>
81
 				<li>
82
 					<label>来源</label>
82
 					<label>来源</label>
83
 					<input class="easyui-textbox" id="fm">
83
 					<input class="easyui-textbox" id="fm">
84
-				</li>							
84
+				</li>
85
 			</ul>
85
 			</ul>
86
 			<span style="float:right;padding-right:20px;">
86
 			<span style="float:right;padding-right:20px;">
87
 				<a href="#" class="easyui-linkbutton" iconCls="icon-search-green" plain="true" onclick="getList()">搜索</a>
87
 				<a href="#" class="easyui-linkbutton" iconCls="icon-search-green" plain="true" onclick="getList()">搜索</a>
@@ -110,7 +110,7 @@
110
 					columns:[[
110
 					columns:[[
111
 						{title:'订单ID',field:'onumid',checkbox:true},
111
 						{title:'订单ID',field:'onumid',checkbox:true},
112
 						{title:'订单编号',field:'onum',align:'center',width:120},
112
 						{title:'订单编号',field:'onum',align:'center',width:120},
113
-						{title:'银联单号',field:'transaction_id',align:'center',width:120},
113
+						{title:'银联/支付宝单号',field:'transaction_id',align:'center',width:120},
114
 						{title:'手机号',field:'phonenum',align:'center',width:120},
114
 						{title:'手机号',field:'phonenum',align:'center',width:120},
115
 						{title:'归属代理',field:'orgname',align:'center',width:90},
115
 						{title:'归属代理',field:'orgname',align:'center',width:90},
116
 						{title:'创建时间',field:'crttm',align:'center',width:150,formatter:formatDate},
116
 						{title:'创建时间',field:'crttm',align:'center',width:150,formatter:formatDate},