init

application/admin/controller/CfRoomPlan.php

@@ -84,11 +84,10 @@ class CfRoomPlan extends Backend
             $group_id=$this->auth->getGroupId();
             $list = $this->model
                 ->alias("a")
-                ->join('hbp_admin c','a.create_id = c.id','left')
-                ->join('hbp_admin d','a.purchase_user_id = d.id','left')
+                ->join('hbp_admin','a.purchase_user_id = hbp_admin.id','left')
                 ->join('hbp_cf_room_info e','a.room_id = e.id','left')
                 ->join('hbp_cf_hotel_info f','a.hotel_id = f.id','left')
-                ->field("a.*,c.nickname,d.nickname,e.room_name,f.hotel_name")
+                ->field("a.*,hbp_admin.nickname,e.room_name,f.hotel_name")
                 ->where($where);
             if ($group_id){
                 $list = $list
@@ -103,7 +102,8 @@ class CfRoomPlan extends Backend
             $result = $list->items();
             foreach ($result as $k=>$item){
                     $result[$k]["continuity_type"]=$this->continuity_type[$item["continuity_type"]];
-                }
+                    $result[$k]["hbp_admin.nickname"] = $item["nickname"];
+            }
             $result = array("total" => $list->total(), "rows" => $result);
             return json($result);
         }

application/admin/controller/OrderMain.php

@@ -59,8 +59,8 @@ class OrderMain extends Backend
             $list = $this->model
                 ->alias("order_main")
                 ->join('hbp_cf_channel_info b','order_main.channel_id = b.id','left')
-                ->join('hbp_admin c','order_main.create_id = c.id','left')
-                ->field("order_main.*,b.channel_name,c.nickname")
+                ->join('hbp_admin','order_main.create_id = hbp_admin.id','left')
+                ->field("order_main.*,b.channel_name,hbp_admin.nickname")
                 ->where($where);
             if ($group_id){
                 $list = $list
@@ -91,6 +91,7 @@ class OrderMain extends Backend
                         $result[$k]["order_status"]="已取消";
                         break;
                 }
+                $result[$k]["hbp_admin.nickname"] = $item["nickname"];
             }
 
             $result = array("total" => $list->total(), "rows" =>$result);

public/assets/js/backend/cf_room_plan.js

@@ -18,7 +18,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             var table = $("#table");
             table.on('post-common-search.bs.table', function (event, table) {
                 var form = $("form", table.$commonsearch);
-                $("input[name='d.nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
+                $("input[name='hbp_admin.nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
                 Form.events.cxselect(form);
                 Form.events.selectpage(form);
             });
@@ -41,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'continuity_type', title: __('Continuity_type'),
                             searchList: {"0": __('无限制'), "1": __('连住几晚'),"2": __('连住几晚及以上'),"3": __('连住几晚及其倍数')}},
                         {field: 'coutinuity_day', title: __('Coutinuity_day')},
-                        {field: 'd.nickname', title: __('采购负责人')},
+                        {field: 'hbp_admin.nickname', title: __('采购负责人')},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

public/assets/js/backend/order_main.js

@@ -25,7 +25,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 var form = $("form", table.$commonsearch);
                 $("input[name='channel_name']", form).addClass("selectpage").data("source", "cf_channel_info/index").data("primaryKey", "channel_name").data("field", "channel_name").data("orderBy", "id desc");
                 $("input[name='commissioner']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
-                $("input[name='nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
+                $("input[name='hbp_admin.nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
                 Form.events.cxselect(form);
                 Form.events.selectpage(form);
             });
@@ -40,7 +40,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'commissioner', title: __('Commissioner'),formatter: Table.api.formatter.search},
                         {field: 'channel_name', title: __('下单渠道'), operate: 'LIKE'},
                         {field: 'channel_order_no', title: __('Channel_order_no'), operate: 'LIKE'},
-                        {field: 'nickname', title: __('下单用户'), operate: 'LIKE'},
+                        {field: 'hbp_admin.nickname', title: __('订单提交人'), operate: 'LIKE'},
+                        {field: 'user_name', title: __('订单联系人'), operate: 'LIKE'},
                         {field: 'user_phone', title: __('User_phone'), operate: 'LIKE'},
                         {field: 'total_amount', title: __('Total_amount'), operate:'BETWEEN'},
                         {field: 'cost_amount', title: __('Cost_amount'), operate:'BETWEEN'},