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

sth

Browse Source
This commit is contained in:
xman 2025-03-10 14:45:52 +08:00
parent 59420b045b
commit 772c868da7
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/admin/behavior/OrderLog.php
View File

@ -9,10 +9,10 @@ class OrderLog
{ {
$Model = new \app\admin\model\Order(); $Model = new \app\admin\model\Order();
$statusList = $Model->getStatusList(); $statusList = $Model->getStatusList();
$order = $response['order']; $order = $response['order']; //订单对象
$role = $response['role']; $role = $response['role']; //1管理员，2师傅
$auth = $response['auth']??null; $auth = $response['auth']??null; //角色对象
$remark = $response['remark'] ?? ''; $remark = $response['remark'] ?? ''; //备注
$data = [ $data = [
'order_id' => $order->id, 'order_id' => $order->id,
@ -21,7 +21,7 @@ class OrderLog
'role' => $role, 'role' => $role,
'remark' => $remark, 'remark' => $remark,
'admin_id' => $auth->id ?? 0, 'admin_id' => $auth->id ?? 0,
'admin_user' => $auth->nickname ??'system' 'admin_user' => $role==1 ? $auth->nickname : $auth->name
]; ];
$Model->save($data); $Model->save($data);
} }

2
application/admin/controller/orders/Auditorder.php
View File

@ -55,7 +55,7 @@ class Auditorder extends Backend
$list = $this->model $list = $this->model
->scope('tab',Order::TAB_AUDIT) ->scope('tab',Order::TAB_AUDIT)
->alias('order') ->alias('order')
->with(['auditadmin']) ->with(['auditadmin:id,username,nickname'])
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)
->paginate($limit); ->paginate($limit);

5
public/assets/js/backend/orders/auditorder.js
View File

@ -53,13 +53,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'performance', title: __('Performance'), operate:'BETWEEN'}, {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
// {field: 'cancel_reason_id', title: __('Cancel_reason_id')}, // {field: 'cancel_reason_id', title: __('Cancel_reason_id')},
//{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, //{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
// {field: 'audit_admin_id', title: __('Audit_admin_id')}, // {field: 'audit_admin_id', title: __('Audit_admin_id')},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'auditadmin.username', title: __('Admin.username'), operate: 'LIKE'}, //{field: 'auditadmin.username', title: __('Admin.username'), operate: 'LIKE'},
{field: 'auditadmin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, {field: 'auditadmin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
{field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
formatter: Table.api.formatter.operate, formatter: Table.api.formatter.operate,