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

---
 application/admin/controller/salary/Detail.php | 15 ++++++++++++++-
 .../admin/view/salary/detail/custom_add.html   | 18 ++++++++++++------
 .../admin/view/salary/detail/custom_edit.html  |  4 ++--
 .../admin/view/salary/detail/custom_index.html |  6 ++++++
 public/assets/js/backend/salary/detail.js      |  3 +--
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/application/admin/controller/salary/Detail.php b/application/admin/controller/salary/Detail.php
index fcbdd29..d2d7f6f 100644
--- a/application/admin/controller/salary/Detail.php
+++ b/application/admin/controller/salary/Detail.php
@@ -164,8 +164,21 @@ class Detail extends Backend
 
         if (false === $this->request->isPost()) {
 
-            $items = Db::name('salary_item')->field('id,name')->select();
+            $items = Db::name('salary_item')->field('id,type,name')->select();
 
+            $typeMap = [
+                1 => '应发工资',
+                2 => '应扣款项',
+                3 => '其他'
+            ];
+            $groupedItems = [];
+            foreach ($items as $item) {
+                $type = $item['type'];
+                $label = $typeMap[$type];
+                $groupedItems[$label][] = $item;
+            }
+
+            $this->view->assign('groupedItems', $groupedItems);
             $this->view->assign('items', $items);
             return $this->view->fetch();
         }
diff --git a/application/admin/view/salary/detail/custom_add.html b/application/admin/view/salary/detail/custom_add.html
index 74b4e6a..25e6326 100644
--- a/application/admin/view/salary/detail/custom_add.html
+++ b/application/admin/view/salary/detail/custom_add.html
@@ -12,13 +12,19 @@
             <input id="c-salary_month" class="form-control datetimepicker" data-date-format="YYYY-MM" data-use-current="true" name="row[salary_month]" type="text" value="{:date('Y-m-d')}">
         </div>
     </div>
-    {foreach $items as $item}
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{$item['name']}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-item_value" class="form-control" step="0.01" name="row[item_{$item['id']}]" type="number" value="10">
-        </div>
+    {foreach $groupedItems as $groupName => $group}
+    <div class="form-group" style="border-top: 1px solid #ddd; padding-top: 10px; margin-top: 20px;">
+        <label class="control-label col-xs-12 col-sm-2 text-left" style="font-weight: bold;">{$groupName}</label>
     </div>
+
+    {foreach $group as $index => $item}
+    {if $index % 2 == 0}<div class="form-group">{/if}
+    <label class="control-label col-xs-12 col-sm-1">{$item.name}:</label>
+    <div class="col-xs-12 col-sm-4">
+        <input class="form-control" step="0.01" name="row[item_{$item.id}]" type="number" value="">
+    </div>
+    {if $index % 2 == 1 || $index == count($group) - 1}</div>{/if}
+    {/foreach}
     {/foreach}
 
     <div class="form-group layer-footer">
diff --git a/application/admin/view/salary/detail/custom_edit.html b/application/admin/view/salary/detail/custom_edit.html
index 9696b96..5a2ad7b 100644
--- a/application/admin/view/salary/detail/custom_edit.html
+++ b/application/admin/view/salary/detail/custom_edit.html
@@ -19,8 +19,8 @@
 
     {foreach $group as $index => $item}
     {if $index % 2 == 0}<div class="form-group">{/if}
-    <label class="control-label col-xs-12 col-sm-2">{$item.name}:</label>
-    <div class="col-xs-12 col-sm-5">
+    <label class="control-label col-xs-12 col-sm-1">{$item.name}:</label>
+    <div class="col-xs-12 col-sm-4">
         <input class="form-control" step="0.01" name="row[item_{$item.id}]" type="number" value="{$row['item_' . $item.id]|htmlentities}">
     </div>
     {if $index % 2 == 1 || $index == count($group) - 1}</div>{/if}
diff --git a/application/admin/view/salary/detail/custom_index.html b/application/admin/view/salary/detail/custom_index.html
index 0a72b00..83776f6 100644
--- a/application/admin/view/salary/detail/custom_index.html
+++ b/application/admin/view/salary/detail/custom_index.html
@@ -10,6 +10,12 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('salary/detail/custom_add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+
+
+
+
 
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
diff --git a/public/assets/js/backend/salary/detail.js b/public/assets/js/backend/salary/detail.js
index 8605e5d..b3e40bd 100644
--- a/public/assets/js/backend/salary/detail.js
+++ b/public/assets/js/backend/salary/detail.js
@@ -46,8 +46,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.init({
                 extend: {
                     index_url: 'salary/detail/custom_index' + location.search,
-                    // add_url: 'oa/schedule/add',
-                    // editable: 'oa/schedule/editable',
+                    add_url: 'salary/detail/custom_add',
                     // del_url: 'oa/schedule/del',
                     // multi_url: 'oa/schedule/multi',
                     // import_url: 'oa/schedule/import',