From a988d4d54b103c2b58744151ab5c313da0dff69e Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Thu, 29 May 2025 15:54:00 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E5=B7=A5=E8=B5=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/lang/zh-cn/salary/item.php |  3 +++
 application/admin/model/salary/Item.php      | 14 +++++++++++++-
 application/admin/view/salary/item/add.html  | 12 ++++++++++++
 application/admin/view/salary/item/edit.html | 12 ++++++++++++
 public/assets/js/backend/salary/item.js      |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/application/admin/lang/zh-cn/salary/item.php b/application/admin/lang/zh-cn/salary/item.php
index 86306f6..a772ad6 100644
--- a/application/admin/lang/zh-cn/salary/item.php
+++ b/application/admin/lang/zh-cn/salary/item.php
@@ -5,6 +5,9 @@ return [
     'Admin_id'    => '创建人id',
     'Name'        => '名称',
     'Desc'        => '描述',
+    'Type 1'      => '加',
+    'Type 2'      => '自定义',
+    'Type 3'      => '减',
     'Create_time' => '创建时间',
     'Update_time' => '编辑时间'
 ];
diff --git a/application/admin/model/salary/Item.php b/application/admin/model/salary/Item.php
index 1b2db05..dc9093a 100644
--- a/application/admin/model/salary/Item.php
+++ b/application/admin/model/salary/Item.php
@@ -27,7 +27,19 @@ class Item extends Model
     protected $append = [
 
     ];
-    
+
+    public function getTypeList()
+    {
+        return ['1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')];
+    }
+
+
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['type'] ?? '');
+        $list = $this->getTypeList();
+        return $list[$value] ?? '';
+    }
 
     
 
diff --git a/application/admin/view/salary/item/add.html b/application/admin/view/salary/item/add.html
index 3c707d4..a23a087 100644
--- a/application/admin/view/salary/item/add.html
+++ b/application/admin/view/salary/item/add.html
@@ -12,6 +12,18 @@
             <input id="c-desc" data-rule="required" class="form-control" name="row[desc]" type="text" value="">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
         <div class="col-xs-12 col-sm-8">
diff --git a/application/admin/view/salary/item/edit.html b/application/admin/view/salary/item/edit.html
index f10a18e..a21af47 100644
--- a/application/admin/view/salary/item/edit.html
+++ b/application/admin/view/salary/item/edit.html
@@ -12,6 +12,18 @@
             <input id="c-desc" data-rule="required" class="form-control" name="row[desc]" type="text" value="{$row.desc|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
         <div class="col-xs-12 col-sm-8">
diff --git a/public/assets/js/backend/salary/item.js b/public/assets/js/backend/salary/item.js
index 6ab151e..d0ee285 100644
--- a/public/assets/js/backend/salary/item.js
+++ b/public/assets/js/backend/salary/item.js
@@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'admin_id', title: __('Admin_id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {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}