From 8424126ffdfe1e44c1c92b2478faa7efa2b98a67 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Sat, 12 Apr 2025 19:54:05 +0800 Subject: [PATCH] sth --- .../admin/controller/orders/Review.php | 118 ++++++++ .../admin/lang/zh-cn/orders/review.php | 11 + application/admin/model/OrderReview.php | 38 +++ application/admin/model/Revisitorder.php | 67 +++++ application/admin/model/order/Review.php | 12 + application/admin/validate/OrderReview.php | 27 ++ application/admin/view/orders/review/add.html | 39 +++ .../admin/view/orders/review/edit.html | 51 ++++ .../admin/view/orders/review/index.html | 29 ++ .../admin/view/orders/revisitorder/edit.html | 257 +++--------------- public/assets/js/backend/orders/review.js | 58 ++++ .../assets/js/backend/orders/revisitorder.js | 27 +- 12 files changed, 509 insertions(+), 225 deletions(-) create mode 100644 application/admin/controller/orders/Review.php create mode 100644 application/admin/lang/zh-cn/orders/review.php create mode 100644 application/admin/model/OrderReview.php create mode 100644 application/admin/model/Revisitorder.php create mode 100644 application/admin/model/order/Review.php create mode 100644 application/admin/validate/OrderReview.php create mode 100644 application/admin/view/orders/review/add.html create mode 100644 application/admin/view/orders/review/edit.html create mode 100644 application/admin/view/orders/review/index.html create mode 100644 public/assets/js/backend/orders/review.js diff --git a/application/admin/controller/orders/Review.php b/application/admin/controller/orders/Review.php new file mode 100644 index 0000000..163a778 --- /dev/null +++ b/application/admin/controller/orders/Review.php @@ -0,0 +1,118 @@ +model = new \app\admin\model\OrderReview; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + + + + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + + $ids = $this->request->request('ids'); + + if(empty($ids)){ + $this->error('参数错误'); + } + $order = Order::get($ids,['dispatch']); + if( + empty($order) + ){ + $this->error('订单不存在'); + } + + if($order->status != Order::STATUS_FINISHED){ + $this->error('订单未完成，不能回访'); + } + if($order->revisit_id > 0){ + $this->error('订单已完成回访'); + } + + $this->assign('order',$order); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + + $order = Order::get($params['order_id'],['dispatch']); + if( + empty($order) + ){ + $this->error('订单不存在'); + } + + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + $params['admin_id'] = $this->auth->id; + $params['admin_user'] = $this->auth->nickname; + $params['worker_id'] = $order->dispatch->worker_id; + $result = $this->model->allowField(true)->save($params); + $order->revisit_id = $this->auth->id; + $order->save(); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } + +} diff --git a/application/admin/lang/zh-cn/orders/review.php b/application/admin/lang/zh-cn/orders/review.php new file mode 100644 index 0000000..75523a7 --- /dev/null +++ b/application/admin/lang/zh-cn/orders/review.php @@ -0,0 +1,11 @@ + '订单ID', + 'Worker_id' => '师傅ID', + 'Pt_star' => '平台评分', + 'Worker_star' => '师傅评分', + 'Remark' => '备注', + 'Admin_id' => '回访人', + 'Admin_user' => '回访人' +]; diff --git a/application/admin/model/OrderReview.php b/application/admin/model/OrderReview.php new file mode 100644 index 0000000..10a3f3d --- /dev/null +++ b/application/admin/model/OrderReview.php @@ -0,0 +1,38 @@ + __('Status 0'), '10' => __('Status 10'), '20' => __('Status 20'), '30' => __('Status 30'), '40' => __('Status 40'), '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')]; + } + + public function getOfflineAmountTypeList() + { + return ['1' => __('Offline_amount_type 1'), '2' => __('Offline_amount_type 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ?: ($data['status'] ?? ''); + $list = $this->getStatusList(); + return $list[$value] ?? ''; + } + + + public function getOfflineAmountTypeTextAttr($value, $data) + { + $value = $value ?: ($data['offline_amount_type'] ?? ''); + $list = $this->getOfflineAmountTypeList(); + return $list[$value] ?? ''; + } + + + + + public function review() + { + return $this->belongsTo('app\admin\model\order\Review', 'revisit_id', 'order_id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/admin/model/order/Review.php b/application/admin/model/order/Review.php new file mode 100644 index 0000000..5a678f1 --- /dev/null +++ b/application/admin/model/order/Review.php @@ -0,0 +1,12 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/orders/review/add.html b/application/admin/view/orders/review/add.html new file mode 100644 index 0000000..0bdab0e --- /dev/null +++ b/application/admin/view/orders/review/add.html @@ -0,0 +1,39 @@ +
+ + + + +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/application/admin/view/orders/review/edit.html b/application/admin/view/orders/review/edit.html new file mode 100644 index 0000000..92547e0 --- /dev/null +++ b/application/admin/view/orders/review/edit.html @@ -0,0 +1,51 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/orders/review/index.html b/application/admin/view/orders/review/index.html new file mode 100644 index 0000000..f63beab --- /dev/null +++ b/application/admin/view/orders/review/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/admin/view/orders/revisitorder/edit.html b/application/admin/view/orders/revisitorder/edit.html index 469cbc1..fb430fb 100644 --- a/application/admin/view/orders/revisitorder/edit.html +++ b/application/admin/view/orders/revisitorder/edit.html @@ -1,271 +1,82 @@
+ + +
- +
- +
- -
-
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
- -
-
-
- -
- +
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+ + + + + + + + + + + + + + +
- +
- +
-
- -
- -
-
-
- -
-
- -
- - -
- -
-
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - - -
    -
    +
    - +
    - +
    +
    - +
    - +
    +
    - +
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - +
    +
    diff --git a/public/assets/js/backend/orders/review.js b/public/assets/js/backend/orders/review.js new file mode 100644 index 0000000..4d35490 --- /dev/null +++ b/public/assets/js/backend/orders/review.js @@ -0,0 +1,58 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'orders/review/index' + location.search, + add_url: 'orders/review/add', + edit_url: 'orders/review/edit', + del_url: 'orders/review/del', + multi_url: 'orders/review/multi', + import_url: 'orders/review/import', + table: 'order_review', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'order_id', title: __('Order_id')}, + {field: 'worker_id', title: __('Worker_id')}, + {field: 'pt_star', title: __('Pt_star')}, + {field: 'worker_star', title: __('Worker_star')}, + {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); diff --git a/public/assets/js/backend/orders/revisitorder.js b/public/assets/js/backend/orders/revisitorder.js index bd0dabf..62564ae 100644 --- a/public/assets/js/backend/orders/revisitorder.js +++ b/public/assets/js/backend/orders/revisitorder.js @@ -74,11 +74,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // {field: 'review.worker_id', title: __('Review.worker_id')}, {field: 'review.pt_star', title: __('Review.pt_star')}, {field: 'review.worker_star', title: __('Review.worker_star')}, - {field: 'review.remark', title: __('Review.remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'review.remark', title: __('回访备注'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, //{field: 'review.admin_id', title: __('Review.admin_id')}, {field: 'review.admin_user', title: __('Review.admin_user'), operate: 'LIKE'}, {field: 'review.create_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, + //formatter: Table.api.formatter.operate, + buttons:[ + { + name: 'addreview', + text:"回访", + title:"填写回访信息", + icon: 'fa fa-list', + url: 'orders/review/add', + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-dialog', + visible:function(row){ + if(row.revisit_id > 0){ + return false; + } + return true; + } + }, + ] + + } ] ] }); @@ -92,6 +112,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin edit: function () { Controller.api.bindevent(); }, + addreview: function () { + Controller.api.bindevent(); + }, api: { bindevent: function () { Form.api.bindevent($("form[role=form]"));