diff --git a/application/admin/controller/CfHotelInfo.php b/application/admin/controller/CfHotelInfo.php index 37f7e58..2a882d0 100755 --- a/application/admin/controller/CfHotelInfo.php +++ b/application/admin/controller/CfHotelInfo.php @@ -83,7 +83,7 @@ class CfHotelInfo extends Backend if($keyValue){ return json(['list' => $result]); } - return json(['list' => array_merge([['id'=>0,'name'=>'暂无']],$result)]); + return json(['list' => $result]); } /** diff --git a/application/admin/controller/CfItem.php b/application/admin/controller/CfItem.php index 3f9f8ee..378b33a 100755 --- a/application/admin/controller/CfItem.php +++ b/application/admin/controller/CfItem.php @@ -56,7 +56,8 @@ class CfItem extends Backend $list = $this->model ->alias("a") ->join('hbp_admin c','a.create_id = c.id','left') - ->field("a.*,c.nickname") + ->join('hbp_admin d','a.purchase_user_id = d.id','left') + ->field("a.*,c.nickname,d.nickname as purchase_user_name") ->where($where); if ($group_id){ $list = $list @@ -71,9 +72,12 @@ class CfItem extends Backend $config = \think\Config::get("site.item_category"); $config = json_decode($config,true); + $config1 = \think\Config::get("site.item_unit"); + $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_unit"]=$config1[$val["item_unit"]]; } $result = array("total" => $list->total(), "rows" => $list->items()); return json($result); @@ -221,6 +225,11 @@ class CfItem extends Backend foreach ($result as $key=>$value){ $result[$key]["item_type_name"]= $config[$value["item_type"]]; } + $config = \think\Config::get("site.item_unit"); + $config = json_decode($config,true); + foreach ($result as $key=>$value){ + $result[$key]["item_unit"]= $config[$value["item_unit"]]; + } if($keyValue){ return json(['list' => $result]); } diff --git a/application/admin/controller/CfRoomPlan.php b/application/admin/controller/CfRoomPlan.php index 5329798..410db22 100755 --- a/application/admin/controller/CfRoomPlan.php +++ b/application/admin/controller/CfRoomPlan.php @@ -51,7 +51,7 @@ class CfRoomPlan extends Backend public function getList(){ $name=$this->request->post('name'); $keyValue=$this->request->post('keyValue'); - $this->model->field('id,plan_name as name'); + $this->model->field('id,plan_name as name,purchase_user_id'); if($keyValue){ $this->model->where(['id'=>$keyValue]); }elseif($name){ @@ -81,10 +81,10 @@ class CfRoomPlan extends Backend $list = $this->model ->alias("a") ->join('hbp_admin c','a.create_id = c.id','left') - ->join('hbp_admin d','a.charge_person = d.id','left') + ->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 charge_person_name,e.room_name,f.hotel_name") + ->field("a.*,c.nickname,d.nickname as purchase_user_name,e.room_name,f.hotel_name") ->where($where); if ($group_id){ $list = $list diff --git a/application/admin/view/cf_item/add.html b/application/admin/view/cf_item/add.html index a0149d1..21d40b9 100755 --- a/application/admin/view/cf_item/add.html +++ b/application/admin/view/cf_item/add.html @@ -21,7 +21,7 @@
- +
@@ -44,7 +44,12 @@
- +
+ +
+ +
+
diff --git a/application/admin/view/cf_item/edit.html b/application/admin/view/cf_item/edit.html index f827286..b3131dc 100755 --- a/application/admin/view/cf_item/edit.html +++ b/application/admin/view/cf_item/edit.html @@ -16,7 +16,7 @@
- + @@ -40,6 +40,12 @@
+
+ +
+ +
+
diff --git a/application/admin/view/cf_room_plan/add.html b/application/admin/view/cf_room_plan/add.html index 4a4bbba..c38e71f 100755 --- a/application/admin/view/cf_room_plan/add.html +++ b/application/admin/view/cf_room_plan/add.html @@ -58,7 +58,7 @@
- +
diff --git a/application/admin/view/cf_room_plan/edit.html b/application/admin/view/cf_room_plan/edit.html index 1cb87f5..1d01899 100755 --- a/application/admin/view/cf_room_plan/edit.html +++ b/application/admin/view/cf_room_plan/edit.html @@ -57,7 +57,7 @@
- +
diff --git a/application/extra/addons.php b/application/extra/addons.php index 2177468..f7f90e9 100755 --- a/application/extra/addons.php +++ b/application/extra/addons.php @@ -3,7 +3,12 @@ return [ 'autoload' => false, 'hooks' => [], - 'route' => [], + 'route' => [ + '/example$' => 'example/index/index', + '/example/d/[:name]' => 'example/demo/index', + '/example/d1/[:name]' => 'example/demo/demo1', + '/example/d2/[:name]' => 'example/demo/demo2', + ], 'priority' => [], 'domain' => '', ]; diff --git a/application/extra/site.php b/application/extra/site.php index bc03064..f640b59 100755 --- a/application/extra/site.php +++ b/application/extra/site.php @@ -43,4 +43,5 @@ return array ( 'custom' => '自定义', ), 'item_category' => '{"1":"一日游","2":"交通接驳","3":"租车","4":"门票"}', + 'item_unit' => '{"1":"件","2":"份","3":"匝","4":"张"}', ); diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js index d2c1d20..37cec86 100755 --- a/public/assets/js/addons.js +++ b/public/assets/js/addons.js @@ -1,3 +1,15 @@ define([], function () { - + require.config({ + paths: { + 'async': '../addons/example/js/async', + 'BMap': ['//api.map.baidu.com/api?v=2.0&ak=mXijumfojHnAaN2VxpBGoqHM'], + }, + shim: { + 'BMap': { + deps: ['jquery'], + exports: 'BMap' + } + } +}); + }); \ No newline at end of file diff --git a/public/assets/js/backend/cf_item.js b/public/assets/js/backend/cf_item.js index beb35f0..a13db1f 100755 --- a/public/assets/js/backend/cf_item.js +++ b/public/assets/js/backend/cf_item.js @@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {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: '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_plan.js b/public/assets/js/backend/cf_room_plan.js index d4d0cd8..3bb8d1c 100755 --- a/public/assets/js/backend/cf_room_plan.js +++ b/public/assets/js/backend/cf_room_plan.js @@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'book_end_hour', title: __('Book_end_hour')}, {field: 'continuity_type', title: __('Continuity_type')}, {field: 'coutinuity_day', title: __('Coutinuity_day')}, - {field: 'charge_person_name', title: __('Charge_person'), operate: 'LIKE'}, + {field: 'purchase_user_name', title: __('Charge_person'), operate: 'LIKE'}, {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}