wangxiaoming il y a 6 ans
Parent
commit
d2427e0141

+ 8 - 0
watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/LogisticsInfoService.java

@@ -22,6 +22,14 @@ public interface LogisticsInfoService {
      * @return  logisticsInfo
      */
     LogisticsInfo  getLogisticsInfoById(Integer  id);
+
+    /**
+     * 查询单条数据
+     * @param  code
+     * @return  logisticsInfo
+     */
+    String  getLogisticsNameById(String code);
+
     /**
      * 增加数据
      * @param  logisticsInfo

+ 3 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1427,6 +1427,9 @@
             <if test="salesWarehouseId !=null and salesWarehouseId !=''">
                 AND sales_warehouse_id = #{salesWarehouseId}
             </if>
+            <if test="salesMainOrderId !=null">
+                AND sales_main_order_id = #{salesMainOrderId}
+            </if>
             <if test="orderDateType == null or orderDateType == 1">
                 <if test="startDate != null and startDate != ''">
                     AND sales_create_time <![CDATA[>=]]> #{startDate}

+ 13 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/order/LogisticsInfoServiceImpl.java

@@ -35,6 +35,19 @@ public class LogisticsInfoServiceImpl  implements LogisticsInfoService {
     public  LogisticsInfo  getLogisticsInfoById(Integer  id){
         return  logisticsInfoMapper.getLogisticsInfoById(id);
     }
+
+    @Override
+    public String getLogisticsNameById(String code) {
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoMapper.getLogisticsInfoList(new LogisticsInfo());
+        String name = null;
+        for (LogisticsInfo logisticsInfo :logisticsInfoList) {
+            if(logisticsInfo.getLogisticsRstCode().equals(code)){
+                name = logisticsInfo.getLogisticsName();
+            }
+        }
+        return name;
+    }
+
     /**
      * 增加数据
      * @param  logisticsInfo

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

@@ -1207,4 +1207,82 @@ public class AdminSalesOrderController {
         return ResponseJson.getSUCCESS();
     }
 
+    /**
+     * 拆分订单详情
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/split_order")
+    @RequiresPermissions("salesOrder:split:salesOrder")
+    public ModelAndView splitOrder(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("order/salesOrder/sales_order_split");
+        String salesId = request.getParameter("salesId");
+        if (!StringUtils.isNotEmpty(salesId)) {
+            return mv;
+        }
+        SalesOrder order = new SalesOrder();
+        order.setSalesId(Integer.parseInt(salesId));
+        //根据id查询订单数据
+        List<SalesOrder> orderList = salesOrderService.salesOrderListAndItem(order);
+        if (orderList == null || orderList.size() == 0) {
+            return mv;
+        }
+        order = orderList.get(0);
+        if(order.getSalesMainOrderId() != null){
+            SalesOrder or = new SalesOrder();
+            or.setSalesId(order.getSalesMainOrderId());
+            //该订单为主订单
+            orderList = salesOrderService.salesOrderListAndItem(or);
+            if (orderList == null || orderList.size() == 0) {
+                return mv;
+            }
+            order = orderList.get(0);
+        }
+
+        //查询副订单,以及订单项信息
+        SalesOrder viceOr = new SalesOrder();
+        viceOr.setSalesMainOrderId(order.getSalesId());
+        List<SalesOrder> viceOrList = salesOrderService.salesOrderListAndItem(viceOr);
+        Collections.reverse(viceOrList);
+
+        //合并产品项-- 所有产品项
+        List<SalesOrderItem> salesOrderItemList = new ArrayList<>();
+        salesOrderItemList.addAll(order.getSalesOrderItemList());
+        for(SalesOrder sor : viceOrList){
+            for (SalesOrderItem soim:sor.getSalesOrderItemList()) {
+
+                boolean flag = false;
+                for (SalesOrderItem soi: salesOrderItemList) {
+                    if(soim.getItemColorBar().equals(soi.getItemColorBar())){
+                        soi.setItemNum(soi.getItemNum()+soim.getItemNum());
+                    }else{
+                        flag = true;
+                    }
+                }
+                if(flag){
+                    salesOrderItemList.add(soim);
+                }
+
+            }
+        }
+
+        String codeName = logisticsInfoService.getLogisticsNameById(order.getSalesPostFirm());
+
+//        1:确认订单时选择了拆单
+//            a:选择主订单进行拆单,拆单栏应该有已拆单的哪项,原订单产品栏显示所有订单产品
+//            b:选择副订单进行拆单,获取主订单的id,到主订单的拆单页面
+//            拆单页面,应该有确认时自动拆单的一个拆单项,可以做出修改,最后“确认拆单”时,将以前拆过的单的订单项进行修改/删除,将其他订单进行添加(添加规则-1,-2,-3);
+//
+//        2:确认未选择拆单
+//            选择订单拆单,展示产品,可以添加拆分订单,最后“确认拆单”时,全部做添订单处理
+
+        mv.addObject("order",order);
+        mv.addObject("codeName",codeName);
+        mv.addObject("viceOrList",viceOrList);
+        mv.addObject("salesOrderItemList",salesOrderItemList);
+        return mv;
+    }
+
+
 }

+ 10 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -225,9 +225,9 @@
                             <i class="Hui-iconfont">&#xe669;</i>
                         </a>
 
-                        <#--<a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">-->
-                            <#--<i class="Hui-iconfont">&#xe6ea;</i>-->
-                        <#--</a>-->
+                        <a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">
+                            <i class="Hui-iconfont">&#xe6ea;</i>
+                        </a>
 
                         <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
                             <i class="Hui-iconfont">&#xe62f;</i>
@@ -340,6 +340,7 @@
                        tr.find(".order_details_target").show();
                    } else {
                        // 已确认
+
                        if (orderStatus == "11") {
                            // 已通知配货
                            if (deliverStatus == "1") {
@@ -362,6 +363,7 @@
                            tr.find(".invalid_order_target").show();
                            tr.find(".notice_distribution_target").show();
                            tr.find(".del_order_target").show();
+                           tr.find(".split_order_target").show();
                        } else {
                            tr.find(".order_details_target").show();
                            tr.find(".invalid_order_target").show();
@@ -386,6 +388,11 @@
         layer_show(title,url,w,h);
     }
 
+   /*拆分订单*/
+    function split_order(orderSaleId){
+        window.location.href= "${path}/admin/salesOrder/split_order?salesId="+orderSaleId;
+        <#--layer_show("拆分订单","${path}/admin/salesOrder/split_order?salesId="+orderSaleId,800,600);-->
+    }
 
     
     function chooseWarehouse(id) {

+ 401 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_split.ftl

@@ -0,0 +1,401 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+
+        #suggest, #suggest2 {width:200px}
+        .gray {color:gray}
+        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_over, .ac_results li a:hover {background:#c8e3fc}
+        .ac_results li a span {float:right}
+        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
+
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
+        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
+        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list .red{display: inline-block; padding: 2px; background: red;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
+        .txt-red{color:red}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+    </style>
+    <title>拆分订单</title>
+</head>
+<body>
+
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 订单管理
+    <span class="c-gray en">&gt;</span> 拆分订单
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
+
+
+<article class="cl pd-20">
+    <form action="" method="post" class="form form-horizontal" id="form-article-add">
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    用户信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="20">收货人姓名:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.salesAddressName!''}</span></td>
+                <th width="20">手机号码:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.salesAddressTel!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">收货人地址:</th>
+                <td width="210" colspan="4" style="font-weight: normal;"><span>${order.salesAddressInfo!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">备注:</th>
+                <td width="210" colspan="4" style="font-weight: normal;"><span>${order.salesUserRemark!''}</span></td>
+            </tr>
+            </thead>
+        </table>
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">订单详细信息</div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="20">批次号:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次'}</span></td>
+                <th width="20">下单日期:</th>
+                <td width="70" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">订单编号:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.salesOrderId!'暂无订单编号'}</span></td>
+                <th width="20">交易号:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.salesDealCode!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">销售公司:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.companyName!''}</span></td>
+                <th width="20">销售渠道:</th>
+                <td width="70" style="font-weight: normal;"><span>${order.storeName!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">是否支付:</th>
+                <td width="70" style="font-weight: normal;"><span>
+                <#if order.salesPayStatus == 0>
+                    未
+                <#elseif order.salesPayStatus == 2>
+                    已付款
+                </#if></span></td>
+                <th width="20">支付金额:</th>
+                <td width="70" style="font-weight: normal;"><span>¥${order.salesPayMoney/100!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">付款方式:</th>
+                <td width="70" style="font-weight: normal;"><span>
+                <#if order.salesPayType == 1>
+                    微信支付
+                <#elseif order.salesPayType == 2>
+                    现金支付
+                <#elseif order.salesPayType == 3>
+                    已支付定金¥99
+                <#elseif order.salesPayType == 4>
+                    刷卡支付
+                <#elseif order.salesPayType == 5>
+                    支付宝支付
+                </#if>
+                </span></td>
+                <th width="20">支付时间:</th>
+                <td width="70" style="font-weight: normal;"><span>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
+            </tr>
+            <tr>
+                <th width="20">录入人:</th>
+                <td width="70" style="font-weight: normal;">${order.salesAdminName!''}</td>
+
+                <th width="20"></th>
+                <td width="70" style="font-weight: normal;"><span></span></td>
+            </tr>
+            </thead>
+        </table>
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    发货信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="20">是否发货:</th>
+                <td width="70" style="font-weight: normal;"><span>
+                <#if order.salesShippingStatus == 0>
+                    未发货
+                <#elseif order.salesShippingStatus == 1>
+                    已发货
+                <#elseif order.salesShippingStatus == 1>
+                    备货中
+                </#if></span></td>
+                <th width="20">发货时间:</th>
+                <td width="70" style="font-weight: normal;"><span>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</span></td>
+            </tr>
+            <tr>
+                <th width="20">物流公司:</th>
+                <td width="70" style="font-weight: normal;"><span>
+                <#if order.salesPostFirm??>
+                        ${codeName}
+                    </#if>
+                </span></td>
+                <th width="20">物流单号:</th>
+                <td width="70" style="font-weight: normal;"><span>
+                ${order.salesPostNum!'暂无快递单号'}
+                <#if order.salesPostNum??>
+                    <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${order.salesPostNum!''}&billName=${order.salesPostFirm!''}',300,400);">查看物流</a>
+                </#if>
+                </span></td>
+            </tr>
+            </thead>
+        </table>
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    后台信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <td>${order.salesAdminRemark!'暂无后台信息'}</td>
+            </tr>
+            </thead>
+        </table>
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    购买产品
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+            <#--<label class="form-label col-2 col-sm-2">购买产品信息:</label>-->
+                <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+                    <tr class="text-c">
+                        <th>产品名称</th>
+                        <th>产品颜色</th>
+                        <th>产品数量</th>
+                    </tr>
+                    <#if salesOrderItemList?? &&  (salesOrderItemList?size > 0) >
+                        <#list salesOrderItemList as item>
+                            <tr class="text-c">
+                                <td>${item.itemProductName!''}</td>
+                                <td>${item.itemProductColor!''}</td>
+                                <td>${item.itemNum}</td>
+                            </tr>
+                        </#list>
+                    </#if>
+                </table>
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">
+                        已拆的单
+                    </div>
+                </label>
+                <div class="formControls col-10 col-sm-10">
+                </div>
+            </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
+            <thead>
+                <tr class="text-c">
+                    <th width="50">订单编号</th>
+                    <th width="50">产品名称</th>
+                    <th width="20">颜色</th>
+                    <th width="100">产品编号</th>
+                    <th width="10">产品数量</th>
+                    <th width="50">操作</th>
+                </tr>
+            </thead>
+            <tbody id="allDay">
+
+                <#list order.salesOrderItemList as orderItem>
+                    <tr class="text-c">
+                        <td msg="${order.salesDealCode!''}">${order.salesDealCode!''}(主订单)</td>
+                        <td>${orderItem.itemProductName}</td>
+                        <td>${orderItem.itemProductColor}</td>
+                        <td>${orderItem.itemColorBar}</td>
+                        <td><input type="text" style="width: 100%;text-align: center;" class="input-text input-number input-itemNum" value="${orderItem.itemNum!"0"}"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>
+                        <td msg="${order.salesDealCode!''}">
+                            <a href="javascript:void(0)" onclick="updateOrderItem(this)">修改</a>
+                        </td>
+                    </tr>
+                    <tr class="text-c">
+                        <td msg="${order.salesDealCode!''}"></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td msg="${order.salesDealCode+1!''}">
+                            <a href="javascript:void(0)" onclick="addOrderItem(this)">添加</a>
+                        </td>
+                    </tr>
+                </#list>
+
+                <#if viceOrList?? &&  (viceOrList?size > 0) >
+                    <#list viceOrList as viceOr>
+                        <#list viceOr.salesOrderItemList as orderItem>
+                            <tr class="text-c">
+                                <td msg="${viceOr.salesDealCode!''}">${viceOr.salesDealCode!''}</td>
+                                <td>${orderItem.itemProductName}</td>
+                                <td>${orderItem.itemProductColor}</td>
+                                <td>${orderItem.itemColorBar}</td>
+                                <td><input type="text" style="width: 100%;text-align: center;" class="input-text input-number input-itemNum" value="${orderItem.itemNum!"0"}"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>
+                                <td msg="${viceOr.salesDealCode!''}">
+                                    <a href="javascript:void(0)" onclick="updateOrderItem(this)">修改</a>
+                                    <a href="javascript:void(0)" onclick="deleteOrderItem(this)">删除</a>
+                                </td>
+                            </tr>
+                        </#list>
+                        <tr class="text-c">
+                            <td msg="${viceOr.salesDealCode!''}"></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td msg="${viceOr.salesDealCode!''}">
+                                <a href="javascript:void(0)" onclick="addOrderItem(this)">添加</a>
+                            </td>
+                        </tr>
+                    </#list>
+                </#if>
+            </tbody>
+        </table>
+
+    </form>
+    </div>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.parse.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    $(function(){
+        tableMana(0);
+        tableMana(5);
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $("#province").ProvinceCity();
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
+            console.log($(this)[0].value);
+            //		$("#city2").click()
+        },
+            attachObject:'#suggest'
+        });
+    });
+    /*查看物流*/
+    function openLogistics(title, url, w, h) {
+        layer_show(title,url,w,h);
+    }
+
+</script>
+
+<script>
+    function tableMana(num) {
+        var rowspanName = null;
+        var rowspanNum = 1;
+        var $rowspan=null;
+        $("#allDay").find("tr").each(function(){
+            var $tdNode =  $(this).find("td").eq(num);
+            $tdNode.hide();
+            if(rowspanName == null){
+                rowspanName = $tdNode.attr("msg");
+                $rowspan = $tdNode;
+                return true;
+            }
+            if(rowspanName == $tdNode.attr("msg")){
+                rowspanNum ++;
+            }else{
+                $rowspan.show();
+                $rowspan.attr("rowspan",rowspanNum);
+
+                $rowspan = $tdNode;
+                rowspanNum = 1;
+                rowspanName = $tdNode.attr("msg");
+            }
+        });
+        $rowspan.show();
+        $rowspan.attr("rowspan",rowspanNum);
+    }
+</script>
+</body>
+</html>