diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e52083d..03d3779 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,18 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -24,7 +27,10 @@
-
+
+
+
+
@@ -83,21 +89,30 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -112,7 +127,11 @@
-
+
+
+
+
+
1633847937612
@@ -184,11 +203,102 @@
1635067483089
-
+
+ 1635067920033
+
+
+
+ 1635067920033
+
+
+ 1635083574492
+
+
+
+ 1635083574492
+
+
+ 1635088810703
+
+
+
+ 1635088810703
+
+
+ 1635655791788
+
+
+
+ 1635655791788
+
+
+ 1635775792351
+
+
+
+ 1635775792351
+
+
+ 1635780400746
+
+
+
+ 1635780400746
+
+
+ 1635865804532
+
+
+
+ 1635865804532
+
+
+ 1636265845920
+
+
+
+ 1636265845920
+
+
+ 1636268317457
+
+
+
+ 1636268317457
+
+
+ 1636268567040
+
+
+
+ 1636268567040
+
+
+ 1636276001595
+
+
+
+ 1636276001595
+
+
+ 1636276496007
+
+
+
+ 1636276496007
+
+
+ 1636891272640
+
+
+
+ 1636891272640
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/public/index.php
- 13
-
-
-
- file://$PROJECT_DIR$/public/hotel.php
- 15
-
-
-
-
-
\ No newline at end of file
diff --git a/application/admin/controller/CfItem.php b/application/admin/controller/CfItem.php
index 378b33a..03fdd51 100755
--- a/application/admin/controller/CfItem.php
+++ b/application/admin/controller/CfItem.php
@@ -57,7 +57,7 @@ class CfItem extends Backend
->alias("a")
->join('hbp_admin c','a.create_id = c.id','left')
->join('hbp_admin d','a.purchase_user_id = d.id','left')
- ->field("a.*,c.nickname,d.nickname as purchase_user_name")
+ ->field("a.*,d.nickname")
->where($where);
if ($group_id){
$list = $list
@@ -76,7 +76,7 @@ class CfItem extends Backend
$config1 = json_decode($config1,true);
$res = $list->items();
foreach ($res as $key=>$val){
- $res[$key]["item_type_name"]=$config[$val["item_type"]];
+ $res[$key]["item_type"]=$config[$val["item_type"]];
$res[$key]["item_unit"]=$config1[$val["item_unit"]];
}
$result = array("total" => $list->total(), "rows" => $list->items());
diff --git a/application/admin/controller/CfRoomInfo.php b/application/admin/controller/CfRoomInfo.php
index 81180c4..114bd94 100755
--- a/application/admin/controller/CfRoomInfo.php
+++ b/application/admin/controller/CfRoomInfo.php
@@ -57,7 +57,7 @@ class CfRoomInfo extends Backend
->alias('a')
->join('hbp_cf_hotel_info b','a.hotel_id = b.id','left')
->join('hbp_admin c','a.create_id = c.id','left')
- ->field("a.id,a.room_name,a.room_memo,b.hotel_name,a.create_time,a.update_time,c.nickname")
+ ->field("a.id,a.hotel_id,a.room_name,a.room_memo,b.hotel_name,a.create_time,a.update_time,c.nickname")
->where($where);
if ($group_id){
$list = $list
diff --git a/application/admin/controller/CfRoomPlan.php b/application/admin/controller/CfRoomPlan.php
index 4f76eed..e83011a 100755
--- a/application/admin/controller/CfRoomPlan.php
+++ b/application/admin/controller/CfRoomPlan.php
@@ -88,7 +88,7 @@ class CfRoomPlan extends Backend
->join('hbp_admin d','a.purchase_user_id = d.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 as purchase_user_name,e.room_name,f.hotel_name")
+ ->field("a.*,c.nickname,d.nickname,e.room_name,f.hotel_name")
->where($where);
if ($group_id){
$list = $list
@@ -100,7 +100,11 @@ class CfRoomPlan extends Backend
->order($sort, $order)
->paginate($limit);
}
- $result = array("total" => $list->total(), "rows" => $list->items());
+ $result = $list->items();
+ foreach ($result as $k=>$item){
+ $result[$k]["continuity_type"]=$this->continuity_type[$item["continuity_type"]];
+ }
+ $result = array("total" => $list->total(), "rows" => $result);
return json($result);
}
return $this->view->fetch();
diff --git a/application/admin/lang/zh-cn/cf_item.php b/application/admin/lang/zh-cn/cf_item.php
index c366e08..9514e82 100755
--- a/application/admin/lang/zh-cn/cf_item.php
+++ b/application/admin/lang/zh-cn/cf_item.php
@@ -4,7 +4,7 @@ return [
'Id' => '附加项目ID',
'Item_type' => '附件项目类型',
'Item_name' => '附件项目名称',
- 'Item_unit' => '计价单位 件、份、匝、张等',
+ 'Item_unit' => '计价单位',
'Item_memo' => '附件项目说明',
'Item_log' => '日志',
'Country_id' => '国家ID',
diff --git a/application/admin/lang/zh-cn/order_item.php b/application/admin/lang/zh-cn/order_item.php
index 75cf4ab..b0b7113 100755
--- a/application/admin/lang/zh-cn/order_item.php
+++ b/application/admin/lang/zh-cn/order_item.php
@@ -7,7 +7,7 @@ return [
'Item_type' => '附加项目类型',
'Item_name' => '附加项目名称',
'Item_memo' => '附加项目说明',
- 'Item_unit' => '计价单位 件、份、匝、张等',
+ 'Item_unit' => '计价单位',
'Use_date' => '使用日期',
'Prod_num' => '产品数量',
'Total_price' => '总金额',
diff --git a/application/admin/view/cf_item/edit.html b/application/admin/view/cf_item/edit.html
index b3131dc..8ce882b 100755
--- a/application/admin/view/cf_item/edit.html
+++ b/application/admin/view/cf_item/edit.html
@@ -16,7 +16,7 @@
diff --git a/public/assets/js/backend/cf_hotel_info.js b/public/assets/js/backend/cf_hotel_info.js
index ca9e0d3..cd87e93 100755
--- a/public/assets/js/backend/cf_hotel_info.js
+++ b/public/assets/js/backend/cf_hotel_info.js
@@ -24,7 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
columns: [
[
- {checkbox: true},
+ {field: 'id', title: __('Id')},
{field: 'hotel_name', title: __('Hotel_name'), operate: 'LIKE'},
{field: 'hotel_phone', title: __('Hotel_phone'), operate: 'LIKE'},
{field: 'nickname', title: __('创建人')},
diff --git a/public/assets/js/backend/cf_item.js b/public/assets/js/backend/cf_item.js
index a13db1f..7f552dd 100755
--- a/public/assets/js/backend/cf_item.js
+++ b/public/assets/js/backend/cf_item.js
@@ -16,7 +16,12 @@ 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='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);
+ });
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -25,15 +30,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
columns: [
[
{field: 'id', title: __('Id')},
- {field: 'item_type_name', title: __('Item_type')},
+ {field: 'item_type', title: __('Item_type'),
+ searchList: {"1":"一日游","2":"交通接驳","3":"租车","4":"门票"}},
{field: 'item_name', title: __('Item_name'), operate: 'LIKE'},
- {field: 'item_unit', title: __('计价单位'), operate: 'LIKE'},
- {field: 'item_memo', title: __('Item_memo'), operate: 'LIKE'},
+ {field: 'item_unit', title: __('计价单位'),
+ searchList: {"1":"件","2":"份","3":"匝","4":"张"}},
+ {field: 'item_memo', title: __('Item_memo'), operate: 'LIKE',visible: false},
{field: 'province_name', title: __('Province_name'), operate: 'LIKE'},
{field: 'city_name', title: __('City_name'), operate: 'LIKE'},
{field: 'area_name', title: __('地区名'), operate: 'LIKE'},
{field: 'detail_address', title: __('Detail_address'), operate: 'LIKE'},
- {field: 'purchase_user_name', title: __('采购负责人'), operate: 'LIKE'},
+ {field: '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}
diff --git a/public/assets/js/backend/cf_room_info.js b/public/assets/js/backend/cf_room_info.js
index a27e989..b6e84e9 100755
--- a/public/assets/js/backend/cf_room_info.js
+++ b/public/assets/js/backend/cf_room_info.js
@@ -24,9 +24,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
columns: [
[
- {checkbox: true},
- {field: 'hotel_name', title: __('酒店名称')},
+ {field: 'hotel_id', title: __('酒店ID')},
+ {field: 'hotel_name', title: __('酒店名称'),operate: 'LIKE'},
{field: 'nickname', title: __('创建人')},
+ {field: 'id', title: __('房型ID')},
{field: 'room_name', title: __('Room_name'), operate: 'LIKE'},
{field: 'room_memo', title: __('Room_memo'), operate: 'LIKE'},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
diff --git a/public/assets/js/backend/cf_room_plan.js b/public/assets/js/backend/cf_room_plan.js
index 3bb8d1c..a9dc7de 100755
--- a/public/assets/js/backend/cf_room_plan.js
+++ b/public/assets/js/backend/cf_room_plan.js
@@ -16,7 +16,12 @@ 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");
+ Form.events.cxselect(form);
+ Form.events.selectpage(form);
+ });
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -25,15 +30,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
columns: [
[
{field: 'id', title: __('Id')},
+ {field: 'hotel_id', title: __('酒店ID')},
{field: 'hotel_name', title: __('酒店')},
+ {field: 'room_id', title: __('房型ID')},
{field: 'room_name', title: __('房型')},
{field: 'plan_name', title: __('Plan_name'), operate: 'LIKE'},
{field: 'breakfast_num', title: __('Breakfast_num')},
{field: 'book_end_day', title: __('Book_end_day')},
{field: 'book_end_hour', title: __('Book_end_hour')},
- {field: 'continuity_type', title: __('Continuity_type')},
+ {field: 'continuity_type', title: __('Continuity_type'),
+ searchList: {"0": __('无限制'), "1": __('连住几晚'),"2": __('连住几晚及以上'),"3": __('连住几晚及其倍数')}},
{field: 'coutinuity_day', title: __('Coutinuity_day')},
- {field: 'purchase_user_name', title: __('Charge_person'), operate: 'LIKE'},
+ {field: 'd.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}