物流

aidea-modules/logistics-module-web/src/main/webapp/WEB-INF/views/logistics/logisticslist.html

@@ -77,12 +77,16 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/logistics/list')" method="get">
+                                <div class="col-xs-2">
+                                    <input type="text" class="form-control "
+                                           name="mailNo" placeholder="顺风运单号">
+                                </div>
                                 <div class="col-xs-5">
                                     <button type="button" class="search btn btn-primary">搜索</button>
                                     #if($shiro.hasPermission("qy:logistics:edit"))
-                                    <a href="#springUrl('/a/logistics/form')" class="btn btn-primary">新增</a>
+                                 <!--   <a href="#springUrl('/a/logistics/form')" class="btn btn-primary">新增</a>
                                     <a href="#springUrl('/a/logistics/exportExcel')" class="btn btn-primary">导出</a>
-                                        <a onclick="importExcel();" class="btn btn-primary">导入</a>
+                                    <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
                                     #end
                                 </div>
                             </form>
@@ -91,8 +95,15 @@
                             <table id="table" class="table table-bordered table-striped">
                                 <thead>
                                 <tr>
-                                    <td hidden="true">Id</td><th>创建时间</th>
-                                    <th>操作</th>
+                                    <td hidden="true">Id</td>
+                                    <td>顺风运单号</td>
+                                    <td>订单号</td>
+                                    <td>路由节点发生时间</td>
+                                    <td>物流编码</td>
+                                    <td>路由节点发生地</td>
+                                    <td>路由节点操作码</td>
+                                    <td>路由节点描述</td>
+                                    <th>创建时间</th>
                                 </tr>
                                 </thead>
                                 <tbody id="tablebody">
@@ -189,26 +200,51 @@
                     "mData": "id"
                 },
                 {
-                        "mData": "createTime"
+                    "mData":"mailNo"
                 },
                 {
-                    "mData": "id"
+                    "mData":"orderNo"
+                },
+                {
+                    "mData":"acceptTime"
+                },
+                {
+                    "mData":"number"
+                },
+                {
+                    "mData":"acceptAddress"
+                },
+                {
+                    "mData":"opcode"
+                },
+                {
+                    "mData":"description"
+                },
+                {
+                    "mData": "createTime"
                 }],
             "aoColumnDefs": [
                 { // set default column settings
                     'visible': false,
                     'targets': [0]
                 },
+                {
+                    "aTargets": [3],
+                    "mData": "acceptTime",
+                    "mRender": function (a, b, c, d) {
+                        return  formatDates(a, "yyyy-MM-dd HH:mm:ss");
+
+                    }
+                },
 
                 {
-                            "aTargets": [1],
+                    "aTargets": [8],
                     "mData": "createTime",
                     "mRender": function (a, b, c, d) {
-                                                                    return '<a href="#springUrl("/a/logistics/form?id=' + c.id + '")" data-id="' + c.id + '" data-action="view">' + formatDates(a, "yyyy-MM-dd HH:mm:ss");
-                                    +'</a>';
+                        return  formatDates(a, "yyyy-MM-dd HH:mm:ss");
 
                     }
-                        },
+                }
 
             ]
         });
@@ -231,6 +267,7 @@
     });
 
     Cfapp.init();
+
     function removeData(data) {
         Cfapp.confirm({
             message: "确定要删除吗",
@@ -262,6 +299,7 @@
             }
         });
     }
+
     function importExcel() {
         var templateExcelUrl = "#springUrl('/a/logistics/templateExcel')";
         var importExcelUrl = "#springUrl('/a/logistics/importExcel')";

aidea-modules/logistics-module/src/main/java/com/cftech/logistics/web/LogisticsController.java

@@ -105,6 +105,9 @@ public class LogisticsController {
         Conds conds = new Conds();
         conds.equal("del_flag", Constants.DEL_FLAG_0);
         conds.equal("accounts_id", accountsId);
+        if(!StringUtils.isEmpty(logistics.getMailNo())){
+            conds.equal("mail_no",logistics.getMailNo());
+        }
         Sort sort = new Sort("create_time", OrderType.DESC);
 
         List<Logistics> list = logisticsService.fetchSearchByPage(conds, sort, iDisplayStart, iDisplayLength);