# Conflicts:
#	hxy-web/js/dataStatistics/staff/staffList.js
#	hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
#	hxy-web/js/dataStatistics/workVisa/workVisaList.js
This commit is contained in:
skjia 2024-08-22 14:06:55 +08:00
commit e2eb9b8f8f
39 changed files with 862 additions and 352 deletions

View File

@ -101,33 +101,33 @@
<div class="layui-tab-content" style="width: 100%;height: 90%;">
<!-- 栏目1 -->
<div class="layui-tab-item layui-show">
<iframe src="index.html" id="indexFrame" frameborder="0" width="100%" height="100%"></iframe>
<iframe src="index.html" id="indexFrame" frameborder="0" width="100%" height="100%"></iframe>
</div>
<!-- 栏目2 -->
<div class="layui-tab-item">
<iframe src="./viewPlan/viewPlanList.html" frameborder="0" width="100%" height="100%"></iframe>
<iframe src="./viewPlan/viewPlanList.html" id="viewPlanFrame" frameborder="0" width="100%" height="100%"></iframe>
</div>
<!-- 栏目3 -->
<div class="layui-tab-item">
<iframe src="./staff/staffList.html" frameborder="0" width="100%" height="100%"></iframe>
<iframe src="./staff/staffList.html" frameborder="0" id="staffFrame" width="100%" height="100%"></iframe>
</div>
<!-- 栏目4 -->
<div class="layui-tab-item">
<iframe src="./viewStatistics/viewStatisticsList.html" frameborder="0" width="100%"
<iframe src="./viewStatistics/viewStatisticsList.html" id="viewStatisticsFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
<!-- 栏目5 -->
<div class="layui-tab-item">
<iframe src="./workVisa/workVisaList.html" frameborder="0" width="100%" height="100%"></iframe>
<iframe src="./workVisa/workVisaList.html" id="workVisaFrame" frameborder="0" width="100%" height="100%"></iframe>
</div>
<!-- 栏目6 -->
<div class="layui-tab-item">
<iframe src="./specialPatrol/specialPatrolList.html" frameborder="0" width="100%"
<iframe src="./specialPatrol/specialPatrolList.html" id="specialPatrolFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
<!-- 栏目7 -->
<div class="layui-tab-item">
<iframe src="./wagesStatistics/wagesStatisticsList.html" frameborder="0" width="100%"
<iframe src="./wagesStatistics/wagesStatisticsList.html" id="wagesStatisticsFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
</div>

View File

