客户系统修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/FinanciaReceController.java

@@ -1,11 +1,13 @@
 package com.iamberry.rst.controllers.dm;
 
+import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.dm.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.faces.cm.CompanyInfoService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.dm.*;
 import com.iamberry.rst.faces.sys.SysService;
@@ -48,6 +50,8 @@ public class FinanciaReceController {
     private DealerChannelService dealerChannelService;
     @Autowired
     private DealerProductService dealerProductService;
+    @Autowired
+    private CompanyInfoService companyInfoService;
 
 
     /**
@@ -405,4 +409,27 @@ public class FinanciaReceController {
         rj.addResponseKeyValue("salesOrderList", salesOrderList);
         return rj;
     }
+
+    /**
+     * 到选择订单页面
+     * @param request
+     * @return
+     */
+    @RequestMapping("/to_select_order")
+    public ModelAndView toSelectOrder(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView("dm/financialReceipt/select_order_list");
+
+        SalesOrder salesOrder = new SalesOrder();
+        String salesStatusStr = request.getParameter("salesStatus");
+        if(salesStatusStr != null && !"".equals(salesStatusStr)){
+            salesOrder.setSalesStatus(Integer.valueOf(salesStatusStr));
+        }
+
+        //获取销售公司
+        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
+        mv.addObject("companyInfoList", companyInfoList);
+        mv.addObject("salesOrder", salesOrder);
+        return mv;
+    }
+
 }

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

@@ -1912,21 +1912,6 @@ public class AdminSalesOrderController {
     }
 
     /**
-     * 到选择订单页面
-     * @param request
-     * @return
-     */
-    @RequestMapping("/to_select_order")
-    public ModelAndView toSelectOrder(HttpServletRequest request){
-        ModelAndView mv = new ModelAndView("order/salesOrder/select_order_list");
-
-        //获取销售公司
-        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
-        mv.addObject("companyInfoList", companyInfoList);
-        return mv;
-    }
-
-    /**
      * 获取订单集合
      *
      * @param request
@@ -1947,25 +1932,4 @@ public class AdminSalesOrderController {
         rj.addResponseKeyValue("pagedResult", pagedResult);
         return rj;
     }
-
-    /**
-     * 获取订单集合
-     * @param request
-     * @param salesOrder
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/select_order_desc")
-    public ResponseJson selectOrderDesc(HttpServletRequest request, SalesOrder salesOrder,String ids) {
-        if (ids != null && ids.indexOf("_") > -1) {
-            String[] salesIds = ids.split("_");
-            salesOrder.setSalesIds(salesIds);
-        }
-        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
-        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
-        rj.addResponseKeyValue("salesOrderList", salesOrderList);
-        return rj;
-    }
-
-
 }

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/order_desc.ftl

@@ -265,7 +265,7 @@
      */
     function selectOrder(type) {
         isAddOrderType=type;
-        layer_show("搜索订单",url_path + "/admin/salesOrder/to_select_order","1200","500");
+        layer_show("搜索订单",url_path + "/admin/financial_receipt/to_select_order?salesStatus="+1,"1200","500");
     }
     
     function showSelectOrder(orderIds) {

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/select_order_list.ftl

@@ -83,6 +83,18 @@
                         </span>
                     </div>
 
+
+                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
+                        <select name="salesStatus" class="select" id="salesStatus"  >
+                             <option value="">状态</option>
+                             <option value="0" <#if salesOrder.salesStatus?? ><#if salesOrder.salesStatus == 0 >selected</#if></#if>>未确认</option>
+                             <option value="1" <#if salesOrder.salesStatus?? ><#if salesOrder.salesStatus == 1 >selected</#if></#if>>确认</option>
+                             <option value="2" <#if salesOrder.salesStatus?? ><#if salesOrder.salesStatus == 2 >selected</#if></#if>>挂起</option>
+                             <option value="3" <#if salesOrder.salesStatus?? ><#if salesOrder.salesStatus == 3 >selected</#if></#if>>作废</option>
+                        </select>
+                        </span>
+                     </div>
+
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
                         <input type="text" class="input-text" value="" placeholder="订单号" id="salesOrderId" name="">
                     </div>
@@ -172,19 +184,21 @@
             shade: [0.5,'#fff'] //0.1透明度的白色背景
         });
 
-        var salesCompanyId = convertUndefinedToEmpty($("#companyId").val());
-        var salesStoreId = convertUndefinedToEmpty($("#storeId").val());
-        var salesOrderStatus = convertUndefinedToEmpty($("#salesOrderStatus").val());
-        var salesId = convertUndefinedToEmpty($("#salesId").val());
-        var salesAddressName =convertUndefinedToEmpty($("#salesAddressName").val());
-        var salesAddressTel = convertUndefinedToEmpty($("#salesAddressTel").val());
-        var salesOrderId = convertUndefinedToEmpty($("#salesOrderId").val());
+        var salesCompanyId = cufte($("#companyId").val());
+        var salesStoreId = cufte($("#storeId").val());
+        var salesOrderStatus = cufte($("#salesOrderStatus").val());
+        var salesStatus = cufte($("#salesStatus").val());
+        var salesId = cufte($("#salesId").val());
+        var salesAddressName =cufte($("#salesAddressName").val());
+        var salesAddressTel = cufte($("#salesAddressTel").val());
+        var salesOrderId = cufte($("#salesOrderId").val());
         $.ajax({
             type: "POST",
             data: {
                 salesCompanyId : salesCompanyId,
                 salesStoreId : salesStoreId,
                 salesOrderStatus : salesOrderStatus,
+                salesStatus : salesStatus,
                 salesId : salesId,
                 salesOrderId : salesOrderId,
                 salesAddressName : salesAddressName,
@@ -212,11 +226,15 @@
                         }else{
                             orderStatus = salesOrder.procTypeName;
                         }
+
+                        if(salesOrder.salesStatus != 1){
+                            disHtml = 'disabled="disabled" title="只能选择已确认的订单" ';
+                        }
                         html += '<tr class="text-c">' +
-                                ' <td><input type="checkbox" class="sales_order_id" title="" id="" value="'+ salesOrder.salesId +'" '+ disHtml +'></td>' +
-                                ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
-                                ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ convertUndefinedToEmpty(salesOrder.salesOrderId) +'</td>' +
+                                ' <td><input type="checkbox" class="sales_order_id" title="" id="" value="'+ salesOrder.salesId +'" '+ disHtml  +'></td>' +
+                                ' <td>'+ cufte(salesOrder.companyName) +'</td>' +
+                                ' <td>'+ cufte(salesOrder.storeName) +'</td>' +
+                                ' <td>'+ cufte(salesOrder.salesOrderId) +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +