소스 검색

系统增加赠品订单的功能。

xian 3 년 전
부모
커밋
da31fb9f4f
1개의 변경된 파일9개의 추가작업 그리고 3개의 파일을 삭제
  1. 9 3
      watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

+ 9 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -133,7 +133,11 @@
 
                 <div class="row cl" style="margin-left: 0px;">
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 150px;">
-                        <input type="text" class="input-text" value="" placeholder="订单号" id="salesOrderId" name="">
+                        <input type="text" class="input-text" value="" placeholder="商城编号" id="salesExOrderId" name="">
+                    </div>
+
+                    <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 150px;">
+                        <input type="text" class="input-text" value="" placeholder="交易号" id="salesOrderId" name="">
                     </div>
 
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 150px;" >
@@ -165,7 +169,7 @@
                     <th width="10"><input type="checkbox" class="selectAll" id="selectAll" value="selectAll" ></th>
                     <th width="50">销售公司</th>
                     <th width="50">店铺名称</th>
-                    <th width="50">单号</th>
+                    <th width="50">商城单号</th>
                     <th width="100">交易号</th>
                     <th width="60">收货人姓名</th>
                     <th width="80">收货人电话</th>
@@ -231,6 +235,7 @@
         });
 
         var dealerId = cufte($("#dealerId").val());
+        var salesExOrderId = cufte($("#salesExOrderId").val());
         var salesStoreId = cufte($("#storeId").val());
         var salesOrderStatus = cufte($("#salesOrderStatus").val());
         var salesStatus = cufte($("#salesStatus").val());
@@ -262,7 +267,8 @@
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,
-                pageSize : 100
+                pageSize : 100,
+                salesExOrderId:salesExOrderId
             },
             url: "${path}/admin/salesOrder/select_order_page",
             async: true,