@ -140,32 +140,36 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_blue.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus2{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_green.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus3{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_gren.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus4 {
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_red.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
</style>
</head>

View File

@ -140,32 +140,36 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_blue.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus2{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_green.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus3{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_gren.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus4 {
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_red.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
</style>
</head>

View File

@ -156,8 +156,9 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_blue.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus2 {
@ -165,8 +166,9 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_green.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus3 {
@ -174,16 +176,18 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_gren.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus4 {
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_red.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
</style>
</head>

View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>公司-审核不通过</title>
<title>公司-审核不通过</title>
<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
<script src="../../../js/public/jq.js"></script>
<script src="../../../js/public/public.js"></script>

View File

@ -68,17 +68,17 @@
</div>
<!-- 栏目2 -->
<div class="layui-tab-item">
<iframe src="./viewResult/viewResult.html" frameborder="0" width="100%"
<iframe src="./viewResult/viewResult.html" id="viewResultFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
<!-- 栏目3 -->
<div class="layui-tab-item">
<iframe src="./viewPlan/viewPlanList.html" frameborder="0" width="100%"
<iframe src="./viewPlan/viewPlanList.html" id="viewPlanFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
<!-- 栏目4 -->
<div class="layui-tab-item">
<iframe src="./staff/staffList.html" frameborder="0" width="100%"
<iframe src="./staff/staffList.html" id="staffFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
<!-- 栏目5 -->
@ -93,7 +93,7 @@
</div>
<!-- 栏目7 -->
<div class="layui-tab-item">
<iframe src="./wagesReport/wagesReportList.html" frameborder="0" width="100%"
<iframe src="./wagesReport/wagesReportList.html" id="wagesFrame" frameborder="0" width="100%"
height="100%"></iframe>
</div>
</div>

View File

@ -84,7 +84,7 @@
<label class="layui-form-label" style="width: 116px;"><i class="tip-required"
style="color: red;font-size: 20px">*</i>电压等级:</label>
<div class="layui-input-inline">
<input type="text" name="volLevel" id="volLevel" class="layui-input" lay-verify="required" maxlength="500" placeholder="请填写" style="width: 425px">
<input type="text" name="volLevel" id="volLevel" class="layui-input" lay-verify="required" maxlength="20" placeholder="请填写" style="width: 425px">
</div>
</div>
</div>

View File

@ -63,27 +63,6 @@
<button class="layui-btn layui-btn-sm layui-btn-primary" lay-event="set">取消</button>
</script>
<!-- 新增杆塔弹窗 -->
<script type="text/html" id="gmDetail">
<form class="layui-form" onsubmit="return false" style="width: 90%;height: 90%;padding: 10px;">
<div class="layui-form-item">
<div class="layui-inline" style="margin-left: 0%; ">
<label class="layui-form-label" style="width:100px;">
<i class="tip-required" style="color: red;font-size: 20px">*</i>杆塔名称:</label>
<div class="layui-input-inline">
<input type="text" name="gmName" id="gmName" class="layui-input"
lay-verify="required" maxlength="200" placeholder="请填写杆塔名称" style="width: 350px">
</div>
</div>
</div>
<div style="width: 90%;height: 60px;display: flex;align-items: center;justify-content: flex-end;margin-top: 20px;">
<button class="layui-btn layui-btn-sm layui-btn-primary" style="">取消</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" style="margin-right: 20px;">确定</button>
</div>
</form>
</script>
<div class="detail-content">
<div class="header">
@ -157,6 +136,8 @@
</div>
<div class="layui-tab-item" >
<form class="layui-form" onsubmit="return false" style="margin-left: 20px;">
<input id="proId" type="hidden">
<input id="proName" type="hidden">
<div class="form-group" style="margin-top: 0.5%">
<div class="layui-inline">
<div class="layui-input-inline">
@ -207,15 +188,15 @@
<div class="form-group" style="margin-top: 0.5%">
<div class="layui-inline">
<div class="layui-input-inline">
<input id="search3" type="text" class="layui-input" placeholder="杆塔,护线员姓名" >
<input id="userName" type="text" class="layui-input" placeholder="护线员姓名" >
</div>
</div>
<button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="queryUser">
<button class="layui-btn layui-btn-sm layui-btn-normal" onclick="queryClick2()">
<i class="layui-icon layui-icon-search"></i>
查询
</button>
<button class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="resetUser">
<button class="layui-btn layui-btn-sm layui-btn-primary" onclick="resetClick2()">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>导入</title>
<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
<script src="../../js/public/jq.js"></script>
<script src="../../../js/public/jq.js"></script>
<script src="../../../js/public/public.js"></script>
<script src="../../../js/public/public_utils.js"></script>
<script src="../../../js/public/aescbc.js"></script>

View File

@ -0,0 +1,151 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>护线员考勤</title>
<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
<script src="../../../js/public/jq.js"></script>
<script src="../../../js/public/public.js"></script>
<script src="../../../js/public/public_utils.js"></script>
<script src="../../../js/public/aescbc.js"></script>
<script src="../../../plugs/layui2.7.6/layui.js"></script>
<link href="../../../plugs/layui2.7.6/css/layui.css" rel="stylesheet">
<!-- <script src="../../../util/Interceptor.js"></script> -->
<!--业务js-->
<!-- css -->
<link type="text/css" media="screen" href="../../../css/formAdd.css" rel="stylesheet">
</head>
<body>
<form class="layui-form" onsubmit="return false" style="display: none;margin: 10px 0 10px 26px;">
<input id="proId" type="hidden">
<input id="proName" type="hidden">
<input id="gtId" type="hidden">
<input id="gtName" type="hidden">
<input id="projectId" type="hidden">
<input id="projectName" type="hidden">
<div class="form-group" style="margin-top: 0.5%">
<div class="layui-inline">
<div class="layui-input-inline">
<input id="keyWord" name="keyWord" type="text" class="layui-input" placeholder="请输入杆塔或工程名称" >
</div>
</div>
<button class="layui-btn layui-btn-sm layui-btn-normal" onclick="queryClick()">
<i class="layui-icon layui-icon-search"></i>
</button>
</div>
</form>
<div style="width: 90%;height: 90%;margin-left: 5%;overflow: auto;border: 1px solid #E9E9E9;">
<div class="select-box">
<input type="text" name="taskSourceId" id="taskSourceId" class="layui-input" placeholder="请选择" readonly autocomplete="off" style="width: 90%;cursor: pointer;">
</div>
</div>
<button id="closeBt" class="layui-btn layui-btn-primary layui-border-blue" style="position: fixed;left: 67%;top: 92%;background-color: #ffffff">取消</button>
<button id="submitBt" type="button" class="layui-btn" style="position: fixed;left: 81%;top: 92%;">保存</button>
<script>
let dropdown;
layui.use(['element', 'layer', 'form', 'element','laypage'], function(){
dropdown = layui.dropdown;
$("#closeBt").click(function () {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
init()
$("#submitBt").click(function(){
var gtTwoId = $("#taskSourceId").attr("stationId");
var gtTwoName = $("#taskSourceId").val();
if(!gtTwoName){
layer.msg("请选择杆塔", { icon: 0 });
return;
}
var gtId = $("#gtId").val();
var proId = $("#proId").val();
var proName = $("#proName").val();
var proIds = $("#projectId").val();
var proNames = $("#projectName").val();
$.ajax({
type: 'POST',
url: PATH_URL + '/lineProject/insertGtRel',
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
gtId: gtId,
proId: proId,
proName: proName,
gtTwoId: gtTwoId,
gtTwoName: gtTwoName,
proIds: proIds,
proNames: proNames
}),
success: function (data) {
if(data.code == 200){
parent.layer.msg("关联成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
// reloading();
}else{
layer.alert(data.msg);
}
},
error: function (XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
}
});
})
})
// function queryClick(){
// init();
// }
function setData(gtId,gtName,proId,proName){
$("#gtId").val(gtId);
$("#gtName").val(gtName);
$("#proId").val(proId);
$("#proName").val(proName);
}
function init(){
var keyWord = $("#keyWord").val();
$.ajax({
type: 'POST',
url: PATH_URL + '/homePageSelect/getPowerList', // 请求地址
data: {
keyWord: keyWord,
gtId: $("#gtId").val(),
proId: $("#proId").val()
}, //获取提交的表单字段
success: function (data) {
dropdown.render({
elem: '#taskSourceId',
accordion: true,
data: data.data,
click: function(item){
console.log("item:", item)
if(item.level == '3'){
$("#taskSourceId").val(`${item.title}`);
$("#taskSourceId").attr("stationId", item.id);
$("#projectId").val(`${item.pid}`);
$("#projectName").val(`${item.projectName}`);
}
},
});
},
error: function (XMLHttpRequest, textStatus, e) {
layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
top.layer.close(addLoadingMsg); //再执行关闭
}
});
}
</script>
</body>
</html>

View File

@ -139,32 +139,36 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_blue.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus2{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_green.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus3{
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_gren.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus4 {
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_red.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
</style>
</head>
@ -203,7 +207,7 @@
分公司审核
</div>
<div>
<div class="planAuditStatus2" id="aiDitStatuses"></div>
<div class="planAuditStatus3" id="aiDitStatuses"></div>
<div style="text-align: center;">
<img class="chargePersonIcon2" src="../../../image/userIcon.png">
</div>

View File

@ -156,8 +156,9 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_blue.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus2 {
@ -165,8 +166,9 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_green.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus3 {
@ -174,8 +176,18 @@
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_gren.png) no-repeat;
background-size: 50% 100%;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
.planAuditStatus4 {
color: #ffffff;
height: 30px;
padding-top: 5px;
background: url(../../../image/dialogBox_red.png) no-repeat;
background-size: 60% 100%;
background-position: center;
text-align: center;
}
</style>
</head>
@ -219,7 +231,7 @@
分公司审核
</div>
<div>
<div class="planAuditStatus2">审核通过</div>
<div class="planAuditStatus3" id="aiDitStatuses"></div>
<div style="text-align: center;">
<img class="chargePersonIcon2" src="../../../image/userIcon.png">
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

View File

@ -10,6 +10,8 @@ layui.use(['element', 'layer', 'form', 'element','laypage'], function(){
})
//初始化云间公司
function init(){
$.ajax({
type: 'POST',
url: PATH_URL + '/homePageSelect/getSubCom', // 请求地址
@ -39,9 +41,33 @@ function init(){
localStorage.setItem("selectSubCom",data.value);
var iframe = $("#indexFrame")[0];
var iframeWindow = iframe.contentWindow;
iframeWindow.initStation();
iframeWindow.setData();
var viewPlanFrame = $("#viewPlanFrame")[0];
var viewPlanWindow = viewPlanFrame.contentWindow;
viewPlanWindow.init();
var staffFrame = $("#staffFrame")[0];
var staffWindow = staffFrame.contentWindow;
staffWindow.init();
var viewStatisticsFrame = $("#viewStatisticsFrame")[0];
var viewStatisticsWindow = viewStatisticsFrame.contentWindow;
viewStatisticsWindow.init();
var workVisaFrame = $("#workVisaFrame")[0];
var workVisaWindow = workVisaFrame.contentWindow;
workVisaWindow.init();
var specialPatrolFrame = $("#specialPatrolFrame")[0];
var specialPatrolWindow = specialPatrolFrame.contentWindow;
specialPatrolWindow.init();
var wagesStatisticsFrame = $("#wagesStatisticsFrame")[0];
var wagesStatisticsWindow = wagesStatisticsFrame.contentWindow;
wagesStatisticsWindow.init();
});
},
error: function (XMLHttpRequest, textStatus, e) {

View File

@ -7,11 +7,15 @@ var nextMonthFirstDay = new Date(currentDate.getFullYear(), currentDate.getMonth
var daysInMonth = Math.floor((nextMonthFirstDay.getTime() - firstDay.getTime()) / (24 * 60 * 60 * 1000));
// console.log(daysInMonth);
var pers = []
var table, form, laydate,excel;
var d;
var excelData=[];
var table, form, laydate, excel;
layui.use(['form', 'layer', 'table', 'laydate','excel'], function() {
var excelData = [];
var cols = [],
tableDatas = [];
layui.use(['form', 'layer', 'table', 'laydate', 'excel'], function() {
excel = layui.excel;
table = layui.table;
form = layui.form;
@ -29,6 +33,7 @@ layui.use(['form', 'layer', 'table', 'laydate','excel'], function() {
function init() {
var subComId = $(window.parent.document).find("select[id='subComId']").val();
let userName = $('#userName').val();
let proName = $('#proName').val();
let yjName = $('#yjName').val();
@ -80,7 +85,7 @@ function init() {
"proName": proName,
"yjName": yjName,
"makeMonth": makeMonth,
"fgsId": "26"
"fgsId": subComId
}, //获取提交的表单字段
success: function(data) {
for (var i = 0; i < data.length; i++) {
@ -117,27 +122,29 @@ function init() {
page: true, //开启分页
skin: 'line', // 表格样式
cols: col,
data: tableData,
title: '特勤考勤台账'//导出数据excel的表名称
data: tableData,
title: '特勤考勤台账' //导出数据excel的表名称
});
console.log("col",col)
console.log("tableData",tableData)
excelData.push(['特勤考勤台账']);
// 使用 cols 和 data 构造一个包含表头的新数组
excelData.push(col[0].map(function(item) { return item.title; })); // 构建表头行
tableData.forEach(function(row, index) {
var newRow = [];
col[0].forEach(function(colItem) {
if (colItem.type === 'numbers') {
newRow.push(index + 1); // 序号从 1 开始
} else {
newRow.push(row[colItem.field]); // 添加对应字段的值
}
});
excelData.push(newRow); // 将新行添加到 excelData
});
console.log(excelData); // 输出结果,检查是否正确
console.log("col", col)
console.log("tableData", tableData)
cols = col[0]
tableDatas = tableData;
// // 使用 cols 和 data 构造一个包含表头的新数组
// excelData.push(col[0].map(function(item) {
// return item.title;
// })); // 构建表头行
// tableData.forEach(function(row, index) {
// var newRow = [];
// col[0].forEach(function(colItem) {
// if (colItem.type === 'numbers') {
// newRow.push(index + 1); // 序号从 1 开始
// } else {
// newRow.push(row[colItem.field]); // 添加对应字段的值
// }
// });
// excelData.push(newRow); // 将新行添加到 excelData
// });
// console.log(excelData); // 输出结果,检查是否正确
},
error: function(XMLHttpRequest, textStatus, e) {
layer.msg('数据请求发生异常,请稍后重试', {
@ -172,6 +179,53 @@ function resetClick() {
//导出
function exportData() {
layui.excel.exportExcel(excelData, '特勤考勤台账.xlsx', 'xlsx')
const XLSX = window.XLSX;
// 创建一个新的工作簿
var workbook = XLSX.utils.book_new();
// 创建一个新的工作表
var worksheet = XLSX.utils.aoa_to_sheet([
['特勤考勤台账'], // 标题行
cols.map(function(item) {
return item.title;
}), // 表头行
]);
// 添加数据行
tableDatas.forEach(function(row, index) {
var newRow = [];
cols.forEach(function(colItem) {
if (colItem.type === 'numbers') {
newRow.push(index + 1); // 序号从 1 开始
} else {
newRow.push(row[colItem.field]); // 添加对应字段的值
}
});
XLSX.utils.sheet_add_aoa(worksheet, [newRow], {
origin: -1
}); // 添加数据行
});
// 设置合并单元格
worksheet['!merges'] = [{
s: {
r: 0,
c: 0,
},
e: {
r: 0,
c: cols.length - 1,
}
} // 合并 A1 到 E1 单元格
];
// 添加工作表到工作簿
XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
// 导出 Excel 文件
XLSX.writeFile(workbook, '特勤考勤台账.xlsx');
// console.log(XLSX);
// layui.excel.exportExcel(excelData, '特勤考勤台账.xlsx', 'xlsx')
// table.exportFile(d.config.id, excelData, 'xlsx');
}

View File

@ -51,6 +51,7 @@ layui.use(['form','layer','table'], function () {
* 初始化数据
*/
function init(){
<<<<<<< HEAD
var yjId=localStorage.getItem("selectyj");
var subId=localStorage.getItem("selectSubCom");
console.log(yjId,"yjId")
@ -59,6 +60,17 @@ function init(){
table.render({
elem: '#table',
url: PATH_URL + "/personbase/getList",
=======
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
elem: '#table',
where: {
fgsId: subComId
},
// url: "/sys/achievement",
>>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496
page: true,
method:'post',
where:{yjId:yjId,subId:subId},

View File

@ -252,5 +252,14 @@ function noPass() {
var myIframe = window[layero.find('iframe')[0]['name']];
var fnc = myIframe.setData(yjIds, insMonths, ids); //aaa()为子页面的方法
},
end: function(){
var noPass = localStorage.getItem("noPass");
if(noPass =="1"){
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
window.parent.location.reload();
}
}
});
}

View File

@ -212,7 +212,7 @@ function pass() {
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 4
"auditStatus": 2
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
@ -245,12 +245,21 @@ function noPass() {
var index = layer.open({
title: ['审核不通过', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: './noPassReason.html',
content: './noPassReasonTotal.html',
area: [width, height],
maxmin: false,
success: function(layero, index) {
var myIframe = window[layero.find('iframe')[0]['name']];
var fnc = myIframe.setData(yjIds, insMonths, ids); //aaa()为子页面的方法
},
end: function(){
var noPassTotal = localStorage.getItem("noPassTotal");
if(noPassTotal =="1"){
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
window.parent.location.reload();
}
}
});
}

View File

@ -92,7 +92,7 @@ function setData(data, yjId, insMonth) {
var element = document.getElementById('aiDitStatuses');
// 移除旧的类
element.classList.remove('planAuditStatus3');
if(data[0].aiDitStatuses == 2){
if(data[0].aiDitStatuses == 2 || data[0].aiDitStatuses == 4){
element.classList.add('planAuditStatus2');
$('#aiDitStatuses').html("审核通过");
}else if(data[0].aiDitStatuses == 3){

View File

@ -19,56 +19,59 @@ function setData(yjId, insMonth, id) {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
$("#searchBt").click(function() {
// 加载提示
let loadingMsg = layer.msg('数据上传中,请稍候...', {
icon: 16,
scrollbar: false,
time: 0,
shade: [0.8, '#393D49']
});
// form请求地址
let formUrl = PATH_URL + "/inspectionPlan/updateDivideExamine";
let revokeReason = $("#revokeReason").val();
$.ajax({
type: 'POST',
url: formUrl, // 请求地址
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 2,
"auditReason":revokeReason
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
if (data.code == 200) {
parent.layer.msg("审核成功", {
icon: 1
});
var index = parent.layer.getFrameIndex(window
.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
reloading();
} else {
layer.alert(data.msg);
}
},
error: function(XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {
icon: 16,
scrollbar: false
});
}
});
// 验证成功后才会执行下面的操作
form.on('submit(formDemo)', function (data) {
addData();
});
});
}
function addData(){
localStorage.setItem("noPass","1");
// 加载提示
let loadingMsg = layer.msg('数据上传中,请稍候...', {
icon: 16,
scrollbar: false,
time: 0,
shade: [0.8, '#393D49']
});
// form请求地址
let formUrl = PATH_URL + "/inspectionPlan/updateDivideExamine";
let revokeReason = $("#revokeReason").val();
$.ajax({
type: 'POST',
url: formUrl, // 请求地址
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 3,
"auditReason":revokeReason
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
if (data.code == 200) {
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
// reloading();
localStorage.setItem("noPass","1");
} else {
layer.alert(data.msg);
}
},
error: function(XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {
icon: 16,
scrollbar: false
});
}
});
}
//设置弹窗关闭

View File

@ -19,57 +19,57 @@ function setData(yjId, insMonth, id) {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
$("#searchBt").click(function() {
// 加载提示
let loadingMsg = layer.msg('数据上传中,请稍候...', {
icon: 16,
scrollbar: false,
time: 0,
shade: [0.8, '#393D49']
});
// form请求地址
let formUrl = PATH_URL + "/inspectionPlan/updateTotalExamine";
let revokeReason = $("#revokeReason").val();
$.ajax({
type: 'POST',
url: formUrl, // 请求地址
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 2,
"auditReason":revokeReason
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
if (data.code == 200) {
parent.layer.msg("审核成功", {
icon: 1
});
var index = parent.layer.getFrameIndex(window
.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
reloading();
} else {
layer.alert(data.msg);
}
},
error: function(XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {
icon: 16,
scrollbar: false
});
}
});
// 验证成功后才会执行下面的操作
form.on('submit(formDemo)', function (data) {
addData();
});
});
}
function addData(){
// 加载提示
let loadingMsg = layer.msg('数据上传中,请稍候...', {
icon: 16,
scrollbar: false,
time: 0,
shade: [0.8, '#393D49']
});
// form请求地址
let formUrl = PATH_URL + "/inspectionPlan/updateTotalExamine";
let revokeReason = $("#revokeReason").val();
$.ajax({
type: 'POST',
url: formUrl, // 请求地址
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
"auditStatus": 3,
"auditReason":revokeReason
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
if (data.code == 200) {
parent.layer.msg("添加成功", { icon: 1 });
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
// reloading();
localStorage.setItem("noPassTotal","1");
} else {
layer.alert(data.msg);
}
},
error: function(XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {
icon: 16,
scrollbar: false
});
}
});
}
//设置弹窗关闭
function reloading() {

View File

@ -21,9 +21,10 @@ function queryClick() {
let yjName = $('#yjName').val();
let insMonth = $('#insMonth').val();
let aiDitStatus = $('#aiDitStatus').val();
var subComId = $(window.parent.document).find("select[id='subComId']").val();
table.reload('layui_table', {
where: {
fgsId: '26',
fgsId: subComId,
fgsName: fgsName,
yjName: yjName,
insMonth: insMonth,
@ -37,10 +38,11 @@ function resetClick() {
$('#yjName').val('');
$('#insMonth').val('');
$('#aiDitStatus').val('0');
var subComId = $(window.parent.document).find("select[id='subComId']").val();
form.render();
table.reload('layui_table', {
where: {
fgsId: "26",
fgsId: subComId,
fgsName: "",
yjName: "",
insMonth: "",
@ -54,13 +56,14 @@ function resetClick() {
*/
function init() {
let aiDitStatus = $('#aiDitStatus').val();
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
id: 'layui_table',
elem: '#table',
url: PATH_URL + '/inspectionPlan/getLineProjectListAuditPage',
where: {
fgsId: '26',
fgsId: subComId,
aiDitStatus: aiDitStatus
},
page: true,
@ -125,7 +128,7 @@ function init() {
text = '已通过';
color = '#19BE6B';
}
if (status == '0') {
if (status == '0' || status == '4') {
text = '待审核';
color = '#FF9900';
}
@ -303,7 +306,8 @@ function exportData() {
let yjName = $('#yjName').val();
let insMonth = $('#insMonth').val();
let aiDitStatus = $('#aiDitStatus').val();
let fgsId = '26'
var subComId = $(window.parent.document).find("select[id='subComId']").val();
let fgsId = subComId
window.location.href = PATH_URL + `/inspectionPlan/exportAuditPlanData?token=` + token +
"&fgsName=" + fgsName +

View File

@ -169,10 +169,18 @@ var col = [
* 初始化数据
*/
function init(){
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
elem: '#table',
<<<<<<< HEAD
url: PATH_URL + "/makeInfo/getListTabs",
=======
where: {
fgsId: subComId
}
// url: "/sys/achievement",
>>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496
page: true,
method:'post',
border: true,

View File

@ -70,9 +70,13 @@ layui.use(['form','layer','table','laydate'], function () {
* 初始化数据
*/
function init(){
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
elem: '#table',
where: {
fgsId: subComId
},
// url: "/sys/achievement",
page: true,
skin: 'line', // 表格样式

View File

@ -77,10 +77,18 @@ layui.use(['form','layer','table','laydate'], function () {
* 初始化数据
*/
function init(){
var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
elem: '#table',
<<<<<<< HEAD
url: PATH_URL + "/workvisa/getListTab",
=======
where: {
fgsId: subComId
},
// url: "/sys/achievement",
>>>>>>> e368ceeff701decf9d8a09e1b31bb567ab6d0496
page: true,
method:'post',
skin: 'line', // 表格样式

View File

@ -67,6 +67,7 @@ layui.use(['form','layer','table','laydate','element'], function () {
//查询
function queryClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
let userName = $('#userName').val();
let proName = $('#proName').val();
let yjName = $('#yjName').val();
@ -81,13 +82,15 @@ function queryClick(){
proName: proName,
yjName: yjName,
startMakeMonth: startMakeMonth,
endMakeMonth: endMakeMonth
endMakeMonth: endMakeMonth,
yjId: yjId
}
})
}
}
//重置
function resetClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
$('#userName').val("");
$('#proName').val("");
$('#yjName').val("");
@ -103,6 +106,7 @@ function resetClick(){
yjName: "",
startMakeMonth: '',
endMakeMonth: $('#makeMonth').val(),
yjId: yjId
}
})
}
@ -301,7 +305,6 @@ function initTable3(userName,proName,yjName,makeMonth){
* 详情
* */
function checkView(obj) {
debugger
let height = '98%';
let width = '95%';
$.ajax({

View File

@ -16,6 +16,7 @@ function init(){
type: 'POST',
url: PATH_URL + '/homePageSelect/getLineProtectorSubComAndStandDropdown', // 请求地址
contentType: "application/json; charset=utf-8",
async:false,
data: {}, //获取提交的表单字段
success: function (data) {
console.log("datadatasss:", data.data)
@ -45,14 +46,31 @@ function init(){
iframeWindow.setData();
var viewResultFrame = $("#viewResultFrame")[0];
var viewResultWindow = viewResultFrame.contentWindow;
viewResultWindow.init();
var viewPlanFrame = $("#viewPlanFrame")[0];
var viewPlanWindow = viewPlanFrame.contentWindow;
viewPlanWindow.init();
var staffFrame = $("#staffFrame")[0];
var staffWindow = staffFrame.contentWindow;
staffWindow.init();
var projectFrame = $("#projectFrame")[0];
var projectWindow = projectFrame.contentWindow;
projectWindow.init();
var attendanceFrame = $("#attendanceFrame")[0];
var attendanceWindow = attendanceFrame.contentWindow;
attendanceWindow.init();
attendanceWindow.initTable1();
var wagesFrame = $("#wagesFrame")[0];
var wagesWindow = wagesFrame.contentWindow;
wagesWindow.init();
},
});
},

View File

@ -114,15 +114,17 @@ function addData(formData) {
* @returns {boolean}
*/
function updateData(formData) {
if(parentData.data.proName === $("#lineProName").val()){
layer.msg("您想要修改的杆塔名称与原名称一致,无法修改!", { icon: 0, time: 3000 });
$("#lineProName").focus();
return;
var isTwo;
var isTwos = $('.btnOption1 > div');
for (var i = 0; i < isTwos.length; i++) {
if($(isTwos[i]).attr("value")){
isTwo = $(isTwos[i]).attr("value");
}
}
formData.field.isTwo = workTypeValue;
formData.field.isTwo = isTwo;
formData.field.yjId = $("#taskSourceId").attr("stationId");
formData.field.yjName = $("#taskSourceId").attr("stationName");
// 加载提示

View File

@ -39,40 +39,7 @@ layui.use(['form','layer','table','element'], function () {
return false; // 阻止表单跳转。如果需要表单跳转,去掉这段即可。
});
//人员信息
//initStaffTable()
// 触发submit提交 按钮点击或者表单被执行提交时触发
form.on('submit(queryUser)', function (data) {
console.log("搜索")
// 对表格进行重载。id 即 table表格的id
table.reload('staffTable', {
// //设定异步数据接口的额外参数
page:{curr : 1}
,where: data.field
})
return false; // 阻止表单跳转。如果需要表单跳转,去掉这段即可。
});
form.on('submit(resetUser)', function () {
console.log("重置")
$('#search1').val('');
$('#search2').val('');
let obj = {
search1:'',
search2:''
}
// 对表格进行重载。id 即 table表格的id
table.reload('staffTable', {
// //设定异步数据接口的额外参数
page:{curr : 1}
,where: obj
})
return false; // 阻止表单跳转。如果需要表单跳转,去掉这段即可。
});
form.render();
initStaffTable();
});
//杆塔信息搜索
function queryClick1(){
@ -106,6 +73,9 @@ function resetClick1(){
}
})
}
//新增杆塔
function addClick1(){
var height = '80%';
@ -275,11 +245,26 @@ function importData1(){
function setData(data){
$("#proName").text(data.proName);
$("#proId").val(data.proId);
$("#proName").val(data.proName);
var proName = data.proName;
if(proName.length > 8){
proName = proName.substring(0, 8) + '...'
}
$("#proName").text(proName);
$("#proName").attr('title', data.proName);
$(".isTwo").text(data.isTwo == '0'? '单回路': '双回路');
$("#powerNum").text(data.powerNum);
$("#lineNum").text(data.lineNum);
$("#lineProName").text(data.proName);
var proName1 = data.proName;
if(proName1.length > 50){
proName1 = proName1.substring(0, 50) + '...'
}
$("#lineProName").text(proName1);
$("#lineProName").attr('title', data.proName);
$("#yjName").text(data.fgsName + ' / ' + data.yjName);
$("#volLevel").text(data.volLevel + 'kV');
@ -301,7 +286,11 @@ function initGmTableOne(){
skin: 'line', // 表格样式
cols: [[
{
type: 'checkbox'
type: 'checkbox',
templet: function(d){
// 根据条件决定是否渲染多选框
return '<input type="checkbox" disabled />';
}
},
{
title: '序号',
@ -313,7 +302,16 @@ function initGmTableOne(){
{field:'gtUserName', title: '护线员 (来源:人员合同)',align: 'center',},
]],
done: function(res,curr,count){
//checkPermission();
//我这里是封装过talbe所以是res.rows需要打印出自己的res是什么
for (var i in res.data) {
let item = res.data[i];
if(item.isTower == '1'){
// checkbox 根据条件设置不可选中
$('tr[data-index=' + i + '] input[type="checkbox"]').prop('disabled', true);
//重新渲染
form.render();
}
}
}
});
}
@ -350,13 +348,14 @@ function initGmTableTwo(){
field: '',
align: 'center',
templet: function(d){
console.log("sssss:", d.gtTwoName)
let isTwo = d.isTwo;
let html;
if(isTwo == '0' || isTwo == 0){
html = '<span>单回路</span>'
var gtTwoName = d.gtTwoName;
var gtId = d.gtId;
var gtName = d.gtName;
var gtTwoId = d.gtTwoId;
if(gtTwoName == 'null' || gtTwoName == null){
html = `<button class="layui-btn layui-btn-sm layui-bg-orange" onclick="setUpGt('${ gtId }', '${ gtName }')">设置</button>`
}else{
html = '<span>双回路</span>'
html = `<button class="layui-btn layui-btn-sm layui-btn-primary" onclick="cancelGt('${ gtId }', '${ gtTwoId }')">取消</button>`
}
// 返回模板内容
return html;
@ -364,40 +363,118 @@ function initGmTableTwo(){
}
]],
done: function(res,curr,count){
//checkPermission();
//我这里是封装过talbe所以是res.rows需要打印出自己的res是什么
for (var i in res.data) {
let item = res.data[i];
if(item.isTower == '1'){
// checkbox 根据条件设置不可选中
$('tr[data-index=' + i + '] input[type="checkbox"]').prop('disabled', true);
//重新渲染
form.render();
}
}
}
});
}
//设置杆塔
function setUpGt(gtId, gtName){
var height = '98%';
var width = '30%';
var index = parent.layer.open({
title: ['选择双回路杆塔', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: 'setUpGt.html',
area: [width, height],
maxmin: false,
success: function (layero, index) {
// //打开页面成功时执行
var myIframe = parent.window[layero.find('iframe')[0]['name']];
var proId = $("#proId").val();
var proName = $("#proName").val();
//getTaskSource()为子页面的方法
myIframe.setData(gtId,gtName,proId,proName);
},
yes: function (index, layero) {
// //提交子页面时执行
// // 获取弹出层中的form表单元素
// var formSubmit = layer.getChildFrame('form', index);
// var submited = formSubmit.find('button')[0];
// // 触发点击事件,会对表单进行验证,验证成功则提交表单,失败则返回错误信息
// // var myIframe = window[layero.find('iframe')[0]['name']];
// // myIframe.selectCheck(); //aaa()为子页面的方法
// submited.click();
// example.ajax.reload(); // 刷新页面
},
end: function(){
initGmTableTwo();
}
});
}
//取消设置
function cancelGt(gtId, gtTwoId){
var index = layer.confirm("确认取消吗?", { icon: 0 }, function(){
$.ajax({
type: 'POST',
url: PATH_URL + '/lineProject/delGtRelId',
contentType: "application/json; charset=utf-8",
data: JSON.stringify({
gtId: gtId,
gtTwoId: gtTwoId
}),
success: function (data) {
if(data.code == 200){
parent.layer.msg("取消成功", { icon: 1 });
layer.close(index);
initGmTableTwo();
}else{
layer.alert(data.msg);
}
},
error: function (XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
}
});
})
}
//杆塔信息搜索
function queryClick2(){
// 对表格进行重载。id 即 table表格的id
table.reload('layui_table2', {
// //设定异步数据接口的额外参数
page:{curr : 1}
,where: {
'userName': $("#userName").val()
}
})
}
function addGm(){
var height = '42%';
var width = '38%';
var index = layer.open({
title: [`选择工程、杆塔 `, 'color:#3B70A1;background-color:#fff;font-size:20px'],
type: 1,
content: $("#gmDetail").html(),
closeBtn: 1,
area: [width, height],
success: function (layero, index) {
//重置
function resetClick2(){
//重置
$('#userName').val("");
table.reload('layui_table2', {
where: {
'userName': '',
}
})
}
},
cancel: function(index, layero){//关闭
console.log(3)
layer.close(index);
},
});
}
// 渲染人员表格
function initStaffTable(){
table.render({
id: 'layui_table2',
elem: '#staffTable',
// url: "/sys/achievement",
page: true,
url: PATH_URL + "/personbase/getList",
where: {
},
page: true, //开启分页
method:'post',
skin: 'line', // 表格样式
cols: [[
{
@ -409,15 +486,17 @@ function initStaffTable(){
align: 'center',
type: 'numbers'
},
{field:'name', title: '姓 名',align: 'center',width:100},
{field:'idCard', title: '身份证号',align: 'center',},
{field:'phone', title: '联系电话',align: 'center',width:120},
{field:'line', title: '管辖线路名称',align: 'center',width:350},
{field:'area', title: '范围、基数',align: 'center',width:350},
{field:'userName', title: '姓 名',align: 'center',width:100},
{field:'idNumber', title: '身份证号',align: 'center',},
{field:'tel', title: '联系电话',align: 'center',width:120},
{field:'proName', title: '管辖线路名称',align: 'center',width:350},
{field:'gtName', title: '范围、基数',align: 'center',width:350},
{field:'startTime', title: '协议起始日期',align: 'center',width:140},
{field:'endTime', title: '协议终止日期',align: 'center',width:140}
]],
data: tableData2
done: function(res,curr,count){
//checkPermission();
}
});
}
@ -432,7 +511,7 @@ function projectAddUser(){
var index = layer.open({
title: ['新增人员', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: 'projectAddUser.html',
content: '../staff/staffAdd.html',
area: [width, height],
maxmin: false,
success: function (layero, index) {
@ -440,7 +519,7 @@ function projectAddUser(){
var myIframe = window[layero.find('iframe')[0]['name']];
//getTaskSource()为子页面的方法
// myIframe.getTaskSource("taskSourceId","");
},
yes: function (index, layero) {
// //提交子页面时执行
@ -475,4 +554,15 @@ function exportData1() {
+ "&type=" + type
+ "&proId=" + proId
+ "&proName=" + parentData.proName
}
//导出人员信息
function exportData() {
// let search1 = $('#search1').val();
// let search2 = $('#search2').val();
window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token;
}

View File

@ -13,11 +13,11 @@ layui.use(['form','layer','table'], function () {
break;
case 'edit':
console.log('修改',obj)
updateView(obj.data.proId)
updateView(obj.data)
break;
case 'del':
console.log('删除',obj)
delView(obj.data.proId)
delView(obj.data)
break;
}
@ -27,23 +27,27 @@ layui.use(['form','layer','table'], function () {
//查询
function queryClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
let fgsName = $('#fgsName').val();
let proName = $('#proName').val();
table.reload('layui_table', {
where: {
fgsName: fgsName,
proName: proName,
yjId: yjId
}
})
}
//重置
function resetClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
$('#fgsName').val("");
$('#proName').val("");
table.reload('layui_table', {
where: {
fgsName: "",
proName: "",
yjId: yjId
}
})
}
@ -161,7 +165,7 @@ function checkView(vo) {
contentType: "application/json; charset=utf-8",
data: JSON.stringify({"proId": vo.proId}),
success: function (data) {
console.log("data:", data)
console.log("ssadsad:", data)
var index = layer.open({
@ -186,14 +190,18 @@ function checkView(vo) {
/**
* 修改
* */
function updateView(id) {
function updateView(value) {
if(value.lineNum > 0){
layer.msg("该工程已绑定人员,无法修改", { icon: 0 })
return;
}
var height = '90%';
var width = '55%';
$.ajax({
type: 'POST',
contentType: "application/json; charset=utf-8",
url: PATH_URL + '/lineProject/getProById',
data: JSON.stringify({"proId": id}),
data: JSON.stringify({"proId": value.proId}),
success: function (data) {
var index = layer.open({
title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
@ -227,18 +235,22 @@ function updateView(id) {
/**
* 删除
* */
function delView(id) {
function delView(value) {
if(value.lineNum > 0){
layer.msg("该工程已绑定人员,无法删除", { icon: 0 })
return;
}
let index = layer.confirm("是否确定删除数据?", function () {
$.ajax({
type: 'POST',
url: PATH_URL + '/lineProject/delProId',
contentType: "application/json; charset=utf-8",
data: JSON.stringify({ "proIds": id }),
data: JSON.stringify({ "proIds": value.proId }),
success: function (data) {
layer.close(index);
if (data.code == 200) {
top.layer.alert('删除成功', {icon: 1});
// example.ajax.reload(); // 刷新页面
parent.layer.alert('删除成功', {icon: 1});
init()
} else {
layer.msg("删除失败", {icon: 2}, function () {
// example.ajax.reload(); // 刷新页面
@ -279,11 +291,11 @@ function importData(){
//导出
function exportData() {
alert(token)
var fgsName = $("#fgsName").val();
var proName = $("#proName").val();
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
window.location.href = PATH_URL + `/lineProject/exportProData?token=` + token
+ "&fgsName=" + fgsName
+ "&proName=" + proName
+ "&yjId=" + yjId
}

View File

@ -90,7 +90,7 @@ function init() {
var proName = d.proName;
var insMonth = d.insMonth;
var html =
`<input class="workContent layui-input" maxlength="500" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="workContent layui-input" maxlength="100" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -123,7 +123,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="liablePerson layui-input" maxlength="200" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="liablePerson layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -134,7 +134,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="proctorPerson layui-input" maxlength="200" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="proctorPerson layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -145,7 +145,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="standard layui-input" maxlength="500" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="standard layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -156,7 +156,7 @@ function init() {
templet: function(d) {
var id = d.id
var html =
`<input class="remark layui-input" maxlength="500" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="remark layui-input" maxlength="100" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
}
@ -175,16 +175,16 @@ function init() {
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间!');
}
}
// if (startDate && endDate) {
// if (endDate.getTime() < startDate.getTime()) {
// // 清空结束时间
// // 清除DOM元素的值
// $(this.elem).val('');
// // 重置endDate变量
// endDate = null;
// layer.msg('结束时间不能早于开始时间!');
// }
// }
}
});
laydate.render({
@ -195,16 +195,16 @@ function init() {
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间!');
}
}
// if (startDate && endDate) {
// if (endDate.getTime() < startDate.getTime()) {
// // 清空结束时间
// // 清除DOM元素的值
// $(this.elem).val('');
// // 重置endDate变量
// endDate = null;
// layer.msg('结束时间不能早于开始时间!');
// }
// }
}
});
},
@ -260,19 +260,30 @@ function saveMonthPlan() {
return;
}
if (planStartTime == "") {
layer.msg("请填写计划开始时间", {
layer.msg("请选择计划开始时间", {
icon: 0
});
$(planStartTimes[i]).focus();
return;
}
if (planEndTime == "") {
layer.msg("请填写计划结束时间", {
layer.msg("请选择计划结束时间", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
if(planStartTime !="" && planEndTime !=""){
if (planEndTime < planStartTime) {
layer.msg("结束时间不能早于开始时间!", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
}
if (liablePerson == "") {
layer.msg("请填写责任人(护线员)", {
icon: 0

View File

@ -96,7 +96,24 @@ function setData(data, yjId, insMonth) {
//分公司
if (data[0].aiDitStatuses) {
$('#aiDitStatuses').html(data[0].aiDitStatuses);
// 获取元素
var element = document.getElementById('aiDitStatuses');
// 移除旧的类
element.classList.remove('planAuditStatus3');
if(data[0].aiDitStatuses == 2 || data[0].aiDitStatuses == 4){
element.classList.add('planAuditStatus2');
$('#aiDitStatuses').html("审核通过");
}else if(data[0].aiDitStatuses == 3){
element.classList.add('planAuditStatus4');
$('#aiDitStatuses').html("审核不通过");
$('#noPassReason').html(data[0].auditReason);
}
$('#auditUserName').html(data[0].auditUserName);
$('#auditTime').html(data[0].auditTime);
$('#auditUserName').html(data[0].auditUserName);
$('#auditTime').html(data[0].auditTime);
} else {
@ -107,7 +124,19 @@ function setData(data, yjId, insMonth) {
//总公司
if (data[0].aiDitStatusTotal) {
$('#aiDitStatusTotal').html(data[0].aiDitStatusTotal);
// 获取元素
var element = document.getElementById('aiDitStatusTotal');
// 移除旧的类
element.classList.remove('planAuditStatus3');
if(data[0].aiDitStatusTotal == 2){
element.classList.add('planAuditStatus2');
$('#aiDitStatusTotal').html("审核通过");
}else if(data[0].aiDitStatusTotal == 3){
element.classList.add('planAuditStatus4');
$('#aiDitStatusTotal').html("审核不通过");
$('#noPassReasonTotal').html(data[0].auditReason);
}
$('#auditUserNameTotal').html(data[0].auditUserNameTotal);
$('#auditTimeTotal').html(data[0].auditTimeTotal);
} else {

View File

@ -40,7 +40,7 @@ function init() {
var proName = d.proName;
var insMonth = d.insMonth;
var html =
`<input class="workContent layui-input" maxlength="500" value="${workContent}" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="workContent layui-input" maxlength="100" value="${workContent}" key="${id}" yjId="${yjId}" proName="${proName}" insMonth="${insMonth}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -76,7 +76,7 @@ function init() {
var id = d.id
var dutyUser = d.dutyUser
var html =
`<input class="liablePerson layui-input" value="${dutyUser}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="liablePerson layui-input" maxlength="100" value="${dutyUser}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -88,7 +88,7 @@ function init() {
var id = d.id
var supervisor = d.supervisor
var html =
`<input class="proctorPerson layui-input" value="${supervisor}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="proctorPerson layui-input" maxlength="100" value="${supervisor}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -100,7 +100,7 @@ function init() {
var id = d.id
var complete = d.complete
var html =
`<input class="standard layui-input" value="${complete}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="standard layui-input" maxlength="100" value="${complete}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
},
@ -112,7 +112,7 @@ function init() {
var id = d.id
var remarks = d.remarks
var html =
`<input class="remark layui-input" value="${remarks}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
`<input class="remark layui-input" maxlength="100" value="${remarks}" key="${id}" type="text" style="width: 150px;height: 25px;"/>`;
return html;
},
}
@ -127,41 +127,13 @@ function init() {
laydate.render({
elem: '.planStartTime',
done: function(value, date, time) {
// 将laydate的日期对象转换为原生Date对象
startDate = new Date(date.year, date.month - 1, date.date, date.hours, date
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间!');
}
}
}
});
laydate.render({
elem: '.planEndTime',
done: function(value, date, time) {
// 将laydate的日期对象转换为原生Date对象
endDate = new Date(date.year, date.month - 1, date.date, date.hours, date
.minutes, date.seconds);
// 确保结束时间不早于开始时间
if (startDate && endDate) {
if (endDate.getTime() < startDate.getTime()) {
// 清空结束时间
// 清除DOM元素的值
$(this.elem).val('');
// 重置endDate变量
endDate = null;
layer.msg('结束时间不能早于开始时间!');
}
}
}
});
},
@ -217,19 +189,31 @@ function saveMonthPlan() {
return;
}
if (planStartTime == "") {
layer.msg("请填写计划开始时间", {
layer.msg("请选择计划开始时间", {
icon: 0
});
$(planStartTimes[i]).focus();
return;
}
if (planEndTime == "") {
layer.msg("请填写计划结束时间", {
layer.msg("请选择计划结束时间", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
if(planStartTime !="" && planEndTime !=""){
if (planEndTime < planStartTime) {
layer.msg("结束时间不能早于开始时间!", {
icon: 0
});
$(planEndTimes[i]).focus();
return;
}
}
if (liablePerson == "") {
layer.msg("请填写责任人(护线员)", {
icon: 0

View File

@ -52,6 +52,7 @@ function resetClick(){
* 初始化数据
*/
function init(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
// 渲染表格
table.render({
id: 'layui_table',
@ -59,7 +60,7 @@ function init(){
url: PATH_URL + '/inspectionPlan/getLineProjectListPage',
where: {
insMonth:$('#insMonth').val(),
yjId:$(window.parent.document).find("input[id='taskSourceId']").attr("stationId")
yjId:yjId
},
page: true,
method:'post',
@ -92,7 +93,7 @@ function init(){
text = '已通过';
color = '#19BE6B';
}
if(status == '0'){
if(status == '0' || status == '4'){
text = '待审核';
color = '#FF9900';
}
@ -128,7 +129,7 @@ function init(){
html += `<button class="layui-btn layui-btn-sm" onclick="detailsView('${yjId}','${insMonth}')">详情</button>`
html += `<button class="layui-btn layui-btn-sm layui-btn-primary" onclick="exportDataDetails('${yjId}','${insMonth}')">导出</button>`
}
if(status == '0'){
if(status == '0' ){
//待审核
html += `<button class="layui-btn layui-btn-sm" onclick="detailsView('${yjId}','${insMonth}')">详情</button>`
html += `<button type="button" class="layui-btn layui-btn-sm layui-bg-orange" onclick="revokeView('${yjId}','${insMonth}')">撤销</button>`
@ -148,6 +149,11 @@ function init(){
html += `<button type="button" class="layui-btn layui-btn-sm layui-bg-red" onclick="delData('${yjId}','${insMonth}')">删除</button>`
html += `<button class="layui-btn layui-btn-sm layui-btn-primary" onclick="exportDataDetails('${yjId}','${insMonth}')">导出</button>`
}
if(status == '4'){
//待审核
html += `<button class="layui-btn layui-btn-sm" onclick="detailsView('${yjId}','${insMonth}')">详情</button>`
html += `<button class="layui-btn layui-btn-sm layui-btn-primary" onclick="exportDataDetails('${yjId}','${insMonth}')">导出</button>`
}
return html;
},

View File

@ -37,6 +37,7 @@ layui.use(['form','layer','table', 'laydate'], function () {
function queryClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
var yjName = $("#yjName").val();
var startWagesMonth = $("#wagesMonth").val().split('~')[0];
var endWagesMonth = $("#wagesMonth").val().split('~')[1];
@ -47,11 +48,13 @@ function queryClick(){
,where:{
yjName: yjName,
startWagesMonth: startWagesMonth,
endWagesMonth: endWagesMonth
endWagesMonth: endWagesMonth,
yjId: yjId
}
})
}
function resetClick(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
$("#yjName").val('');
$("#wagesMonth").val(times[0] + "-" + times[1]);
@ -62,7 +65,8 @@ function resetClick(){
,where: {
yjName: '',
startWagesMonth: '',
endWagesMonth: ''
endWagesMonth: '',
yjId: yjId
}
})
}
@ -71,12 +75,14 @@ function resetClick(){
* 初始化数据
*/
function init(){
var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
// 渲染表格
table.render({
id: 'layui_table',
elem: '#table',
url: PATH_URL + '/wages/getWagesEscalationList',
where: {
yjId: yjId
},
page: true, //开启分页
method:'post',

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
/*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long