From 772c868da7e1280bd38b9d3d9a9b5b1d190f8608 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 10 Mar 2025 14:45:52 +0800
Subject: [PATCH] sth

---
 application/admin/behavior/OrderLog.php            | 10 +++++-----
 application/admin/controller/orders/Auditorder.php |  2 +-
 public/assets/js/backend/orders/auditorder.js      |  5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/admin/behavior/OrderLog.php b/application/admin/behavior/OrderLog.php
index 3f1867e..1973989 100644
--- a/application/admin/behavior/OrderLog.php
+++ b/application/admin/behavior/OrderLog.php
@@ -9,10 +9,10 @@ class OrderLog
     {
         $Model = new \app\admin\model\Order();
         $statusList = $Model->getStatusList();
-        $order = $response['order'];
-        $role  = $response['role'];
-        $auth  = $response['auth']??null;
-        $remark = $response['remark'] ?? '';
+        $order = $response['order'];    //订单对象
+        $role  = $response['role'];     //1管理员，2师傅
+        $auth  = $response['auth']??null;       //角色对象
+        $remark = $response['remark'] ?? '';    //备注
 
         $data = [
             'order_id'      =>  $order->id,
@@ -21,7 +21,7 @@ class OrderLog
             'role'          =>  $role,
             'remark'        =>  $remark,
             'admin_id'      =>  $auth->id ?? 0,
-            'admin_user'    =>  $auth->nickname ??'system'
+            'admin_user'    =>  $role==1 ? $auth->nickname : $auth->name
         ];
         $Model->save($data);
     }
diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php
index 8f16bbd..e38898d 100644
--- a/application/admin/controller/orders/Auditorder.php
+++ b/application/admin/controller/orders/Auditorder.php
@@ -55,7 +55,7 @@ class Auditorder extends Backend
             $list = $this->model
                 ->scope('tab',Order::TAB_AUDIT)
                 ->alias('order')
-                    ->with(['auditadmin'])
+                    ->with(['auditadmin:id,username,nickname'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js
index 6c6ac20..6d1b217 100644
--- a/public/assets/js/backend/orders/auditorder.js
+++ b/public/assets/js/backend/orders/auditorder.js
@@ -53,13 +53,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
                        // {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: '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: 'create_time', title: __('Create_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: '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,
                             formatter: Table.api.formatter.operate,