liux
/
nx_dx_one_manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加layui2.9.6 

承包商详情功能修改
This commit is contained in:
tqzhang 2024-02-20 16:11:51 +08:00
parent b756becd46
commit 17b2c57fcc
18 changed files with 643 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/nxdt/energy/manager/config/BnsSecurityConfig.java
View File

@ -60,7 +60,7 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests()
.antMatchers("/", "/gzRealName/**","/attendance/**","/*.html", "/favicon.ico", "/css/**", "/js/**", "/fonts/**", "/layui/**","/layui2.3.6/**","/layui2.7.6/**", "/layer-v3.1.0/**","/img/**",
"/v2/api-docs/**", "/swagger-resources/**", "/webjars/**", "/pages/**", "/druid/**",
"/v2/api-docs/**", "/swagger-resources/**", "/webjars/**", "/pages/**", "/druid/**","/layui-v2.9.6/**",
"/statics/**", "/templates/**","/download/**","/register/**","/companyManager/resetUserPwd","/companyManager/getMessageCode","/getCode/**","/users/backResetUserPwd","/fileUpload/**","/materialUpload/**")
.permitAll().anyRequest().authenticated();
http.formLogin().loginProcessingUrl("/login")

2
src/main/resources/mappers/cons/CheckManageMapper.xml
View File

@ -324,7 +324,7 @@
) r ON r.cons_id = ap.cons_id
LEFT JOIN sys_user ss ON ss.PHONE = r.audit_name_id
WHERE
ap.cons_id =#{params.auditProcess} and ap.is_active = '1'
ap.audit_id = #{params.auditProcessId} and ap.cons_id =#{params.auditProcess} and ap.is_active = '1'
GROUP BY
ap.id
ORDER BY

4
src/main/resources/mappers/material/MaterialUploadMapper.xml
View File

@ -520,7 +520,7 @@
count(1)
FROM
pm_history_audit
where 1=1
where 1=1 and audit_process = #{params.auditProcess}
<if test="params.projectId != null or params.projectId == ''">
AND project_id = #{params.projectId}
</if>
@ -548,7 +548,7 @@
LEFT JOIN bm_sub_pro_relation bspr ON bspr.cons_id = pha.cons_id
LEFT JOIN sys_user su ON su.id = pha.user_id
LEFT JOIN pm_organization po ON po.id = su.ORG_ID
where 1=1
where 1=1 and pha.audit_process = #{params.auditProcess}
<if test="params.projectId != null or params.projectId == ''">
AND pha.project_id = #{params.projectId}
</if>

7
src/main/resources/mappers/newSubApply/newConsMapper.xml
View File

@ -12,8 +12,8 @@
r.`name` AS proName,
cq.sub_status as subStatus,
IFNULL( cq.audit_process, '' ) AS auditProcess,
IFNULL( cq.cbs_apply_status, '10' ) AS consApplyStatus,
IFNULL( cq.start_work_status, '10' ) AS startWorkStatus,
IFNULL( apc1.audit_status, '10' ) AS consApplyStatus,
IFNULL( apc.audit_status, '10' ) AS startWorkStatus,
IFNULL( cq.contrator_name,bs.cons_name ) as consName,
cq.create_time AS createTime,
IFNULL(cq.audit_status,"") AS auditStatus,
@ -25,6 +25,9 @@
LEFT JOIN bm_sub_pro_relation bs ON bs.cons_id = cq.contrator_id and bs.pro_id = cq.project_id and bs.is_active = '1'
LEFT JOIN (select id,name from bm_project where is_active = '1') r on r.id = cq.project_id
left join sys_user su on su.contractor_id in (cq.contrator_id,cq.if_master)
left join audit_pross_child apc on apc.cons_id = cq.contrator_id and apc.is_active = '1' and apc.audit_type = '4'
left join audit_pross_child apc1 on apc1.cons_id = cq.contrator_id and apc1.is_active = '1' and apc1.audit_type
= '7'
WHERE
cq.is_active = '1'
<if test="type == '3' || type == 3 ">

2
src/main/resources/static/js/newWork/constrator/material/audithistoryShow.js
View File

