From 806af248535ef97daf2ed448291b3c141084483b Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 30 May 2025 11:13:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E7=BB=93=E7=AE=97=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/lang/zh-cn/salary/item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/lang/zh-cn/salary/item.php b/application/admin/lang/zh-cn/salary/item.php index a772ad6..238f65f 100644 --- a/application/admin/lang/zh-cn/salary/item.php +++ b/application/admin/lang/zh-cn/salary/item.php @@ -6,8 +6,8 @@ return [ 'Name' => '名称', 'Desc' => '描述', 'Type 1' => '加', - 'Type 2' => '自定义', - 'Type 3' => '减', + 'Type 2' => '减', + 'Type 3' => '自定义', 'Create_time' => '创建时间', 'Update_time' => '编辑时间' ]; From 3093231b7ace4a6c4409e9ee0bddaa093fd8c315 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 30 May 2025 11:19:02 +0800 Subject: [PATCH 2/2] =?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 --- public/assets/js/backend/kpi/item.js | 22 +++++++++++++++++++++- public/assets/js/backend/kpi/template.js | 22 +++++++++++++++++++++- public/assets/js/backend/oa/doc.js | 24 +++++++++++++++++++++--- public/assets/js/backend/oa/task.js | 18 +++++++++++++++++- public/assets/js/backend/salary/item.js | 23 +++++++++++++++++++++-- 5 files changed, 101 insertions(+), 8 deletions(-) diff --git a/public/assets/js/backend/kpi/item.js b/public/assets/js/backend/kpi/item.js index 3990652..572395c 100644 --- a/public/assets/js/backend/kpi/item.js +++ b/public/assets/js/backend/kpi/item.js @@ -35,7 +35,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'score', title: __('Score')}, {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, + buttons:[ + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + }, + ], + events: Table.api.events.operate, formatter: Table.api.formatter.operate + } ] ] }); diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js index 264149a..71f5512 100644 --- a/public/assets/js/backend/kpi/template.js +++ b/public/assets/js/backend/kpi/template.js @@ -45,7 +45,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'max_score', title: __('Max_score')}, {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, + buttons:[ + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + }, + ], + events: Table.api.events.operate, formatter: Table.api.formatter.operate + } ] ] }); diff --git a/public/assets/js/backend/oa/doc.js b/public/assets/js/backend/oa/doc.js index d28accd..a4dda4e 100644 --- a/public/assets/js/backend/oa/doc.js +++ b/public/assets/js/backend/oa/doc.js @@ -30,18 +30,36 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, + {field: 'operate', title: __('Operate'), table: table, buttons:[ { name: 'detail', + text: "详情", title: __('查看详情'), classname: 'btn btn-xs btn-primary btn-preview', icon: 'fa fa-list', extend: function(row) { return 'data-filetype="' + row.filetype + '" data-fileurl="' + row.fileurl + '"'; } - } - ] + }, + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + }, + ], + events: Table.api.events.operate, formatter: Table.api.formatter.operate } ] ] diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index de05bb0..d6787e5 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -46,7 +46,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin classname: 'btn btn-xs btn-primary btn-dialog', icon: 'fa fa-list', url: 'oa/task/review' - } + }, + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + }, ]} ] ] diff --git a/public/assets/js/backend/salary/item.js b/public/assets/js/backend/salary/item.js index 6d58b37..e46cacf 100644 --- a/public/assets/js/backend/salary/item.js +++ b/public/assets/js/backend/salary/item.js @@ -31,8 +31,27 @@ 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: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} - ] + {field: 'operate', title: __('Operate'), table: table, + buttons:[ + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + }, + ], + events: Table.api.events.operate, formatter: Table.api.formatter.operate + } ] ] });