From 47f5d72134d3d2d96811f018e19143d6b216e127 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 30 May 2025 17:37:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature:=20=E6=8C=89=E9=92=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/salary/detail/custom_add.html | 2 -- application/admin/view/salary/detail/custom_edit.html | 2 -- 2 files changed, 4 deletions(-) diff --git a/application/admin/view/salary/detail/custom_add.html b/application/admin/view/salary/detail/custom_add.html index 25e6326..d7c47ca 100644 --- a/application/admin/view/salary/detail/custom_add.html +++ b/application/admin/view/salary/detail/custom_add.html @@ -5,8 +5,6 @@
- -
diff --git a/application/admin/view/salary/detail/custom_edit.html b/application/admin/view/salary/detail/custom_edit.html index 5a2ad7b..2813a7f 100644 --- a/application/admin/view/salary/detail/custom_edit.html +++ b/application/admin/view/salary/detail/custom_edit.html @@ -5,8 +5,6 @@
-
-
From 61a97c6030c650f6e2e99db2a374cfbe743aa78c Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 30 May 2025 17:42:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature:=20=E6=8C=89=E9=92=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/lang/zh-cn/kpi/item.php | 2 +- application/admin/lang/zh-cn/kpi/template.php | 2 +- application/admin/lang/zh-cn/oa/doc.php | 2 +- application/admin/lang/zh-cn/oa/schedule.php | 4 ++-- application/admin/lang/zh-cn/oa/task.php | 4 ++-- application/admin/lang/zh-cn/salary/detail.php | 4 ++-- application/admin/lang/zh-cn/salary/item.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/application/admin/lang/zh-cn/kpi/item.php b/application/admin/lang/zh-cn/kpi/item.php index c03ad8b..372d61f 100644 --- a/application/admin/lang/zh-cn/kpi/item.php +++ b/application/admin/lang/zh-cn/kpi/item.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人id', + 'Admin_id' => '创建人', 'Admin.nickname' => '创建人', 'AuthGroup.name' => '角色', 'Score' => '指标分', diff --git a/application/admin/lang/zh-cn/kpi/template.php b/application/admin/lang/zh-cn/kpi/template.php index f0f20ce..c517cdc 100644 --- a/application/admin/lang/zh-cn/kpi/template.php +++ b/application/admin/lang/zh-cn/kpi/template.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人id', + 'Admin_id' => '创建人', 'Admin.nickname' => '创建人', 'AuthGroup.name' => '角色', 'Name' => '名称', diff --git a/application/admin/lang/zh-cn/oa/doc.php b/application/admin/lang/zh-cn/oa/doc.php index 10b780a..c3125d3 100644 --- a/application/admin/lang/zh-cn/oa/doc.php +++ b/application/admin/lang/zh-cn/oa/doc.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人ID', + 'Admin_id' => '创建人', 'Type' => '培训资料类型', 'Type 1' => '视频', 'Type 2' => '图片', diff --git a/application/admin/lang/zh-cn/oa/schedule.php b/application/admin/lang/zh-cn/oa/schedule.php index d3a348b..861d3ba 100644 --- a/application/admin/lang/zh-cn/oa/schedule.php +++ b/application/admin/lang/zh-cn/oa/schedule.php @@ -2,8 +2,8 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人ID', - 'Exec_admin_id' => '执行人ID', + 'Admin_id' => '创建人', + 'Exec_admin_id' => '执行人', 'Type' => '任务类型', 'Type 1' => '早班', 'Type 2' => '中班', diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php index 3455b6f..0992974 100644 --- a/application/admin/lang/zh-cn/oa/task.php +++ b/application/admin/lang/zh-cn/oa/task.php @@ -2,8 +2,8 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人id', - 'Exec_admin_id' => '执行人ID', + 'Admin_id' => '创建人', + 'Exec_admin_id' => '执行人', 'Type' => '任务类型', 'Type 1' => '每日任务', 'Type 2' => '每周任务', diff --git a/application/admin/lang/zh-cn/salary/detail.php b/application/admin/lang/zh-cn/salary/detail.php index 2eff1d4..ff16568 100644 --- a/application/admin/lang/zh-cn/salary/detail.php +++ b/application/admin/lang/zh-cn/salary/detail.php @@ -2,8 +2,8 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人id', - 'Target_admin_id' => '工资归属人id', + 'Admin_id' => '创建人', + 'Target_admin_id' => '工资归属人', 'Item_id' => '指标id', 'Item_value' => '值', 'Salary_month' => '工资月份', diff --git a/application/admin/lang/zh-cn/salary/item.php b/application/admin/lang/zh-cn/salary/item.php index 238f65f..a2c17c2 100644 --- a/application/admin/lang/zh-cn/salary/item.php +++ b/application/admin/lang/zh-cn/salary/item.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Admin_id' => '创建人id', + 'Admin_id' => '创建人', 'Name' => '名称', 'Desc' => '描述', 'Type 1' => '加', From 69860cd845cb9077efcffdbd47b2d6bf98dbfca1 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 30 May 2025 17:42:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature:=20=E6=8C=89=E9=92=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/salary/detail/custom_add.html | 2 ++ application/admin/view/salary/detail/custom_edit.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/application/admin/view/salary/detail/custom_add.html b/application/admin/view/salary/detail/custom_add.html index d7c47ca..25e6326 100644 --- a/application/admin/view/salary/detail/custom_add.html +++ b/application/admin/view/salary/detail/custom_add.html @@ -5,6 +5,8 @@
+
+
diff --git a/application/admin/view/salary/detail/custom_edit.html b/application/admin/view/salary/detail/custom_edit.html index 2813a7f..5a2ad7b 100644 --- a/application/admin/view/salary/detail/custom_edit.html +++ b/application/admin/view/salary/detail/custom_edit.html @@ -5,6 +5,8 @@
+
+
From 059cee23132d95242ab3dffb97684184e0b9bdec Mon Sep 17 00:00:00 2001 From: zhuyu Date: Mon, 2 Jun 2025 11:17:51 +0800 Subject: [PATCH 4/4] feature: taskk --- application/admin/controller/oa/Task.php | 34 ------------------------ application/admin/model/oa/Task.php | 2 +- public/assets/js/backend/oa/task.js | 15 ++++++++--- 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 6d85a19..38ff2c6 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -62,30 +62,6 @@ class Task extends Backend list($where, $sort, $order, $offset, $limit) = $this->buildparams(); $dateTime = date('Y-m-d'); - foreach ($where as $k => $item) { - if ($item[0] != 'task.status') { - continue; - } - - if (in_array($item[2], [1, 4])) { - $where[] = ['expire_end_time', '<=', $dateTime]; - continue; - } - - if ($item[2] == 2) { - $where[$k][2] = 4; - $where[] = ['expire_end_time', '>', $dateTime]; - continue; - } - - if ($item[2] == 6) { - $where[$k][2] = 1; - $where[] = ['expire_end_time', '>', $dateTime]; - continue; - } - - } - $list = $this->model ->with(['exec']) @@ -95,16 +71,6 @@ class Task extends Backend foreach ($list as $k => $row) { - if (strtotime($row['expire_end_time']) > time()) { - if ($row['status'] == 1) { - $list[$k]['status'] = 6; - } - - if ($row['status'] == 4) { - $list[$k]['status'] = 2; - } - } - $list[$k]['refuse_reason'] = $row['refuse_reason'] ?? ''; $list[$k]['fileurl'] = cdnurl($row['prove_file_path']); $list[$k]['filetype'] = pathinfo($list[$k]['fileurl'], PATHINFO_EXTENSION); diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php index 3612c71..00c47b5 100644 --- a/application/admin/model/oa/Task.php +++ b/application/admin/model/oa/Task.php @@ -38,7 +38,7 @@ class Task extends Model public function getStatusList() { - return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3'), '4' => __('Status 4'), '5' => __('Status 5'), '6' => __('Status 6')]; + return ['1' => __('Status 1'), '3' => __('Status 3'), '4' => __('Status 4'), '5' => __('Status 5')]; } diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index d6787e5..85c95b3 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {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}, - {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5'),"6":__('Status 6')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status}, {field: 'prove_desc', title: __('Prove_desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'refuse_reason', title: __('Refuse_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, @@ -41,11 +41,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, buttons:[ { - name: '审核', - title: __('审核'), + name: 'review', + text: "审核", + title: "审核", classname: 'btn btn-xs btn-primary btn-dialog', icon: 'fa fa-list', - url: 'oa/task/review' + url: 'oa/task/review', + visible:function(row){ + if (row.status != 3) { + return false; + } + return true; + } }, { name: 'edit',