From d654795119f8a0b34b398b6c06a7d61b35f31fb7 Mon Sep 17 00:00:00 2001 From: nizongfeng Date: Mon, 6 Feb 2023 14:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E5=BF=97=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/OrderMain.php | 26 ++++++++++- application/admin/dao/OrderMemoDao.php | 70 ++++++++++++++++++++++++++++ application/admin/model/OrderMemo.php | 13 ++++++ application/admin/view/order_main/index.html | 69 ++++++++++++++++++++++++++- 4 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 application/admin/dao/OrderMemoDao.php create mode 100644 application/admin/model/OrderMemo.php diff --git a/application/admin/controller/OrderMain.php b/application/admin/controller/OrderMain.php index 65cdac5..b76383c 100755 --- a/application/admin/controller/OrderMain.php +++ b/application/admin/controller/OrderMain.php @@ -3,6 +3,7 @@ namespace app\admin\controller; use app\admin\dao\GroupDao; +use app\admin\dao\OrderMemoDao; use app\admin\model\Area; use app\admin\service\OrderMainService; use app\common\controller\Backend; @@ -18,7 +19,7 @@ use think\Loader; */ class OrderMain extends Backend { - protected $noNeedRight = ['getOrderList',"save","delSubOrder","subOrderSave","getShowInfo","newAdd","insertOrderMain"]; + protected $noNeedRight = ['getOrderList',"save","delSubOrder","subOrderSave","getShowInfo","newAdd","insertOrderMain","addMemo","getMemoList"]; /** * OrderMain模型对象 * @var \app\admin\model\OrderMain @@ -133,4 +134,27 @@ class OrderMain extends Backend return json($result); } + /** + * 添加日志记录 + * @return \think\response\Json + */ + public function addMemo(){ + $params=$this->request->post(); + $params['create_id']=$this->auth->id; + $orderMemoDao = new OrderMemoDao(); + $result = $orderMemoDao->save($params); + return json($result); + } + + /** + * 添加日志记录 + * @return \think\response\Json + */ + public function getMemoList(){ + $params=$this->request->post(); + $orderMemoDao = new OrderMemoDao(); + $result = $orderMemoDao->getListByWhere($params); + return json($result); + } + } diff --git a/application/admin/dao/OrderMemoDao.php b/application/admin/dao/OrderMemoDao.php new file mode 100644 index 0000000..f40657b --- /dev/null +++ b/application/admin/dao/OrderMemoDao.php @@ -0,0 +1,70 @@ +$param["order_id"], + "memo"=>$param["memo"], + "create_id"=>empty($param['create_id'])?0:$param['create_id'], + "create_name"=>"" + ]; + if (!empty($param['create_id'])) { + $adminDao = new AdminDao(); + $admin = $adminDao->getInfoById($param['create_id']); + if ($admin["flag"]) { + $data["create_name"] = $admin["data"]["nickname"]; + } + } + $orderMemo = new OrderMemo(); + $id = $orderMemo->insertGetId($data); + return Util::returnArrSu("", $id); + }catch (Exception $e){ + return Util::returnArrEr("新增失败:".$e->getMessage()); + } + + } + + /** + * 获取订单列表 + * @param $param + * @return array + */ + public function getListByWhere($param){ + try { + $offset = ($param['pageNum'] - 1) * $param['pageSize']; + $model = new OrderMemo(); + $count = $model->where(["order_id"=>$param['order_id']])->count(); + $list = $model->where(["order_id"=>$param['order_id']])->limit($offset,$param['pageSize'])->order("id","DESC")->select(); + return Util::returnArrSu("", ["total" => $count, "list" => $list->toArray()]); + }catch (Exception $e){ + return Util::returnArrSu("", ["total" => 0, "list" => []]); + } + } + +} \ No newline at end of file diff --git a/application/admin/model/OrderMemo.php b/application/admin/model/OrderMemo.php new file mode 100644 index 0000000..c69ac5a --- /dev/null +++ b/application/admin/model/OrderMemo.php @@ -0,0 +1,13 @@ + - + @@ -284,6 +287,24 @@ + + +
+ + + +新增 +
+ + + + + + + @@ -405,6 +426,12 @@ } }] }, + addMemo: { + "order_id":"", + "memo":"" + }, + memoList:[], + showMemo:false } }, created() { @@ -587,6 +614,46 @@ console.log(error); }); }, + //獲取列表 + saveMemo() { + if (this.addMemo.memo == "") { + this.$message.error("请输入备注内容");return false; + } + axios.post("/hotel.php/order_main/addMemo", this.addMemo).then((response) => { + let data = response.data; + if (data.flag) { + this.$message.success("添加成功"); + } else { + this.$message.error(response.msg); + } + }).catch(function (error) { + console.log(error); + }); + }, + //獲取列表 + getMemoList() { + let param = { + pageNum:1, + pageSize:1000, + order_id:this.addMemo.order_id + } + axios.post("/hotel.php/order_main/getMemoList", param).then((response) => { + let data = response.data; + if (data.flag) { + + this.memoList = data.data.list; + } else { + this.$message.error(response.msg); + } + }).catch(function (error) { + console.log(error); + }); + }, + showMemoInfo(order_id){ + this.showMemo = true + this.addMemo.order_id = order_id; + this.getMemoList(); + } } })