hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成订单重构

Browse Source
This commit is contained in:
xman 2025-06-01 22:41:54 +08:00
parent 684c4d3801
commit dc2a71949e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/orders/Review.php
View File

@ -106,8 +106,8 @@ class Review extends Backend
$params['admin_id'] = $this->auth->id; $params['admin_id'] = $this->auth->id;
$params['admin_user'] = $this->auth->nickname; $params['admin_user'] = $this->auth->nickname;
if(!empty($order->dispatch->worker_id)){ if(!empty($order->worker_id)){
$params['worker_id'] = $order->dispatch; $params['worker_id'] = $order->worker_id;
} }
if($order->status == 60){ if($order->status == 60){
$params['is_star'] = 1; $params['is_star'] = 1;
@ -116,6 +116,7 @@ class Review extends Backend
$result = $this->model->allowField(true)->save($params); $result = $this->model->allowField(true)->save($params);
$order->revisit_id = $this->auth->id; $order->revisit_id = $this->auth->id;
$order->revisit_truth = $params['is_same']; $order->revisit_truth = $params['is_same'];
$order->revisit_time = date('Y-m-d H:i:s');
$order->save(); $order->save();
Db::commit(); Db::commit();
@ -133,6 +134,7 @@ class Review extends Backend
} catch (ValidateException|PDOException|Exception $e) { } catch (ValidateException|PDOException|Exception $e) {
Db::rollback(); Db::rollback();
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
if ($result === false) { if ($result === false) {
$this->error(__('No rows were inserted')); $this->error(__('No rows were inserted'));

8
public/assets/js/backend/orders/revisitorder.js
View File

@ -93,7 +93,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'review.pt_star', title: __('Review.pt_star'),operate: false}, {field: 'review.pt_star', title: __('Review.pt_star'),operate: false},
{field: 'review.worker_star', title: __('Review.worker_star'),operate: false}, {field: 'review.worker_star', title: __('Review.worker_star'),operate: false},
{field: 'review.remark', title: __('回访备注'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'review.remark', title: __('回访备注'), operate: false, table: table, class: 'autocontent', formatter: function (value){
if(value == null || value == undefined){
return '-';
}
return value;
}},
{field: 'review.admin_user', title: __('Review.admin_user'), operate: false}, {field: 'review.admin_user', title: __('Review.admin_user'), operate: false},
{field: 'revisit_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'revisit_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},