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

feature: 排班优化

Browse Source
This commit is contained in:
zhuyu 2025-06-27 10:03:01 +08:00
parent 837d41d1d6
commit 8d7aceaf70
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/admin/controller/oa/CustomSchedule.php
View File

@ -83,7 +83,7 @@ class CustomSchedule extends Backend
}
foreach ($adminIds as $adminId) {
$res[$adminId][$tmpDate] = '无';
$res[$adminId][$tmpDate] = '';
$res[$adminId]['admin_id'] = $adminId;
$res[$adminId]['name'] = $adminNames[$adminId];
$res[$adminId]['editable'] = $this->auth->check('oa/custom_schedule/edit') ? 1 : 0;
@ -117,7 +117,7 @@ class CustomSchedule extends Backend
$type = $queryDatum['type'];
if (isset($res[$adminId][$date])) {
$res[$adminId][$date] = $this->model->getTypeList()[$type];
$res[$adminId][$date] = $type;
}
}
@ -271,21 +271,14 @@ class CustomSchedule extends Backend
$date = $params['field'];
$adminId = $params['admin_id'];
$value = $params[$date] ?? '无';
$valueMap = [
'无' => 0,
'早班' => 1,
'中班' => 2,
'晚班' => 3,
'行政班' => 4,
];
$value = $params[$date] ?? '';
if ($value == '无') {
if (empty($value)) {
$this->model->where('exec_admin_id', $adminId)->delete();
$this->success();
}
$dbValue = $valueMap[$value];
$dbValue = $value;
$data = $this->model
->where('date', '=', $date)

2
application/admin/view/oa/custom_schedule/index.html
View File

@ -7,7 +7,7 @@
<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('oa/custom_schedule/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('oa/custom_schedule/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i>批量排班</a>

22
public/assets/js/backend/oa/custom_schedule.js
View File

@ -44,13 +44,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function
"field": tmpDate,
"editable" :{
type: 'select',
emptytext: '_',
pk: 1,
source: [
{value: '无', text: '无'},
{value: '早班', text: '早班'},
{value: '中班', text: '中班'},
{value: '晚班', text: '晚班'},
{value: '行政班', text: '行政班'},
{value: '0', text: ''},
{value: '1', text: '早班'},
{value: '2', text: '中班'},
{value: '3', text: '晚班'},
{value: '4', text: '行政班'},
],
noeditFormatter: function (value, row, index) {
if (row.editable === 1) {
@ -102,13 +103,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function
"field": tmpDate,
"editable" :{
type: 'select',
emptytext: '_',
pk: 1,
source: [
{value: '无', text: '无'},
{value: '早班', text: '早班'},
{value: '中班', text: '中班'},
{value: '晚班', text: '晚班'},
{value: '行政班', text: '行政班'},
{value: '0', text: ''},
{value: '1', text: '早班'},
{value: '2', text: '中班'},
{value: '3', text: '晚班'},
{value: '4', text: '行政班'},
]
}
});