@ -2,6 +2,7 @@ var proId = localStorage.getItem("proId");
var consId = localStorage.getItem("consId");
var consName = localStorage.getItem("consName");
var personType = localStorage.getItem("personType");
var auditProcess = localStorage.getItem("auditProcess");
var pers = checkPermission();
var example;
@ -35,6 +36,7 @@ function init() {
"data": function (d) {
d.projectId = proId;
d.consId = consId;
d.auditProcess = auditProcess;
},
"error": function (xhr, textStatus, errorThrown) {
var msg = xhr.responseText;

3
src/main/resources/static/js/work/audit/auditProcess.js
View File

@ -1,4 +1,4 @@
//var auditProcess = localStorage.getItem("auditProcess");
var auditProcessId = localStorage.getItem("auditProcess");
var auditProcess = localStorage.getItem("consId");
var auditStatus = localStorage.getItem("auditStatus");
var pers = checkPermission();
@ -39,6 +39,7 @@ function init() {
"data": function (d) {
d.auditProcess = auditProcess;
d.auditStatus = auditStatus;
d.auditProcessId = auditProcessId;
},
"error": function (xhr, textStatus, errorThrown) {
var msg = xhr.responseText;

8
src/main/resources/static/js/work/newSub/contractorModuleList.js
View File

@ -197,6 +197,14 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
//1.查询
subUpdate(consId,"2");
}else if (layEvent === "details") {
localStorage.setItem("application_consId", consId);
localStorage.setItem("application_proId", proId);
localStorage.setItem("application_proName", proName);
localStorage.setItem("application_consName", consName);
localStorage.setItem("application_startWorkStatus", startWorkStatus);
localStorage.setItem("application_consApplyStatus", consApplyStatus);
localStorage.setItem("application_ifMaster", ifMaster);
//查看审批流程
layerOpenView("查看审批流程",'./datumCheckDetails.html');
}
});

169
src/main/resources/static/js/work/newSub/datumChecDetails_new.js
View File

@ -1,8 +1,18 @@
layui.use(['table', 'form', 'laydate'], function () {
var consId = localStorage.getItem("application_consId");
var proId = localStorage.getItem("application_proId");
var proName = localStorage.getItem("application_proName");
var consName = localStorage.getItem("application_consName");
var startWorkStatus = localStorage.getItem("application_startWorkStatus");
var consApplyStatus = localStorage.getItem("application_consApplyStatus");
var ifMaster = localStorage.getItem("application_ifMaster");
layui.use(['table', 'form', 'laydate', 'dropdown' ,'util'], function () {
var dropdown = layui.dropdown;
let table = layui.table;
let form = layui.form;
let laydate = layui.laydate;
var util = layui.util;
//表格初始化
laydate.render({
elem: '#laydate-range' //开始时间和结束时间所在 input 框的父选择器
@ -10,6 +20,48 @@ layui.use(['table', 'form', 'laydate'], function () {
, range: ['#startDate', '#endDate'] //数组格式为 layui 2.6.6 开始新增
});
if (ifMaster === "分包"){
$("#subContractor").css("display","block");
$("#subContractor").css("display","block");
}
if (consApplyStatus === "2"){
$("#addDic").css("display","none");
}
// 菜单点击事件
dropdown.on('click(demoMenu)', function(options){
if (options.title === '开工申请') {
openFrameTwo('开工申请', './startWorkApplication.html',"", consId, proId, startWorkStatus, proName, consName);
}else{
if(startWorkStatus === "2"){
//根据 title 做出不同操作
if (options.title === '增加人员') {
openFrame('增加人员', './personAdd.html', consId, proId, proName, consName);
} else if (options.title === '增加设备') {
openFrame('增加设备', './addEquipmentForm.html', consId, proId, proName, consName);
} else if (options.title === '分包入场') {
openFrame('分包入场', './subAdmissionApplication.html', consId, proId, proName, consName);
} else if (options.title === '人员出场') {
openFrame('人员出场', './personExitSet.html', consId, proId, proName, consName);
} else if (options.title === '承包商出场') {
openFrameTwo('承包商出场', 'cbsAppearApply.html',ifMaster, consId, proId, consApplyStatus, proName, consName);
}else if (options.title === '人员出场延期申请'){
openFrame('人员出场延期申请', './deferExitApply.html', consId, proId, proName, consName);
}
}else if (startWorkStatus === "10"){
layer.alert("未提交开工申请，不能进行操作");
}else if (startWorkStatus === "1"){
layer.alert("开工申请未审核通过，不能进行操作");
}else if (startWorkStatus === "0"){
layer.alert("开工申请审核中，不能进行操作");
}else if (startWorkStatus === "5"){
layer.alert("开工申请已撤回，不能进行操作");
}
}
});
//表格初始化
table.render({
elem: '#lay-table' //表格id
@ -191,6 +243,8 @@ function check(data) {
//查看审核流程
function view(data) {
localStorage.setItem("consId", data.contractorId);
localStorage.setItem("auditProcess", data.auditProcess);
let height = '90%';
let width = '80%';
var index = layer.open({
@ -216,24 +270,11 @@ function view(data) {
//查看审核的具体数据
function viewFlow(data) {
localStorage.setItem("proId",data.projectId);
localStorage.setItem("auditProcess",data.auditProcess);
localStorage.setItem("consId",data.contractorId);
localStorage.setItem("consName",data.contractorName);
layui.data('checkData', {
key: 'data',
value: {
'contractorId': data.contractorId,
'contractorName': data.contractorName ,
'proId': data.projectId,
'processType': data.processType,
'auditProcess': data.auditProcess,
'jumpPage': '5',
'isView': '1',
'jumpType': data.jumpType,
'isManger': data.isManger
}
});
let page = 'datumCheckView5.html';
let page = '../../newWork/constrator/material/audithistoryShow.html';
let height = '98%';
let width = '98%';
var index = layer.open({
@ -254,3 +295,99 @@ function viewFlow(data) {
}
function openFrame(title, contentUrl, consId, proId, proName, consName) {
localStorage.setItem("consId", consId);
localStorage.setItem("proId", proId);
if (proName === "null" || proName == null) {
proName = "";
}
if (consName === "null" || consName == null) {
consName = "";
}
localStorage.setItem("proName", proName);
localStorage.setItem("consName", consName);
layerOpenForm(title,contentUrl,"");
}
function layerOpenForm(title,contentUrl){
var index = layer.open({
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
area: ['98%', '98%'],
maxmin: false,
btn: ['确定', '关闭'],
success: function (layero, index) {
},
yes: function (index, layero) {
//提交子页面时执行
// 获取弹出层中的form表单元素
var formSubmit = layer.getChildFrame('form', index);
// 查找class样式为submitBtn的按钮
let submited = formSubmit.find('button.subBtn');
// 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息
submited.click();
}
});
}
/**
* 开工申请,承包商出场打开页面
* @param title
* @param contentUrl
* @param ifMaster
* @param consId
* @param proId
* @param auditStatus
* @param proName
* @param consName
* @returns {*}
*/
function openFrameTwo(title, contentUrl,ifMaster, consId, proId, auditStatus, proName, consName) {
localStorage.setItem("consId", consId);
localStorage.setItem("proId", proId);
localStorage.setItem("proName", proName);
localStorage.setItem("consName", consName);
localStorage.setItem("auditStatus", auditStatus);
//------------------------------------------------------------------
//总包出场之前判断分包是否全部出场
var code = "success";
if ("总包" == ifMaster){
$.ajax({
type: 'POST',
async: false, // 默认异步true,false表示同步
url: ctxPath + '/consRelation/isAllSubOut',// 请求地址
dataType: 'text', // 服务器返回数据类型
data: {'consId': consId}, //获取提交的表单字段
success: function (data) {
code = data;
}
});
}
if ("success" != code){
var code1 = code;
code = "success";
return layer.alert(code1 + "分包未出场，总包不能出场");
}
//----------------------------------------------------------------------
if (auditStatus != "2") {
if(auditStatus == "1" || auditStatus == "10"){
layerOpenForm(title,contentUrl);
}else {
layerOpenView(title,contentUrl);
}
} else {
layerOpenView(title,contentUrl);
}
}
function layerOpenView(title,contentUrl){
var index = layer.open({
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
area: ['98%', '98%'],
maxmin: false,
btn: ['关闭'],
});
}

1
src/main/resources/static/js/work/newSub/startWorkApplication.js
View File

@ -390,6 +390,7 @@ function checkBasesave() {
var resMsg = data.resMsg;
if (resMsg == "发起成功") {
layer.msg('开工申请发起成功', {icon: 1, time: 2000});
localStorage.setItem("application_startWorkStatus", "0");
window.parent.location.reload();
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭

1
src/main/resources/static/layui-v2.9.6/css/layui.css Normal file
View File

File diff suppressed because one or more lines are too long

BIN
src/main/resources/static/layui-v2.9.6/font/iconfont.eot Normal file
View File

Binary file not shown.

405
src/main/resources/static/layui-v2.9.6/font/iconfont.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 322 KiB

BIN
src/main/resources/static/layui-v2.9.6/font/iconfont.ttf Normal file
View File

Binary file not shown.

BIN
src/main/resources/static/layui-v2.9.6/font/iconfont.woff Normal file
View File

Binary file not shown.

BIN
src/main/resources/static/layui-v2.9.6/font/iconfont.woff2 Normal file
View File

Binary file not shown.

1
src/main/resources/static/layui-v2.9.6/layui.js Normal file
View File

File diff suppressed because one or more lines are too long

37
src/main/resources/static/pages/work/newSubApply/contractorModuleList.html
View File

@ -55,10 +55,11 @@
<script type="text/javascript" src="../../../js/select.js"></script>
<script type="text/javascript" src="../../../js/work/newSub/contractorModuleList.js" defer="defer"></script>
<script type="text/html" id="toolsBar">
<a lay-event="details" style="color: #009688;cursor: pointer;font-size: 16px">详情</a>
{{# if(d.auditStatus !== null && d.auditStatus !== 'null' && d.auditStatus !== ''){ }}
<a lay-event="approvalProcess" style="color: #009688;cursor: pointer;font-size: 16px">流程</a>
{{# } }}
<!-- {{# if(d.auditStatus !== null && d.auditStatus !== 'null' && d.auditStatus !== ''){ }}-->
<!-- <a lay-event="approvalProcess" style="color: #009688;cursor: pointer;font-size: 16px">流程</a>-->
<!-- {{# } }}-->
<!-- <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
<!-- 条件待确认-->
{{# if((d.auditStatus === null || d.auditStatus === 'null' || d.auditStatus === '') && (d.proName !== null && d.proName !== 'null' && d.proName !== '')){ }}
@ -68,18 +69,18 @@
<span> | </span>
<a lay-event="update" style="color: #009688;cursor: pointer;font-size: 16px">分包修改</a>
{{# } }}
{{# if((d.proName === null || d.proName === 'null' || d.proName === '') && (d.subStatus !== '2')){ }}
<span> | </span>
<a lay-event="view_sub" style="color: #009688;cursor: pointer;font-size: 16px">查看</a>
{{# } }}
<!-- {{# if((d.proName === null || d.proName === 'null' || d.proName === '') && (d.subStatus !== '2')){ }}-->
<!-- <span> | </span>-->
<!-- <a lay-event="view_sub" style="color: #009688;cursor: pointer;font-size: 16px">查看</a>-->
<!-- {{# } }}-->
{{# if(d.auditStatus === '5' || d.auditStatus === '1'){ }}
<span> | </span>
<a lay-event="edit" style="color: #009688;cursor: pointer;font-size: 16px">修改</a>
{{# } }}
{{# if(d.auditStatus === '0' || d.auditStatus === '2' || d.auditStatus === '3' || d.auditStatus === '4'){ }}
<span> | </span>
<a lay-event="edit" style="color: #009688;cursor: pointer;font-size: 16px">查看</a>
{{# } }}
<!-- {{# if(d.auditStatus === '0' || d.auditStatus === '2' || d.auditStatus === '3' || d.auditStatus === '4'){ }}-->
<!-- <span> | </span>-->
<!-- <a lay-event="edit" style="color: #009688;cursor: pointer;font-size: 16px">查看</a>-->
<!-- {{# } }}-->
<!-- <a class="layui-btn layui-btn-xs" lay-event="recall">撤回</a>-->
{{# if(d.auditStatus != '' && d.auditStatus != '2' && d.auditStatus != '5' && d.auditStatus != '3'){ }}
<span> | </span>
@ -89,14 +90,12 @@
<span> | </span>
<a lay-event="tempStorage" style="color: #009688;cursor: pointer;font-size: 16px">编辑</a>
{{# } }}
{{# if(d.auditStatus == '2' && d.consApplyStatus != '2'){ }}
<span> | </span>
<a lay-event="more" style="color: #009688;cursor: pointer;font-size: 16px">更多</a>
{{# } }}
<span> | </span>
<a lay-event="approvalHistory" style="color: #009688;cursor: pointer;font-size: 16px">记录</a>
<span> | </span>
<a lay-event="details" style="color: #009688;cursor: pointer;font-size: 16px">详情</a>
<!-- {{# if(d.auditStatus == '2' && d.consApplyStatus != '2'){ }}-->
<!-- <span> | </span>-->
<!-- <a lay-event="more" style="color: #009688;cursor: pointer;font-size: 16px">更多</a>-->
<!-- {{# } }}-->
<!-- <span> | </span>-->
<!-- <a lay-event="approvalHistory" style="color: #009688;cursor: pointer;font-size: 16px">记录</a>-->
</script>
<script type="text/html" id="toolbar">
<div class="layui-form-item">

49
src/main/resources/static/pages/work/newSubApply/datumCheckDetails.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
<link rel="stylesheet" type="text/css" media="screen" href="../../../layui2.7.6/css/layui.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../../layui-v2.9.6/css/layui.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../../layui2.7.6/css/layui-table-own.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/publicStyles.css">
<style type="text/css">
@ -26,6 +26,16 @@
.layui-table-view {
margin: 4px 0!important;
}
.layui-menu-body-title>.layui-icon {
position: absolute;
right: 15px;
top: 50%;
margin-top: -10px !important;
line-height: normal;
font-size: 14px;
transition: all .2s;
-webkit-transition: all .2s;
}
</style>
</head>
<body>
@ -75,11 +85,38 @@
</button>
<div class="layui-inline" id="addDic" style="float: right;margin-right: 10%">
<div class="layui-inline" id="addDic" style="margin-left: 1%;">
<div class="layui-input-inline" >
<button id="addButton" class="layui-btn layui-btn-sm">
新增申请
</button>
<ul class="layui-menu" id="demoMenu">
<li class="layui-menu-item-parent" lay-options="{type: 'parent'}" style="border: 1px solid #c7c2c2; border-radius: 2px;">
<div class="layui-menu-body-title">
新增申请
<i class="layui-icon layui-icon-right"></i>
</div>
<div class="layui-panel layui-menu-body-panel">
<ul id="generalPackage_ul">
<li><div class="layui-menu-body-title">增加人员</div></li>
<li><div class="layui-menu-body-title">增加设备</div></li>
<li><div class="layui-menu-body-title">开工申请</div></li>
<li><div class="layui-menu-body-title">分包入场</div></li>
<li><div class="layui-menu-body-title">人员出场</div></li>
<li><div class="layui-menu-body-title">承包商出场</div></li>
<li><div class="layui-menu-body-title">人员出场延期申请</div></li>
</ul>
<ul id="subcontract_ul" style="display: none">
<li><div class="layui-menu-body-title">增加人员</div></li>
<li><div class="layui-menu-body-title">增加设备</div></li>
<li><div class="layui-menu-body-title">开工申请</div></li>
<li><div class="layui-menu-body-title">人员出场</div></li>
<li><div class="layui-menu-body-title">承包商出场</div></li>
<li><div class="layui-menu-body-title">人员出场延期申请</div></li>
</ul>
</div>
</li>
</ul>
<!-- <button id="addButton" class="layui-btn layui-btn-sm">-->
<!-- 新增申请-->
<!-- </button>-->
</div>
</div>
@ -102,7 +139,7 @@
<script type="text/javascript" src="../../../js/libs/jquery-3.6.0.js"></script>
<script type="text/javascript" src="../../../js/jq.js"></script>
<script type="text/javascript" src="../../../layui2.7.6/layui.js"></script>
<script type="text/javascript" src="../../../layui-v2.9.6/layui.js"></script>
<script type="text/javascript" src="../../../js/publicJs.js"></script>
<script type="text/javascript" src="../../../js/dict.js"></script>
<script type="text/javascript" src="../../../js/select.js"></script>