From 01ff921514d1f498bb57ed2a2347a5145a20780d Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Fri, 23 May 2025 15:09:32 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/oa/Task.php | 2 +-
 application/admin/lang/zh-cn/oa/task.php | 1 +
 application/admin/model/oa/Task.php      | 2 +-
 public/assets/js/backend/oa/task.js      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php
index 4d3e464..a5a8110 100644
--- a/application/admin/controller/oa/Task.php
+++ b/application/admin/controller/oa/Task.php
@@ -88,7 +88,7 @@ class Task extends Backend
 
 
             $list = $this->model
-                    ->with(['admin'])
+                    ->with(['exec'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php
index ccab904..2d44a1e 100644
--- a/application/admin/lang/zh-cn/oa/task.php
+++ b/application/admin/lang/zh-cn/oa/task.php
@@ -32,6 +32,7 @@ return [
     'Admin.id'           => 'ID',
     'Admin.username'     => '用户名',
     'Admin.nickname'     => '昵称',
+    'ExecAdmin.nickname' => '执行人',
     'Admin.password'     => '密码',
     'Admin.salt'         => '密码盐',
     'Admin.area_ids'     => '地区ID,英文逗号分隔',
diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php
index 459744a..af898f0 100644
--- a/application/admin/model/oa/Task.php
+++ b/application/admin/model/oa/Task.php
@@ -60,7 +60,7 @@ class Task extends Model
 
 
 
-    public function admin()
+    public function exec()
     {
         return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(1);
     }
diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js
index 0854cf9..e69883f 100644
--- a/public/assets/js/backend/oa/task.js
+++ b/public/assets/js/backend/oa/task.js
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'exec.nickname', title: __('ExecAdmin.nickname'), operate: 'LIKE'},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
@@ -36,7 +37,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-                        {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
                             buttons:[
                                 {