娄梦宁 3 years ago
parent
commit
71b481a3b5
3 changed files with 25 additions and 2 deletions
  1. +9
    -0
      application/admin/controller/CfRoomInfo.php
  2. +15
    -1
      application/admin/controller/OrderMain.php
  3. +1
    -1
      public/assets/js/backend/receipt_order.js

+ 9
- 0
application/admin/controller/CfRoomInfo.php View File

@@ -177,4 +177,13 @@ class CfRoomInfo extends Backend
return $this->view->fetch();
}

public function getRoomList(){
$hotelId=$this->request->post('hotelId');
$result= $this->model
->field("id,room_name as name")
->where("hotel_id","=",$hotelId)->select();

return json(['list' => $result]);
}

}

+ 15
- 1
application/admin/controller/OrderMain.php View File

@@ -201,7 +201,7 @@ class OrderMain extends Backend
}


public function newAdd($id =null){
public function newEdit($id =null){
$orderMain = $this->model->find($id);
if (!$orderMain){
return null;
@@ -221,4 +221,18 @@ class OrderMain extends Backend
return json($result);
}


public function newAdd(){
$params=$this->request->post();
$hotelMain = $params["hotelBase"];
$this->success();
}

private function insertOrderMain($params){
$orderMain = new \app\admin\model\OrderMain();
$params['create_id']=$this->auth->id;
$params['group_id']=$this->auth->getGroupId();
$result = $orderMain->allowField(true)->save($params);
}

}

+ 1
- 1
public/assets/js/backend/receipt_order.js View File

@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'name', title: __('Name'), operate: 'LIKE'},
{field: 'status', title: __('收款状态')},
{field: 'order_ids', title: __('管理的订单id'), operate: 'LIKE'},
{field: 'order_ids', title: __('关联的订单id'), operate: 'LIKE'},
{field: 'money', title: __('Money'), operate:'BETWEEN'},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]


Loading…
Cancel
Save