Accept Merge Request #104: (feature/zy -> develop)
Merge Request: feature: auth Created By: @zhuyu Accepted By: @zhuyu URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/104
This commit is contained in:
zhuyu
Coding
commit
58f6fee9ad
286
application/admin/controller/oa/CustomSchedule.php
Normal file
286
application/admin/controller/oa/CustomSchedule.php
Normal file
|
|
@ -0,0 +1,286 @@
|
|||
<?php
|
||||
|
||||
namespace app\admin\controller\oa;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use think\Db;
|
||||
use think\exception\DbException;
|
||||
use think\exception\PDOException;
|
||||
use think\exception\ValidateException;
|
||||
|
||||
/**
|
||||
* 排班
|
||||
*
|
||||
* @icon fa fa-circle-o
|
||||
*/
|
||||
class CustomSchedule extends Backend
|
||||
{
|
||||
|
||||
/**
|
||||
* Schedule模型对象
|
||||
* @var \app\admin\model\oa\Schedule
|
||||
*/
|
||||
protected $model = null;
|
||||
|
||||
public function _initialize()
|
||||
{
|
||||
parent::_initialize();
|
||||
$this->model = new \app\admin\model\oa\Schedule;
|
||||
$this->view->assign("typeList", $this->model->getTypeList());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
|
||||
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
|
||||
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
|
||||
*/
|
||||
|
||||
|
||||
public function index()
|
||||
{
|
||||
//当前是否为关联查询
|
||||
$this->relationSearch = true;
|
||||
//设置过滤方法
|
||||
$this->request->filter(['strip_tags', 'trim']);
|
||||
if ($this->request->isAjax()) {
|
||||
|
||||
|
||||
$filter = $this->request->param('filter');
|
||||
$filter = json_decode($filter, true);
|
||||
|
||||
$startDate = date('Y-m-01');
|
||||
$endDate = date('Y-m-t');
|
||||
|
||||
if (isset($filter['timetype']) && $filter['timetype'] == 2) {
|
||||
$startDate = date('Y-m-d', strtotime('monday this week'));
|
||||
$endDate = date('Y-m-d', strtotime('sunday this week'));
|
||||
}
|
||||
|
||||
$res = [];
|
||||
|
||||
if (!$this->auth->isSuperAdmin()) {
|
||||
$admins = Db::name('admin')->where('id', $this->auth->id)->field('id,nickname')->select();
|
||||
} else{
|
||||
$admins = Db::name('admin')->field('id,nickname')->select();
|
||||
}
|
||||
|
||||
$admins = array_column($admins, NULL, 'id');
|
||||
$adminIds = array_keys($admins);
|
||||
|
||||
$adminNames = array_column($admins, 'nickname', 'id');
|
||||
|
||||
$tmpDate = $startDate;
|
||||
$dates = [];
|
||||
while(true) {
|
||||
|
||||
if ($tmpDate > $endDate) {
|
||||
break;
|
||||
}
|
||||
|
||||
foreach ($adminIds as $adminId) {
|
||||
$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;
|
||||
}
|
||||
|
||||
$dates[] = $tmpDate;
|
||||
$tmpDate = date('Y-m-d', strtotime($tmpDate) + 86400);
|
||||
}
|
||||
|
||||
$builder = $this->model
|
||||
->with([
|
||||
'admin'
|
||||
])
|
||||
->where('date', '>=', $startDate)
|
||||
->where('date', '<=', $endDate);
|
||||
|
||||
if (!$this->auth->isSuperAdmin()) {
|
||||
$builder = $builder->where('exec_admin_id', $this->auth->id);
|
||||
}
|
||||
|
||||
$queryData = $builder->select();
|
||||
foreach ($queryData as $queryDatum) {
|
||||
$queryDatum = $queryDatum->toArray();
|
||||
|
||||
$adminId = $queryDatum['admin']['id'];
|
||||
$date = $queryDatum['date'];
|
||||
$type = $queryDatum['type'];
|
||||
|
||||
if (isset($res[$adminId][$date])) {
|
||||
$res[$adminId][$date] = $this->model->getTypeList()[$type];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$res = array_values($res);
|
||||
|
||||
$result = array("total" => count($res), "rows" => $res);
|
||||
|
||||
return json($result);
|
||||
}
|
||||
|
||||
$timeType = [
|
||||
1 => '本月排班',
|
||||
2 => '本周排班',
|
||||
];
|
||||
$this->view->assign("timetype", $timeType);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @return string
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
if (false === $this->request->isPost()) {
|
||||
return $this->view->fetch();
|
||||
}
|
||||
$params = $this->request->post('row/a');
|
||||
if (empty($params)) {
|
||||
$this->error(__('Parameter %s can not be empty', ''));
|
||||
}
|
||||
$params = $this->preExcludeFields($params);
|
||||
|
||||
if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
|
||||
$params[$this->dataLimitField] = $this->auth->id;
|
||||
}
|
||||
$result = false;
|
||||
Db::startTrans();
|
||||
try {
|
||||
//是否采用模型验证
|
||||
if ($this->modelValidate) {
|
||||
$name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
|
||||
$validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
|
||||
$this->model->validateFailException()->validate($validate);
|
||||
}
|
||||
|
||||
|
||||
$params['create_time'] = date('Y-m-d H:i:s');
|
||||
$params['update_time'] = date('Y-m-d H:i:s');
|
||||
|
||||
|
||||
$result = $this->model->allowField(true)->save($params);
|
||||
Db::commit();
|
||||
} catch (ValidateException|PDOException|Exception $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
}
|
||||
if ($result === false) {
|
||||
$this->error(__('No rows were inserted'));
|
||||
}
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param $ids
|
||||
* @return string
|
||||
* @throws DbException
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
$row = $this->model->get($ids);
|
||||
if (!$row) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
$adminIds = $this->getDataLimitAdminIds();
|
||||
if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) {
|
||||
$this->error(__('You have no permission'));
|
||||
}
|
||||
if (false === $this->request->isPost()) {
|
||||
$this->view->assign('row', $row);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
$params = $this->request->post('row/a');
|
||||
if (empty($params)) {
|
||||
$this->error(__('Parameter %s can not be empty', ''));
|
||||
}
|
||||
$params = $this->preExcludeFields($params);
|
||||
$result = false;
|
||||
Db::startTrans();
|
||||
try {
|
||||
//是否采用模型验证
|
||||
if ($this->modelValidate) {
|
||||
$name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
|
||||
$validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
|
||||
$row->validateFailException()->validate($validate);
|
||||
}
|
||||
|
||||
|
||||
$params['update_time'] = date('Y-m-d H:i:s');
|
||||
|
||||
$result = $row->allowField(true)->save($params);
|
||||
Db::commit();
|
||||
} catch (ValidateException|PDOException|Exception $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
}
|
||||
if (false === $result) {
|
||||
$this->error(__('No rows were updated'));
|
||||
}
|
||||
$this->success();
|
||||
}
|
||||
|
||||
|
||||
public function editable()
|
||||
{
|
||||
|
||||
$params = $this->request->post('row/a');
|
||||
if (empty($params)) {
|
||||
$this->error(__('Parameter %s can not be empty', ''));
|
||||
}
|
||||
|
||||
|
||||
$date = $params['field'];
|
||||
$adminId = $params['admin_id'];
|
||||
|
||||
$value = $params[$date] ?? '无';
|
||||
$valueMap = [
|
||||
'无' => 0,
|
||||
'早班' => 1,
|
||||
'中班' => 2,
|
||||
'晚班' => 3,
|
||||
'行政班' => 4,
|
||||
];
|
||||
|
||||
if ($value == '无') {
|
||||
$this->model->where('exec_admin_id', $adminId)->delete();
|
||||
$this->success();
|
||||
}
|
||||
|
||||
$dbValue = $valueMap[$value];
|
||||
|
||||
$data = $this->model
|
||||
->where('date', '=', $date)
|
||||
->where('exec_admin_id', '=', $adminId)
|
||||
->find();
|
||||
|
||||
$nowTime = date('Y-m-d H:i:s');
|
||||
if (!empty($data)) {
|
||||
$data->save([
|
||||
"date" => $date,
|
||||
"exec_admin_id" => $adminId,
|
||||
"type" => $dbValue,
|
||||
"update_time" => $nowTime,
|
||||
]);
|
||||
}
|
||||
|
||||
$this->model->insert([
|
||||
"date" => $date,
|
||||
"exec_admin_id" => $adminId,
|
||||
"type" => $dbValue,
|
||||
"create_time" => $nowTime,
|
||||
"update_time" => $nowTime,
|
||||
]);
|
||||
|
||||
$this->success();
|
||||
}
|
||||
}
|
||||
30
application/admin/lang/zh-cn/custom_schedule.php
Normal file
30
application/admin/lang/zh-cn/custom_schedule.php
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'Id' => 'ID',
|
||||
'Admin_id' => '创建人',
|
||||
'Exec_admin_id' => '执行人',
|
||||
'Type' => '任务类型',
|
||||
'Type 1' => '早班',
|
||||
'Type 2' => '中班',
|
||||
'Type 3' => '晚班',
|
||||
'Type 4' => '行政班',
|
||||
'Date' => '日期',
|
||||
'Create_time' => '创建时间',
|
||||
'Update_time' => '编辑时间',
|
||||
'Admin.id' => 'ID',
|
||||
'Admin.username' => '用户名',
|
||||
'Admin.nickname' => '昵称',
|
||||
'Admin.password' => '密码',
|
||||
'Admin.salt' => '密码盐',
|
||||
'Admin.avatar' => '头像',
|
||||
'Admin.email' => '电子邮箱',
|
||||
'Admin.mobile' => '手机号码',
|
||||
'Admin.loginfailure' => '失败次数',
|
||||
'Admin.logintime' => '登录时间',
|
||||
'Admin.loginip' => '登录IP',
|
||||
'Admin.createtime' => '创建时间',
|
||||
'Admin.updatetime' => '更新时间',
|
||||
'Admin.token' => 'Session标识',
|
||||
'Admin.status' => '状态'
|
||||
];
|
||||
33
application/admin/view/oa/custom_schedule/add.html
Normal file
33
application/admin/view/oa/custom_schedule/add.html
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" 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">{:__('Date')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[date]" type="text" value="{:date('Y-m-d')}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group layer-footer">
|
||||
<label class="control-label col-xs-12 col-sm-2"></label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
33
application/admin/view/oa/custom_schedule/edit.html
Normal file
33
application/admin/view/oa/custom_schedule/edit.html
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="{$row.exec_admin_id|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">{:__('Date')}:</label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<input id="c-date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[date]" type="text" value="{$row.date}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group layer-footer">
|
||||
<label class="control-label col-xs-12 col-sm-2"></label>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
52
application/admin/view/oa/custom_schedule/index.html
Normal file
52
application/admin/view/oa/custom_schedule/index.html
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
<div class="panel panel-default panel-intro">
|
||||
{:build_heading()}
|
||||
|
||||
<div class="panel-body">
|
||||
<div id="myTabContent" class="tab-content">
|
||||
<div class="tab-pane fade active in" id="one">
|
||||
<div class="widget-body no-padding">
|
||||
<div id="toolbar" class="toolbar">
|
||||
|
||||
</div>
|
||||
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
|
||||
width="100%">
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script id="customformtpl" type="text/html">
|
||||
<!--form表单必须添加form-commsearch这个类-->
|
||||
<form action="" class="form-commonsearch">
|
||||
<div style="border-radius:2px;margin-bottom:10px;background:#f5f5f5;padding:15px 20px;">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-6 col-md-3" style="min-height:68px;">
|
||||
<!--这里添加68px是为了避免刷新时出现元素错位闪屏-->
|
||||
<div class="form-group">
|
||||
<label class="control-label">时间范围</label>
|
||||
<input type="hidden" class="operate" data-name="timetype" value="in"/>
|
||||
<div>
|
||||
<select id="c-flag" class="form-control selectpicker" name="timetype" style="height:31px;">
|
||||
{foreach name="timetype" item="vo"}
|
||||
<option value="{$key}" {in name="key" value="" }selected{/in}>{$vo}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-6 col-md-3">
|
||||
<div class="form-group">
|
||||
<label class="control-label"></label>
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<input type="submit" class="btn btn-success btn-block" value="查询"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</script>
|
||||
155
public/assets/js/backend/oa/custom_schedule.js
Normal file
155
public/assets/js/backend/oa/custom_schedule.js
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function ($, undefined, Backend, Table, Form) {
|
||||
|
||||
var Controller = {
|
||||
index: function () {
|
||||
// 初始化表格参数配置
|
||||
Table.api.init({
|
||||
extend: {
|
||||
index_url: 'oa/custom_schedule/index' + location.search,
|
||||
// add_url: 'oa/schedule/add',
|
||||
editable: 'oa/custom_schedule/editable',
|
||||
// del_url: 'oa/schedule/del',
|
||||
// multi_url: 'oa/schedule/multi',
|
||||
// import_url: 'oa/schedule/import',
|
||||
table: 'schedule',
|
||||
}
|
||||
});
|
||||
|
||||
var table = $("#table");
|
||||
|
||||
var defaultColumnArr = [];
|
||||
defaultColumnArr.push({
|
||||
"title":"用户名",
|
||||
"field":"name",
|
||||
},{
|
||||
"title":"用户id",
|
||||
"field":"admin_id",
|
||||
"visible":false
|
||||
});
|
||||
|
||||
const startDate = new Date();
|
||||
startDate.setDate(1);
|
||||
startDate.setHours(0, 0, 0, 0);
|
||||
|
||||
const endDate = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0);
|
||||
endDate.setHours(0, 0, 0, 0);
|
||||
|
||||
for (let d = new Date(startDate); d <= endDate; ) {
|
||||
const current = new Date(d); // 深拷贝
|
||||
const tmpDate = current.toLocaleDateString('sv-SE');
|
||||
|
||||
console.log('Current Date:', tmpDate);
|
||||
defaultColumnArr.push({
|
||||
"title": tmpDate,
|
||||
"field": tmpDate,
|
||||
"editable" :{
|
||||
type: 'select',
|
||||
pk: 1,
|
||||
source: [
|
||||
{value: '无', text: '无'},
|
||||
{value: '早班', text: '早班'},
|
||||
{value: '中班', text: '中班'},
|
||||
{value: '晚班', text: '晚班'},
|
||||
{value: '行政班', text: '行政班'},
|
||||
],
|
||||
noeditFormatter: function (value, row, index) {
|
||||
if (row.editable === 1) {
|
||||
return false;
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
d.setDate(d.getDate() + 1); // 最后再改 d 的值
|
||||
}
|
||||
|
||||
// 初始化表格
|
||||
table.bootstrapTable({
|
||||
url: $.fn.bootstrapTable.defaults.extend.index_url,
|
||||
columns: defaultColumnArr,
|
||||
searchFormVisible: true,
|
||||
searchFormTemplate: 'customformtpl',
|
||||
});
|
||||
|
||||
// 为表格绑定事件
|
||||
Table.api.bindevent(table);
|
||||
|
||||
$(document).on("click", ".btn-block", function () {
|
||||
|
||||
let selectedValue = $('#c-flag').val();
|
||||
|
||||
let changeColumn = [];
|
||||
if (selectedValue == 2) {
|
||||
changeColumn = [{
|
||||
"title":"用户名",
|
||||
"field":"name",
|
||||
},{
|
||||
"title":"用户id",
|
||||
"field":"admin_id",
|
||||
"visible":false
|
||||
}];
|
||||
|
||||
const today = new Date();
|
||||
const startDate = new Date(today.setDate(today.getDate() - today.getDay() + 1)); // 星期一
|
||||
const endDate = new Date(today.setDate(today.getDate() - today.getDay() + 7)); // 星期天
|
||||
|
||||
for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
|
||||
let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date
|
||||
changeColumn.push({
|
||||
"title": tmpDate,
|
||||
"field": tmpDate,
|
||||
"editable" :{
|
||||
type: 'select',
|
||||
pk: 1,
|
||||
source: [
|
||||
{value: '无', text: '无'},
|
||||
{value: '早班', text: '早班'},
|
||||
{value: '中班', text: '中班'},
|
||||
{value: '晚班', text: '晚班'},
|
||||
{value: '行政班', text: '行政班'},
|
||||
]
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
} else {
|
||||
changeColumn = defaultColumnArr;
|
||||
}
|
||||
|
||||
var options = table.bootstrapTable('getOptions');
|
||||
var queryParams = options.queryParams;
|
||||
options.queryParams = function (params) {
|
||||
//这一行必须要存在,否则在点击下一页时会丢失搜索栏数据
|
||||
params = queryParams(params);
|
||||
|
||||
var filter = params.filter ? JSON.parse(params.filter) : {};
|
||||
filter.timetype = selectedValue;
|
||||
|
||||
params.filter = JSON.stringify(filter);
|
||||
return params;
|
||||
};
|
||||
|
||||
table.bootstrapTable('refreshOptions', {
|
||||
columns: changeColumn,
|
||||
});
|
||||
|
||||
$('#c-flag').val(selectedValue).change();
|
||||
return false;
|
||||
});
|
||||
},
|
||||
add: function () {
|
||||
Controller.api.bindevent();
|
||||
},
|
||||
edit: function () {
|
||||
Controller.api.bindevent();
|
||||
},
|
||||
api: {
|
||||
bindevent: function () {
|
||||
Form.api.bindevent($("form[role=form]"));
|
||||
}
|
||||
}
|
||||
};
|
||||
return Controller;
|
||||
});
|
||||
Loading…
Reference in New Issue
Block a user