修改客户信息

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -396,7 +396,6 @@ public class AdminSalesOrderController {
     @RequestMapping("/download_efast_order")
     public void downloadEfastOrderExcel(HttpServletRequest request,HttpServletResponse res,
                                 SalesOrder salesOrder) throws Exception{
-        salesOrder.setSalesIsDownload(1);
         //根据id查询订单数据
         List<SalesOrder> orderList = salesOrderService.listOrderExcel(salesOrder);
             String[] cells = {
@@ -544,6 +543,7 @@ public class AdminSalesOrderController {
                salesOrder.setSalesOrderId(oderIds.get(i));
                salesOrder.setSalesPostFirm(code);
                salesOrder.setSalesPostNum(danhao.get(i));
+               salesOrder.setSalesShippingStatus(1);//状态改为已发货
                Integer msg = salesOrderService.updateSalesOrderByDealCode(salesOrder);
                if(msg > 0){
                    success++;

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -64,14 +64,14 @@
                     <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
                     <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
                 </select>-->
-                <select class="my-select" name="isHaveImport" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <select class="my-select" name="isHaveImport" id="isHaveImport" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                     <option value ="">是否已导出过</option>
                     <#--<option value ="1">是</option>
                     <option value ="2">否</option>-->
                     <option value ="1" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "1" >selected="selected"</#if></#if>>是</option>
                     <option value ="2" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "2" >selected="selected"</#if></#if>>否</option>
                 </select>
-                <select class="my-select" name="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <select class="my-select" name="isDeliverGoods" id="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                     <option value ="">是否已发货</option>
                     <#--<option value ="1">是</option>
                     <option value ="2">否</option>-->
@@ -355,7 +355,12 @@
 
     /*导出上传到efast的Excel*/
     $('#order_excel').click(function (e) {
-        window.location="${path}/admin/salesOrder/download_efast_order";
+       var isHaveImport = $("#isHaveImport").val();
+       var isDeliverGoods = $("#isDeliverGoods").val();
+       var storeName = $("#storeName").val();
+       var startDate = $("#startDate").val();
+       var endDate = $("#endDate").val();
+        window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&storeName="+storeName+"&startDate="+startDate+"&endDate="+endDate;
     })
 
 </script>