Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1188
Star 154
Fork 127
S
Skyeye
提交 0a915b00 编写于 作者: doc_wei's avatar doc_wei
浏览文件
操作

加班申请托管到表单布局

上级 0bfedf82
隐藏空白更改
内联 并排
Showing with 65 addition and 910 deletion
checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeAdd.js 已删除 100644 → 0
浏览文件 @ 0bfedf82
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'laydate', 'form'], function(exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
laydate = layui.laydate;
var serviceClassName = sysServiceMation["checkWorkOvertime"]["key"];
var rowNum = 1; //表格的序号
// 加班日期的初始化集合
var overtimeDayElem = new Array();
var overtimeStartElem = new Array();
var overtimeEndElem = new Array();
var beanTemplate = $("#beanTemplate").html();
// 获取当前登录员工信息
systemCommonUtil.getSysCurrentLoginUserMation(function (data) {
$("#useTitle").html("用户加班申请单-" + getYMDFormatDate() + '-' + data.bean.userName);
$("#useName").html(data.bean.userName);
});
form.render();
matchingLanguage();
// 初始化一行数据
addRow();
skyeyeEnclosure.init('enclosureUpload');
// 保存为草稿
form.on('submit(formAddBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData("1", "");
}
return false;
});
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
return false;
});
function saveData(subType, approvalId) {
// 获取加班日期数据
var rowTr = $("#beanTable tr");
if(rowTr.length == 0) {
winui.window.msg('请选择加班日期数据', {icon: 2, time: 2000});
return false;
}
var tableData = new Array();
var noError = false; //循环遍历表格数据时，是否有其他错误信息
$.each(rowTr, function(i, item) {
var rowNum = $(item).attr("trcusid").replace("tr", "");
if(inTableDataArray($("#overtimeDay" + rowNum).val(), tableData)){
winui.window.msg('同一申请单中不允许出现相同的加班日期.', {icon: 2, time: 2000});
noError = true;
return false;
}
var row = {
overtimeDay: $("#overtimeDay" + rowNum).val(),
overtimeStartTime: $("#overtimeStartTime" + rowNum).val(),
overtimeEndTime: $("#overtimeEndTime" + rowNum).val(),
overtimeHour: $("#overtimeHour" + rowNum).html(),
remark: $("#remark" + rowNum).val()
};
tableData.push(row);
});
if(noError) {
return false;
}
var params = {
title: $("#useTitle").html(),
content: $("#content").val(),
remark: $("#remark").val(),
overtimeDayStr: JSON.stringify(tableData),
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
subType: subType, // 表单类型 1.保存草稿 2.提交审批
approvalId: approvalId
};
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime002", params: params, type: 'json', method: 'POST', callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
// 判断选中的加班日期是否也在数组中
function inTableDataArray(overtimeDay, array) {
var isIn = false;
$.each(array, function(i, item) {
if(item.overtimeDay === overtimeDay) {
isIn = true;
return false;
}
});
return isIn;
}
// 新增行
$("body").on("click", "#addRow", function() {
addRow();
});
// 删除行
$("body").on("click", "#deleteRow", function() {
deleteRow();
});
// 新增行
function addRow() {
var par = {
id: "row" + rowNum.toString(), //checkbox的id
trId: "tr" + rowNum.toString(), //行的id
overtimeDay: "overtimeDay" + rowNum.toString(), //加班日期id
overtimeStartTime: "overtimeStartTime" + rowNum.toString(), //开始时间id
overtimeEndTime: "overtimeEndTime" + rowNum.toString(), //结束时间id
overtimeHour: "overtimeHour" + rowNum.toString(), //加班工时id
remark: "remark" + rowNum.toString() //备注id
};
$("#beanTable").append(getDataUseHandlebars(beanTemplate, par));
overtimeDayElem[rowNum.toString()] = laydate.render({
elem: '#overtimeDay' + rowNum.toString(),
calendar: true,
min: getFormatDate()
});
overtimeStartElem[rowNum.toString()] = laydate.render({
elem: "#overtimeStartTime" + rowNum.toString(),
format: 'HH:mm',
type: 'timeminute',
minutesinterval: 30,
btns: ['confirm'],
done: function(value, date){
var num = $(this)[0].elem.selector.replace("#", "").replace("overtimeStartTime", "");
$("#overtimeStartTime" + num).val(value);
overtimeEndElem[num].config.min = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
// 计算工时
calcOvertimeHour(num);
}
});
overtimeEndElem[rowNum.toString()] = laydate.render({
elem: "#overtimeEndTime" + rowNum.toString(),
format: 'HH:mm',
type: 'timeminute',
minutesinterval: 30,
btns: ['confirm'],
done: function(value, date){
var num = $(this)[0].elem.selector.replace("#", "").replace("overtimeEndTime", "");
$("#overtimeEndTime" + num).val(value);
overtimeStartElem[num].config.max = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
// 计算工时
calcOvertimeHour(num);
}
});
form.render('select');
form.render('checkbox');
rowNum++;
}
// 删除行
function deleteRow() {
var checkRow = $("#beanTable input[type='checkbox'][name='tableCheckRow']:checked");
if(checkRow.length > 0) {
$.each(checkRow, function(i, item) {
$(item).parent().parent().remove();
});
} else {
winui.window.msg('请选择要删除的行', {icon: 2, time: 2000});
}
}
/**
* 计算加班工时
*
* @param num 表格的序号
*/
function calcOvertimeHour(num){
var startTime = $("#overtimeStartTime" + num).val();
var endTime = $("#overtimeEndTime" + num).val();
if (!isNull(startTime) && !isNull(endTime)){
var hour = division(timeDifference(startTime, endTime), 60);
$("#overtimeHour" + num).html(hour);
}
}
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeDetails.js 已删除 100644 → 0
浏览文件 @ 0bfedf82
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui'], function(exports) {
winui.renderColor();
layui.use(['form'], function(form) {
var $ = layui.$;
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime003", params: {rowId: parent.rowId}, type: 'json', method: 'GET', callback: function(json) {
json.bean.stateName = getStateNameByState(json.bean.state, json.bean.stateName);
$("#showForm").html(getDataUseHandlebars($("#useTemplate").html(), json));
// 附件回显
skyeyeEnclosure.showDetails({"enclosureUpload": json.bean.enclosureInfo});
form.render();
matchingLanguage();
}});
});
});
\ No newline at end of file
checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeEdit.js 已删除 100644 → 0
浏览文件 @ 0bfedf82
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'laydate', 'form'], function(exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
laydate = layui.laydate;
var serviceClassName = sysServiceMation["checkWorkOvertime"]["key"];
var rowNum = 1; //表格的序号
// 加班日期的初始化集合
var overtimeDayElem = new Array();
var overtimeStartElem = new Array();
var overtimeEndElem = new Array();
var beanTemplate = $("#beanTemplate").html();
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime004", params: {rowId: parent.rowId}, type: 'json', method: 'GET', callback: function(mation) {
$("#useTitle").html(mation.bean.title);
$("#useName").html(mation.bean.userName);
$("#content").html(mation.bean.content);
$("#remark").val(mation.bean.remark);
// 附件回显
skyeyeEnclosure.initTypeISData({'enclosureUpload': mation.bean.enclosureInfo});
if(mation.bean.state == '1'){
$(".typeTwo").removeClass("layui-hide");
} else {
$(".typeOne").removeClass("layui-hide");
}
form.render();
matchingLanguage();
$.each(mation.bean.overtimeDay, function(i, item) {
addRow();
$("#overtimeDay" + (rowNum - 1).toString()).val(item.overtimeDay);
$("#overtimeStartTime" + (rowNum - 1).toString()).val(item.overtimeStartTime);
$("#overtimeEndTime" + (rowNum - 1).toString()).val(item.overtimeEndTime);
$("#overtimeHour" + (rowNum - 1).toString()).html(item.overtimeHour);
$("#remark" + (rowNum - 1).toString()).val(item.remark);
form.render('select');
form.render('checkbox');
});
}});
// 保存为草稿
form.on('submit(formEditBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData('1', "");
}
return false;
});
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
return false;
});
// 工作流中保存
form.on('submit(subBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData('3', "");
}
return false;
});
function saveData(subType, approvalId) {
// 获取加班日期数据
var rowTr = $("#beanTable tr");
if(rowTr.length == 0) {
winui.window.msg('请选择加班日期数据', {icon: 2, time: 2000});
return false;
}
var tableData = new Array();
var noError = false; //循环遍历表格数据时，是否有其他错误信息
$.each(rowTr, function(i, item) {
var rowNum = $(item).attr("trcusid").replace("tr", "");
if(inTableDataArray($("#overtimeDay" + rowNum).val(), tableData)){
winui.window.msg('同一申请单中不允许出现相同的加班日期.', {icon: 2, time: 2000});
noError = true;
return false;
}
var row = {
overtimeDay: $("#overtimeDay" + rowNum).val(),
overtimeStartTime: $("#overtimeStartTime" + rowNum).val(),
overtimeEndTime: $("#overtimeEndTime" + rowNum).val(),
overtimeHour: $("#overtimeHour" + rowNum).html(),
remark: $("#remark" + rowNum).val()
};
tableData.push(row);
});
if(noError) {
return false;
}
var params = {
rowId: parent.rowId,
content: $("#content").val(),
remark: $("#remark").val(),
overtimeDayStr: JSON.stringify(tableData),
enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
subType: subType, // 1：保存为草稿 2.提交到工作流 3.在工作流中编辑
approvalId: approvalId,
};
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime005", params: params, type: 'json', method: 'PUT', callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
}
// 判断选中的加班日期是否也在数组中
function inTableDataArray(overtimeDay, array) {
var isIn = false;
$.each(array, function(i, item) {
if(item.overtimeDay === overtimeDay) {
isIn = true;
return false;
}
});
return isIn;
}
// 新增行
$("body").on("click", "#addRow", function() {
addRow();
});
// 删除行
$("body").on("click", "#deleteRow", function() {
deleteRow();
});
// 新增行
function addRow() {
var par = {
id: "row" + rowNum.toString(), //checkbox的id
trId: "tr" + rowNum.toString(), //行的id
overtimeDay: "overtimeDay" + rowNum.toString(), //加班日期id
overtimeStartTime: "overtimeStartTime" + rowNum.toString(), //开始时间id
overtimeEndTime: "overtimeEndTime" + rowNum.toString(), //结束时间id
overtimeHour: "overtimeHour" + rowNum.toString(), //加班工时id
remark: "remark" + rowNum.toString() //备注id
};
$("#beanTable").append(getDataUseHandlebars(beanTemplate, par));
overtimeDayElem[rowNum.toString()] = laydate.render({
elem: '#overtimeDay' + rowNum.toString(),
calendar: true,
min: getFormatDate()
});
overtimeStartElem[rowNum.toString()] = laydate.render({
elem: "#overtimeStartTime" + rowNum.toString(),
format: 'HH:mm',
type: 'timeminute',
minutesinterval: 30,
btns: ['confirm'],
min: getFormatDate(),
done: function(value, date){
var num = $(this)[0].elem.selector.replace("#", "").replace("overtimeStartTime", "");
$("#overtimeStartTime" + num).val(value);
overtimeEndElem[num].config.min = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
// 计算工时
calcOvertimeHour(num);
}
});
overtimeEndElem[rowNum.toString()] = laydate.render({
elem: "#overtimeEndTime" + rowNum.toString(),
format: 'HH:mm',
type: 'timeminute',
minutesinterval: 30,
btns: ['confirm'],
min: getFormatDate(),
done: function(value, date){
var num = $(this)[0].elem.selector.replace("#", "").replace("overtimeEndTime", "");
$("#overtimeEndTime" + num).val(value);
overtimeStartElem[num].config.max = {
year: date.year,
month: date.month - 1,//关键
date: date.date,
hours: date.hours,
minutes: date.minutes,
seconds: date.seconds
};
// 计算工时
calcOvertimeHour(num);
}
});
form.render('select');
form.render('checkbox');
rowNum++;
}
// 删除行
function deleteRow() {
var checkRow = $("#beanTable input[type='checkbox'][name='tableCheckRow']:checked");
if(checkRow.length > 0) {
$.each(checkRow, function(i, item) {
$(item).parent().parent().remove();
});
} else {
winui.window.msg('请选择要删除的行', {icon: 2, time: 2000});
}
}
/**
* 计算加班工时
*
* @param num 表格的序号
*/
function calcOvertimeHour(num){
var startTime = $("#overtimeStartTime" + num).val();
var endTime = $("#overtimeEndTime" + num).val();
if (!isNull(startTime) && !isNull(endTime)){
var hour = division(timeDifference(startTime, endTime), 60);
$("#overtimeHour" + num).html(hour);
}
}
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
});
\ No newline at end of file
checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js
浏览文件 @ 0a915b00
var rowId = "";
var taskType = "";//流程详情的主标题
var processInstanceId = "";//流程id
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["checkWorkOvertime"]["key"];
// 新增加班申请
authBtn('1618046226263');
// 申请时间
laydate.render({elem: '#applyTime', range: '~'});
// 我的加班申请列表
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'checkworkovertime001',
url: sysMainMation.checkworkBasePath + 'checkworkovertime001',
where: getTableParams(),
even: true,
page: true,
......@@ -35,29 +26,35 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'title', title: '标题', width: 300, templet: function (d) {
return '<a lay-event="dedails" class="notice-title-click">' + d.title + '</a>';
{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'oddNum', title: '单号', width: 200 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
{ field: 'name', title: '标题', width: 300 },
{ field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'stateName', title: '状态', width: 90, templet: function (d) {
return activitiUtil.showStateName2(d.state, 1);
{ field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'}
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#messageTableBar' }
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'dedails') { // 详情
dedails(data);
if (layEvent === 'details') { // 详情
details(data);
} else if (layEvent === 'edit') { // 编辑
edit(data);
} else if (layEvent === 'subApproval') { // 提交审批
......@@ -74,7 +71,7 @@ layui.config({
// 新增加班申请
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/checkWorkOvertime/checkWorkOvertimeAdd.html",
url: systemCommonUtil.getUrl('FP2023070200013', null),
title: "加班申请",
pageId: "checkWorkOvertimeAdd",
area: ['90vw', '90vh'],
......@@ -88,7 +85,7 @@ layui.config({
function revoke(data) {
layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime009", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.checkworkBasePath + "checkworkovertime009", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
......@@ -97,9 +94,8 @@ layui.config({
// 编辑加班申请
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/checkWorkOvertime/checkWorkOvertimeEdit.html",
url: systemCommonUtil.getUrl('FP2023070200014&id=' + data.id, null),
title: "加班申请",
pageId: "checkWorkOvertimeEdit",
area: ['90vw', '90vh'],
......@@ -116,10 +112,10 @@ layui.config({
layer.close(index);
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
var params = {
rowId: data.id,
id: data.id,
approvalId: approvalId
};
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime006", params: params, type: 'json', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.checkworkBasePath + "checkworkovertime006", params: params, type: 'json', method: "POST", callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
......@@ -131,7 +127,7 @@ layui.config({
function cancellation(data) {
layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "checkworkovertime007", params: {rowId: data.id}, type: 'json', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.checkworkBasePath + "checkworkovertime007", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
......@@ -139,10 +135,9 @@ layui.config({
}
// 加班申请详情
function dedails(data) {
rowId = data.id;
function details(data) {
_openNewWindows({
url: "../../tpl/checkWorkOvertime/checkWorkOvertimeDetails.html",
url: systemCommonUtil.getUrl('FP2023070200015&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "checkWorkOvertimeDetails",
area: ['90vw', '90vh'],
......@@ -152,34 +147,15 @@ layui.config({
}
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
}
return false;
});
// 刷新
$("body").on("click", "#reloadTable", function() {
loadTable();
});
// 刷新数据
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var startTime = "", endTime = "";
if (!isNull($("#applyTime").val())) {
startTime = $("#applyTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#applyTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
state: $("#state").val(),
startTime: startTime,
endTime: endTime
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('checkWorkOvertimeList', {});
......
checkwork/src/main/resources/template/tpl/checkWorkOvertime/checkWorkOvertimeAdd.html 已删除 100644 → 0
浏览文件 @ 0bfedf82
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useTitle">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">步骤</label>
<div class="layui-input-block ver-center">
填单
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">责任人<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useName">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班事由<i class="red">*</i></label>
<div class="layui-input-block">
<textarea id="content" name="content" placeholder="请输入加班事由" class="layui-textarea" win-verify="required" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班日期<i class="red">*</i></label>
<div class="layui-input-block">
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
</div>
</div>
<div class="layui-form-mid layui-word-aux" id="messageTips"></div>
<table class="layui-table">
<thead>
<tr>
<th style="width: 30px;"></th>
<th style="width: 100px;">加班日期<i class="red">*</i></th>
<th style="width: 80px;">开始时间<i class="red">*</i></th>
<th style="width: 80px;">结束时间<i class="red">*</i></th>
<th style="width: 80px;">加班工时</th>
<th style="min-width: 80px;">备注</th>
</tr>
</thead>
<tbody id="beanTable" class="insurance-table">
</tbody>
</table>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件</label>
<div class="layui-input-block" id="enclosureUpload">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formAddBean">保存为草稿</button>
<button class="winui-btn" lay-submit lay-filter="formSubBean">提交审批</button>
</div>
</div>
</form>
</div>
<!-- beanTemplate -->
<script type="text/x-handlebars-template" id="beanTemplate">
<tr trcusid="{{trId}}">
<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
<td><input type="text" class="layui-input" id="{{overtimeDay}}" win-verify="required"/></td>
<td><input type="text" class="layui-input" id="{{overtimeStartTime}}" win-verify="required"/></td>
<td><input type="text" class="layui-input" id="{{overtimeEndTime}}" win-verify="required"/></td>
<td id="{{overtimeHour}}">0</td>
<td><input type="text" class="layui-input" id="{{remark}}"/></td>
</tr>
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/checkWorkOvertime/'}).use('checkWorkOvertimeAdd');
</script>
</body>
</html>
\ No newline at end of file
checkwork/src/main/resources/template/tpl/checkWorkOvertime/checkWorkOvertimeDetails.html 已删除 100644 → 0
浏览文件 @ 0bfedf82
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm">
</form>
</div>
<!-- useTemplate -->
<script type="text/x-handlebars-template" id="useTemplate">
{{#bean}}
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题：</label>
<div class="layui-input-block ver-center">
{{title}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">单号：</label>
<div class="layui-input-block ver-center">
{{oddNumber}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">状态：</label>
<div class="layui-input-block ver-center">
{{{stateName}}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">责任人：</label>
<div class="layui-input-block ver-center">
{{userName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">申请时间：</label>
<div class="layui-input-block ver-center">
{{createTime}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班事由：</label>
<div class="layui-input-block ver-center">
{{content}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班日期：</label>
<div class="layui-input-block">
<table class="layui-table">
<thead>
<tr>
<th style="width: 100px;">加班日期</th>
<th style="width: 80px;">开始时间</th>
<th style="width: 80px;">结束时间</th>
<th style="width: 80px;">加班工时</th>
<th style="width: 80px;">状态</th>
<th style="min-width: 80px;">备注</th>
</tr>
</thead>
<tbody id="beanTable" class="insurance-table">
{{#each overtimeDay}}
<tr>
<td>{{overtimeDay}}</td>
<td>{{overtimeStartTime}}</td>
<td>{{overtimeEndTime}}</td>
<td>{{overtimeHour}}</td>
<td>{{stateName}}</td>
<td>{{remark}}</td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述：</label>
<div class="layui-input-block ver-center">
{{remark}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件：</label>
<div class="layui-input-block ver-center" id="enclosureUpload">
</div>
</div>
{{/bean}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/checkWorkOvertime/'}).use('checkWorkOvertimeDetails');
</script>
</body>
</html>
\ No newline at end of file
checkwork/src/main/resources/template/tpl/checkWorkOvertime/checkWorkOvertimeEdit.html 已删除 100644 → 0
浏览文件 @ 0bfedf82
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">标题<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useTitle">
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">步骤</label>
<div class="layui-input-block ver-center">
填单
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">责任人<i class="red">*</i></label>
<div class="layui-input-block ver-center" id="useName">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班事由<i class="red">*</i></label>
<div class="layui-input-block">
<textarea id="content" name="content" placeholder="请输入加班事由" class="layui-textarea" win-verify="required" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">加班日期<i class="red">*</i></label>
<div class="layui-input-block">
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
</div>
</div>
<div class="layui-form-mid layui-word-aux" id="messageTips"></div>
<table class="layui-table">
<thead>
<tr>
<th style="width: 30px;"></th>
<th style="width: 100px;">加班日期<i class="red">*</i></th>
<th style="width: 80px;">开始时间<i class="red">*</i></th>
<th style="width: 80px;">结束时间<i class="red">*</i></th>
<th style="width: 80px;">加班工时</th>
<th style="min-width: 80px;">备注</th>
</tr>
</thead>
<tbody id="beanTable" class="insurance-table">
</tbody>
</table>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关描述</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">相关附件</label>
<div class="layui-input-block" id="enclosureUpload">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn typeOne layui-hide" lay-submit lay-filter="formEditBean">保存为草稿</button>
<button class="winui-btn typeOne layui-hide" lay-submit lay-filter="formSubBean">提交审批</button>
<button class="winui-btn typeTwo layui-hide" lay-submit lay-filter="subBean"><language showName="com.skyeye.save"></language></button>
</div>
</div>
</form>
</div>
<!-- beanTemplate -->
<script type="text/x-handlebars-template" id="beanTemplate">
<tr trcusid="{{trId}}">
<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
<td><input type="text" class="layui-input" id="{{overtimeDay}}" win-verify="required"/></td>
<td><input type="text" class="layui-input" id="{{overtimeStartTime}}" win-verify="required"/></td>
<td><input type="text" class="layui-input" id="{{overtimeEndTime}}" win-verify="required"/></td>
<td id="{{overtimeHour}}">0</td>
<td><input type="text" class="layui-input" id="{{remark}}"/></td>
</tr>
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/checkWorkOvertime/'}).use('checkWorkOvertimeEdit');
</script>
</body>
</html>
\ No newline at end of file
checkwork/src/main/resources/template/tpl/checkWorkOvertime/checkWorkOvertimeList.html
浏览文件 @ 0a915b00
......@@ -7,64 +7,34 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto; height: 100%;">
<div class="txtcenter" style="margin:0 auto; padding-top: 10px;">
<div class="winui-tip alert-info" id="showInfo">尽量不要申请工作日期间的加班，否则可能会覆盖正常的考勤信息。</div>
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-inline">
<select id="state">
<option value="">全部</option>
<option value="0">草稿</option>
<option value="1">审核中</option>
<option value="2">审核通过</option>
<option value="3">审核不通过</option>
<option value="4">作废</option>
<option value="5">撤销</option>
</select>
</div>
<label class="layui-form-label">申请时间</label>
<div class="layui-input-inline">
<input type="text" id="applyTime" name="applyTime" placeholder="请选择申请时间" class="layui-input" />
</div>
<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn" auth="1618046226263"><i class="fa fa-plus" aria-hidden="true"></i>加班申请</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="messageTableBar">
{{# if(d.state == '0' || d.state == '3' || d.state == '5'){ }}
{{# if(auth('1618046249246')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1618046259669')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
{{# } }}
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1618046236454')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1618046269538')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
</script>
<div class="winui-tip alert-info" id="showInfo">尽量不要申请工作日期间的加班，否则可能会覆盖正常的考勤信息。</div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1618046226263"><i class="fa fa-plus" aria-hidden="true"></i>加班申请</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="messageTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1618046249246')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1618046259669')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
{{# } }}
{{# if(auth('1618046226263')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1618046269538')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 0a915b00
......@@ -76,7 +76,8 @@
"voucherType": {"name": "凭证类型", "className": "skyeye-ifs#com.skyeye.voucher.classenum.VoucherType"},
"checkWorkTimeType": {"name": "考勤班次类型", "className": "skyeye-checkwork#com.skyeye.worktime.classenum.CheckWorkTimeType"},
"overtimeSoltSettleState": {"name": "加班是否计入补休/薪资结算状态枚举类", "className": "skyeye-checkwork#com.skyeye.overtime.classenum.OvertimeSoltSettleState"},
"overtimeSoltSettleState": {"name": "加班是否计入补休/薪资结算状态", "className": "skyeye-checkwork#com.skyeye.overtime.classenum.OvertimeSoltSettleState"},
"overtimeSettlementType": {"name": "部门加班结算方式", "className": "skyeye-checkwork#com.skyeye.common.enumeration.OvertimeSettlementType"},
"leaveType": {"name": "请假类型", "className": "skyeye-checkwork#com.skyeye.leave.classenum.LeaveType"},
"useYearHolidayType": {"name": "请假是否使用年假/补休的类型", "className": "skyeye-checkwork#com.skyeye.leave.classenum.UseYearHolidayType"},
"clockInTime": {"name": "上班打卡状态", "className": "skyeye-checkwork#com.skyeye.checkwork.classenum.ClockInTime"},
......
web/src/main/resources/template/json/sysServiceMation.json
浏览文件 @ 0a915b00
{
"vehicleManageUse": {"name": "用车申请", "key": "com.skyeye.eve.vehicle.service.impl.VehicleApplyUseServiceImpl"},
"sealManageRevert": {"name": "印章归还", "key": "com.skyeye.eve.seal.service.impl.SealApplyRevertServiceImpl"},
"sealManageBorrow": {"name": "印章借用", "key": "com.skyeye.eve.seal.service.impl.SealApplyBorrowServiceImpl"},
"putIsSalesReturns": {"name": "销售退货单申请", "key": "com.skyeye.seal.service.impl.SalesReturnsServiceImpl"},
"outIsSalesOutlet": {"name": "销售出库单申请", "key": "com.skyeye.seal.service.impl.SalesOutLetServiceImpl"},
"outchaseOrder": {"name": "销售订单申请", "key": "com.skyeye.seal.service.impl.SalesOrderServiceImpl"},
"putIsRetailReturns": {"name": "零售退货单申请", "key": "com.skyeye.retail.service.impl.RetailReturnsServiceImpl"},
"outIsRetail": {"name": "零售出库单申请", "key": "com.skyeye.retail.service.impl.RetailOutLetServiceImpl"},
"outIsPurchaseReturns": {"name": "采购退货单申请", "key": "com.skyeye.purchase.service.impl.PurchaseReturnsServiceImpl"},
"putIsPurchase": {"name": "采购入库单申请", "key": "com.skyeye.purchase.service.impl.PurchasePutServiceImpl"},
"purchaseOrder": {"name": "采购订单申请", "key": "com.skyeye.purchase.service.impl.PurchaseOrderServiceImpl"},
"putIsOthers": {"name": "其他入库单申请", "key": "com.skyeye.other.service.impl.OtherWareHousServiceImpl"},
"outIsOthers": {"name": "其他出库单申请", "key": "com.skyeye.other.service.impl.OtherOutLetsServiceImpl"},
"splitListOrder": {"name": "拆分订单", "key": "com.skyeye.other.service.impl.SplitListServiceImpl"},
......@@ -35,26 +27,26 @@
"proFile": {"name": "项目文档审核", "key": "com.skyeye.service.impl.ProFileServiceImpl"},
"proCostExpense": {"name": "项目费用报销审核", "key": "com.skyeye.service.impl.ProCostExpenseServiceImpl"},
"licenceManageRevert": {"name": "证照归还", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyRevertServiceImpl"},
"licenceManageBorrow": {"name": "证照借用", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyBorrowServiceImpl"},
"crmCustomer": {"name": "客户信息", "key": "com.skyeye.customer.service.impl.CustomerServiceImpl"},
"crmOpportUnity": {"name": "商机审核一阶段", "key": "com.skyeye.opportunity.service.impl.CrmOpportunityServiceImpl"},
"myCrmContract": {"name": "合同审批", "key": "com.skyeye.contract.service.impl.CrmContractServiceImpl"},
"conFerenceRoomReserve": {"name": "会议室预定", "key": "com.skyeye.eve.conference.service.impl.ConferenceRoomReserveServiceImpl"},
"checkWorkOvertime": {"name": "加班申请", "key": "com.skyeye.eve.service.impl.CheckWorkOvertimeServiceImpl"},
"checkWorkLeave": {"name": "请假申请", "key": "com.skyeye.eve.service.impl.CheckWorkLeaveServiceImpl"},
"checkWorkCancelLeave": {"name": "销假申请", "key": "com.skyeye.eve.service.impl.CheckWorkCancelLeaveServiceImpl"},
"checkWorkBusinessTrip": {"name": "出差申请", "key": "com.skyeye.eve.service.impl.CheckWorkBusinessTripServiceImpl"},
"checkWorkOvertime": {"name": "加班申请", "key": "com.skyeye.overtime.service.impl.OvertimeServiceImpl"},
"checkWorkLeave": {"name": "请假申请", "key": "com.skyeye.leave.service.impl.LeaveServiceImpl"},
"checkWorkCancelLeave": {"name": "销假申请", "key": "com.skyeye.cancleleave.service.impl.CancelLeaveServiceImpl"},
"checkWorkBusinessTrip": {"name": "出差申请", "key": "com.skyeye.trip.service.impl.BusinessTripServiceImpl"},
"assetManageUse": {"name": "资产领用", "key": "com.skyeye.eve.assets.service.impl.AssetUseServiceImpl"},
"assetManageReturn": {"name": "资产归还", "key": "com.skyeye.eve.assets.service.impl.AssetReturnServiceImpl"},
"assetManagePurchase": {"name": "资产采购", "key": "com.skyeye.eve.assets.service.impl.AssetPurchaseServiceImpl"},
"assetArticlesUse": {"name": "用品领用", "key": "com.skyeye.eve.articles.service.impl.ArticlesUseServiceImpl"},
"assetArticlesPurchase": {"name": "用品采购", "key": "com.skyeye.eve.articles.service.impl.ArticlesPurchaseServiceImpl"},
"licenceManageRevert": {"name": "证照归还", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyRevertServiceImpl"},
"licenceManageBorrow": {"name": "证照借用", "key": "com.skyeye.eve.licence.service.impl.LicenceApplyBorrowServiceImpl"},
"vehicleManageUse": {"name": "用车申请", "key": "com.skyeye.eve.vehicle.service.impl.VehicleApplyUseServiceImpl"},
"sealManageRevert": {"name": "印章归还", "key": "com.skyeye.eve.seal.service.impl.SealApplyRevertServiceImpl"},
"sealManageBorrow": {"name": "印章借用", "key": "com.skyeye.eve.seal.service.impl.SealApplyBorrowServiceImpl"},
"conFerenceRoomReserve": {"name": "会议室预定", "key": "com.skyeye.eve.conference.service.impl.ConferenceRoomReserveServiceImpl"},
"incomeOrder": {"name": "财务明细账", "key": "com.skyeye.order.service.impl.IncomeOrderServiceImpl"},
......@@ -64,9 +56,7 @@
"bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "com.skyeye.jobtransfer.service.impl.JobTransferServiceImpl"},
"userInfo": {"name": "用户信息", "key": "com.skyeye.personnel.service.impl.SysEveUserServiceImpl"},
"dictData": {"name": "数据字典", "key": "com.skyeye.eve.service.impl.SysDictDataServiceImpl"},
"contacts": {"name": "联系人", "key": "com.skyeye.contacts.service.impl.ContactsServiceImpl"},
"enclosure": {"name": "附件", "key": "com.skyeye.enclosure.service.impl.SysEnclosureServiceImpl"}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或