ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit bdabcdb99adcb46962db187573e60f46c69e01f4 1 parent e79e1484

订单管理

Inline Side-by-side
Showing 2 changed files with 18 additions and 13 deletions
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq"> 85 <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
86 select a.* 86 select a.*
87 from buyer_order a 87 from buyer_order a
88 - <if test="(buyerOrderReq.productId != null) or (buyerOrderReq.storageId != null) or (buyerOrderReq.skup != null)"> 88 + <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.storageId != null) or (buyerOrderReq.skup != null)">
89 LEFT JOIN buyer_order_goods b 89 LEFT JOIN buyer_order_goods b
90 ON( b.order_code=a.order_code) 90 ON( b.order_code=a.order_code)
91 LEFT JOIN seller_order_goods c 91 LEFT JOIN seller_order_goods c
@@ -10,11 +10,11 @@ @@ -10,11 +10,11 @@
10 <script> 10 <script>
11 document.write(addHead('鉴定中心', '列表管理')); 11 document.write(addHead('鉴定中心', '列表管理'));
12 </script> 12 </script>
13 - <div style="margin-left:1200px">  
14 - <select id="depotNo" style="width:70px;">  
15 - <option value="1" selected>北京</option> 13 + <div style="width:1280px;">
  14 + <select id="depotNo" class="easyui-combobox" style="width:70px;">
  15 + <option value="1">北京</option>
16 <option value="2">南京</option> 16 <option value="2">南京</option>
17 - </select> 17 + </select>
18 </div> 18 </div>
19 <div id="tt" class="easyui-tabs"> 19 <div id="tt" class="easyui-tabs">
20 <div title="待鉴定" style="padding:20px;display:none;"> 20 <div title="待鉴定" style="padding:20px;display:none;">
@@ -97,11 +97,13 @@ @@ -97,11 +97,13 @@
97 </div> 97 </div>
98 <script> 98 <script>
99 $(function() { 99 $(function() {
100 -  
101 $("#depotNo").combobox({ 100 $("#depotNo").combobox({
102 - onchange : function(newValue, oldValue){ 101 + onChange : function(newValue, oldValue){
103 var depotNo = $("#depotNo").combobox("getValue"); 102 var depotNo = $("#depotNo").combobox("getValue");
104 - alert(depotNo); 103 + $("#orderListTable").datagrid("load", {
  104 + statusStr : "2,3",
  105 + depotNo : depotNo
  106 + });
105 } 107 }
106 }); 108 });
107 109
@@ -118,7 +120,7 @@ $(function() { @@ -118,7 +120,7 @@ $(function() {
118 skup : $("#skup_0").val(), 120 skup : $("#skup_0").val(),
119 sellerWaybillCode : $("#sellerWaybillCode_0").val(), 121 sellerWaybillCode : $("#sellerWaybillCode_0").val(),
120 mobile : $("#mobile_0").val(), 122 mobile : $("#mobile_0").val(),
121 - depotNo : $("#depotNo").myCombobox("getValue") 123 + depotNo : $("#depotNo").combobox("getValue")
122 }); 124 });
123 } 125 }
124 }); 126 });
@@ -134,7 +136,8 @@ $(function() { @@ -134,7 +136,8 @@ $(function() {
134 storageId : $("#sku_1").val(), 136 storageId : $("#sku_1").val(),
135 skup : $("#skup_1").val(), 137 skup : $("#skup_1").val(),
136 sellerWaybillCode : $("#sellerWaybillCode_1").val(), 138 sellerWaybillCode : $("#sellerWaybillCode_1").val(),
137 - mobile : $("#mobile_1").val() 139 + mobile : $("#mobile_1").val(),
  140 + depotNo : $("#depotNo").combobox("getValue")
138 }); 141 });
139 } 142 }
140 }) 143 })
@@ -164,6 +167,7 @@ $(function() { @@ -164,6 +167,7 @@ $(function() {
164 $("#skup_0").textbox('setValue',''); 167 $("#skup_0").textbox('setValue','');
165 $("#orderListTable").datagrid("load", { 168 $("#orderListTable").datagrid("load", {
166 statusStr: "2,3", 169 statusStr: "2,3",
  170 + depotNo: $("#depotNo").combobox("getValue")
167 }); 171 });
168 } 172 }
169 }); 173 });
@@ -181,6 +185,7 @@ $(function() { @@ -181,6 +185,7 @@ $(function() {
181 $("#skup_1").textbox('setValue',''); 185 $("#skup_1").textbox('setValue','');
182 $("#orderListTable").datagrid("load", { 186 $("#orderListTable").datagrid("load", {
183 statusStr: "4,13", 187 statusStr: "4,13",
  188 + depotNo: $("#depotNo").combobox("getValue")
184 }); 189 });
185 } 190 }
186 }); 191 });
@@ -195,7 +200,8 @@ function getToBeJudgedList(){ @@ -195,7 +200,8 @@ function getToBeJudgedList(){
195 url: contextPath + "/buyerOrder/queryOrderList", 200 url: contextPath + "/buyerOrder/queryOrderList",
196 method: 'POST', 201 method: 'POST',
197 queryParams: { 202 queryParams: {
198 - statusStr: "2,3" 203 + statusStr: "2,3",
  204 + depotNo: $("#depotNo").combobox("getValue")
199 }, 205 },
200 loadFilter: function (data) { 206 loadFilter: function (data) {
201 var temp = defaultLoadFilter(data); 207 var temp = defaultLoadFilter(data);
@@ -314,7 +320,6 @@ function getToBeJudgedList(){ @@ -314,7 +320,6 @@ function getToBeJudgedList(){
314 } 320 }
315 321
316 function getAlreadyJudgedList(){ 322 function getAlreadyJudgedList(){
317 - var depotNo = $("#depotNo").myCombobox("getValue");  
318 $("#orderListTable").myDatagrid({ 323 $("#orderListTable").myDatagrid({
319 fit: true, 324 fit: true,
320 fitColumns: true, 325 fitColumns: true,
@@ -323,7 +328,7 @@ function getAlreadyJudgedList(){ @@ -323,7 +328,7 @@ function getAlreadyJudgedList(){
323 method: 'POST', 328 method: 'POST',
324 queryParams: { 329 queryParams: {
325 statusStr: "4,13", 330 statusStr: "4,13",
326 - depotNo: depotNo 331 + depotNo: $("#depotNo").combobox("getValue")
327 }, 332 },
328 loadFilter: function (data) { 333 loadFilter: function (data) {
329 var temp = defaultLoadFilter(data); 334 var temp = defaultLoadFilter(data);