hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
xman 2025-06-20 15:48:32 +08:00
commit f85c2988ca
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/salary/CustomDetail.php
View File

@ -151,7 +151,9 @@ class CustomDetail extends Backend
return json($result);
}
$this->assignconfig("manage", $this->auth->check('salary/custom_detail/edit'));
$this->assignconfig("edit", $this->auth->check('salary/custom_detail/edit'));
$this->assignconfig("copy", $this->auth->check('salary/custom_detail/copy'));
$this->assignconfig("settle", $this->auth->check('salary/custom_detail/settle'));
$this->view->assign("month", $month);
$this->view->assign("salaryitem", json_encode($salaryItem));
return $this->view->fetch();

6
public/assets/js/backend/salary/custom_detail.js
View File

@ -56,7 +56,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
},
extend: 'data-area=\'["800px", "600px"]\'',
visible:function(row){
if (!Config.manage) {
if (!Config.edit) {
return false;
}
return true;
@ -74,7 +74,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
},
extend: 'data-area=\'["800px", "600px"]\'',
visible:function(row){
if (!Config.manage) {
if (!Config.copy) {
return false;
}
return true;
@ -102,7 +102,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
return false;
},
visible: function (row) {
if (!Config.manage) {
if (!Config.settle) {
return false;
}
//返回true时按钮显示,返回false隐藏