<기능개선>
1. PMS NO : 5827,5791,5789,5828,5851,5820 2. (주요)작업내용 # 추가 개발건 일괄 중 누락건 커밋
This commit is contained in:
jity7777
parent
5bb54b5371
commit
99904ac1d3
|
|
@ -5,10 +5,10 @@
|
|||
<div>
|
||||
<div>
|
||||
<ul>
|
||||
<li id="liman1"><a href="javascript: schIpt('2', '25', '설계시공기술인'); ">설계시공기술인</a></li>
|
||||
<li id="liman4"><a href="javascript: schIpt('2', '28', '건설사업관리기술인'); ">건설사업관리기술인</a></li>
|
||||
<li id="liman2"><a href="javascript: schIpt('2', '26', '품질관리기술인'); ">품질관리기술인</a></li>
|
||||
<li id="liman3"><a href="javascript: schIpt('2', '27', '발주청기술인'); ">발주청기술인</a></li>
|
||||
<li id="liman01"><a href="javascript: schIpt('2', '25', '설계시공기술인'); ">설계시공기술인</a></li>
|
||||
<li id="liman04"><a href="javascript: schIpt('2', '28', '건설사업관리기술인'); ">건설사업관리기술인</a></li>
|
||||
<li id="liman02"><a href="javascript: schIpt('2', '26', '품질관리기술인'); ">품질관리기술인</a></li>
|
||||
<li id="liman03"><a href="javascript: schIpt('2', '27', '발주청기술인'); ">발주청기술인</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -21,13 +21,13 @@
|
|||
<div>
|
||||
<div>
|
||||
<ul>
|
||||
<li id="liedu1"><a href="javascript: schIpt('3', '29', '기본교육'); ">기본교육</a></li>
|
||||
<li id="liedu2"><a href="javascript: schIpt('3', '30', '최초교육'); ">최초교육</a></li>
|
||||
<li id="liedu7"><a href="javascript: schIpt('3', '35', '승급교육'); ">승급교육</a></li>
|
||||
<li id="liedu3"><a href="javascript: schIpt('3', '31', '계속교육'); ">계속교육</a></li>
|
||||
<li id="liedu4"><a href="javascript: schIpt('3', '32', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li>
|
||||
<li id="liedu5"><a href="javascript: schIpt('3', '33', 'PQ가점교육'); ">PQ가점교육</a></li>
|
||||
<li id="liedu6"><a href="javascript: schIpt('3', '34', '기타교육'); ">기타교육</a></li>
|
||||
<li id="liedu01"><a href="javascript: schIpt('3', '29', '기본교육'); ">기본교육</a></li>
|
||||
<li id="liedu02"><a href="javascript: schIpt('3', '30', '최초교육'); ">최초교육</a></li>
|
||||
<li id="liedu07"><a href="javascript: schIpt('3', '35', '승급교육'); ">승급교육</a></li>
|
||||
<li id="liedu03"><a href="javascript: schIpt('3', '31', '계속교육'); ">계속교육</a></li>
|
||||
<li id="liedu04"><a href="javascript: schIpt('3', '32', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li>
|
||||
<li id="liedu05"><a href="javascript: schIpt('3', '33', 'PQ가점교육'); ">PQ가점교육</a></li>
|
||||
<li id="liedu06"><a href="javascript: schIpt('3', '34', '기타교육'); ">기타교육</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
<div>
|
||||
<div>
|
||||
<ul>
|
||||
<li id="ligrade1"><a href="javascript: schIpt('4', '36', '초급'); ">초급</a></li>
|
||||
<li id="ligrade2"><a href="javascript: schIpt('4', '37', '중급'); ">중급</a></li>
|
||||
<li id="ligrade3"><a href="javascript: schIpt('4', '38', '고급'); ">고급</a></li>
|
||||
<li id="ligrade4"><a href="javascript: schIpt('4', '39', '특급'); ">특급</a></li>
|
||||
<li id="ligrade01"><a href="javascript: schIpt('4', '36', '초급'); ">초급</a></li>
|
||||
<li id="ligrade02"><a href="javascript: schIpt('4', '37', '중급'); ">중급</a></li>
|
||||
<li id="ligrade03"><a href="javascript: schIpt('4', '38', '고급'); ">고급</a></li>
|
||||
<li id="ligrade04"><a href="javascript: schIpt('4', '39', '특급'); ">특급</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ namespace NP.BO.Controllers
|
|||
{
|
||||
vm.BMOs = Dao.Get<BoardMasterOpening>("board.bmos", GetInt(vm.stringval2));
|
||||
}
|
||||
ht.Add("bmno", "21");
|
||||
ht.Add("bmno", "13");
|
||||
//ht.Add("opno", vm.stringval3);
|
||||
//ht.Add("scc", vm.stringval4);
|
||||
vm.Boards = Dao.Get<Board>("board.bs", ht);
|
||||
|
|
|
|||
|
|
@ -1974,7 +1974,7 @@
|
|||
inner join cg t3 on t2.cgno= t3.cgno
|
||||
inner join pay t4 on t1.payno = t4.payno
|
||||
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
|
||||
where t1.status = 1 and t4.pstatus= 1 and t5.typeman = 28
|
||||
where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t5.typeman = 28
|
||||
<isNotNull property="userno">and t1.userno = #userno#</isNotNull>
|
||||
<isNotEmpty property="edu">
|
||||
<isNotEqual property="edu" compareValue="30">and t5.typegrade in (38,39)</isNotEqual>
|
||||
|
|
@ -1992,7 +1992,7 @@
|
|||
inner join cg t3 on t2.cgno= t3.cgno
|
||||
inner join pay t4 on t1.payno = t4.payno
|
||||
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
|
||||
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
|
||||
where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
|
||||
and t1.userno = #userno# and t5.typeman = 28
|
||||
</select>
|
||||
|
||||
|
|
@ -2003,7 +2003,7 @@
|
|||
inner join cg t3 on t2.cgno= t3.cgno
|
||||
inner join pay t4 on t1.payno = t4.payno
|
||||
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
|
||||
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104) and t5.typeedu = 30
|
||||
where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104) and t5.typeedu = 30
|
||||
and t1.userno = #userno# and t5.typeman = 28
|
||||
</select>
|
||||
</statements>
|
||||
|
|
|
|||
|
|
@ -361,6 +361,105 @@
|
|||
}
|
||||
});
|
||||
function schIpt(num, code, name) {
|
||||
|
||||
$('#sch' + num).val(code);
|
||||
$('#msSel' + num + '>span').text(name);
|
||||
$('.msSel > div').slideUp(300);
|
||||
$('.msSel > span').removeClass('on');
|
||||
$('#msSel' + (Number(num) + 1)).removeClass('disable');
|
||||
$('#msSel' + (Number(num) + 1)).addClass('active');
|
||||
|
||||
let tempCnt = 0;
|
||||
$('#msSel' + (Number(num) + 1) + ' div ul li').each(function () {
|
||||
if ($(this).css("display") != 'none') {
|
||||
++tempCnt;
|
||||
}
|
||||
})
|
||||
|
||||
if (tempCnt > 0) {
|
||||
$('#msSel' + (Number(num) + 1)).removeClass("disable")
|
||||
$('#msSel' + (Number(num) + 1) + ' > div').slideDown(300);
|
||||
}
|
||||
else {
|
||||
$('#msSel' + (Number(num) + 1)).addClass("disable")
|
||||
}
|
||||
|
||||
$("[id^='liman']").show()
|
||||
$("[id^='liedu']").show()
|
||||
$("[id^='ligrade']").show()
|
||||
$("[id^='lijob']").show()
|
||||
$("[id^='lijob']").show()
|
||||
|
||||
$("#liedu04").hide()
|
||||
$("#liedu4").hide()
|
||||
|
||||
$("#lijob57").hide()
|
||||
if ($("#msSel2 > span").text() == "설계시공기술인") {
|
||||
|
||||
$("#liedu4").hide()
|
||||
if ($("#msSel3 > span").text() == "승급교육") {
|
||||
$("#ligrade01").hide()
|
||||
|
||||
$("#ligrade1").hide()
|
||||
}
|
||||
else if ($("#msSel3 > span").text() == "계속교육") {
|
||||
$("#ligrade01").hide()
|
||||
$("#ligrade02").hide()
|
||||
$("#ligrade03").hide()
|
||||
|
||||
$("#ligrade1").hide()
|
||||
$("#ligrade2").hide()
|
||||
$("#ligrade3").hide()
|
||||
}
|
||||
}
|
||||
else if ($("#msSel2 > span").text() == "건설사업관리기술인") {
|
||||
$("#liedu04").show()
|
||||
|
||||
$("#liedu4").show()
|
||||
if ($("#msSel3 > span").text() == "승급교육") {
|
||||
$("#ligrade01").hide()
|
||||
|
||||
$("#ligrade1").hide()
|
||||
}
|
||||
}
|
||||
else if ($("#msSel2 > span").text() == "품질관리기술인") {
|
||||
$("#liedu04").hide();
|
||||
|
||||
$("#liedu4").hide();
|
||||
|
||||
$("[name='typejob']").hide()
|
||||
$("#lijob57").show()
|
||||
|
||||
if ($("#msSel3 > span").text() == "승급교육") {
|
||||
$("#ligrade01").hide()
|
||||
|
||||
$("#ligrade1").hide()
|
||||
}
|
||||
}
|
||||
else if ($("#msSel2 > span").text() == "발주청기술인") {
|
||||
$("#liedu07").hide()
|
||||
$("#liedu03").hide()
|
||||
$("#liedu04").hide()
|
||||
$("#liedu05").hide()
|
||||
$("#liedu06").hide()
|
||||
|
||||
$("#liedu7").hide()
|
||||
$("#liedu3").hide()
|
||||
$("#liedu4").hide()
|
||||
$("#liedu5").hide()
|
||||
$("#liedu6").hide()
|
||||
}
|
||||
|
||||
if (num == 5) {
|
||||
$("#msSel6 > div > div > ul > li").hide();
|
||||
|
||||
$("[id='lijob" + code + "']").each(function () {
|
||||
$(this).show();
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function schIpt2(num, code, name) {
|
||||
let tempStr = "";
|
||||
switch (num) {
|
||||
case '1':
|
||||
|
|
@ -420,29 +519,63 @@
|
|||
$("#msSel5 li").show();
|
||||
}
|
||||
if (num == 2 && name == "발주청기술인") {
|
||||
$("#liedu03").hide();
|
||||
$("#liedu04").hide();
|
||||
$("#liedu05").hide();
|
||||
$("#liedu06").hide();
|
||||
$("#liedu07").hide();
|
||||
|
||||
$("#liedu7").hide();
|
||||
$("#liedu3").hide();
|
||||
$("#liedu4").hide();
|
||||
$("#liedu5").hide();
|
||||
$("#liedu6").hide();
|
||||
|
||||
$("#ligrade2").hide();
|
||||
$("#ligrade3").hide();
|
||||
$("#ligrade4").hide();
|
||||
|
||||
//$("#liedu03").hide();
|
||||
//$("#liedu04").hide();
|
||||
//$("#liedu05").hide();
|
||||
//$("#liedu06").hide();
|
||||
//$("#liedu07").hide();
|
||||
}
|
||||
else if (num == 2 && name != "발주청기술인") {
|
||||
else {
|
||||
$("#liedu2").show();
|
||||
$("#liedu7").show();
|
||||
$("#liedu3").show();
|
||||
$("#liedu4").show();
|
||||
$("#liedu5").show();
|
||||
$("#liedu6").show();
|
||||
|
||||
$("#ligrade2").show();
|
||||
$("#ligrade3").show();
|
||||
$("#ligrade4").show();
|
||||
|
||||
$("#liedu01").show();
|
||||
$("#liedu03").show();
|
||||
$("#liedu05").show();
|
||||
$("#liedu06").show();
|
||||
$("#liedu07").show();
|
||||
}
|
||||
if (num == 2 && name == "설계시공기술인") {
|
||||
$("#liedu4").hide();
|
||||
|
||||
$("#liedu2").show();
|
||||
$("#liedu7").show();
|
||||
$("#liedu3").show();
|
||||
$("#liedu4").hide();
|
||||
$("#liedu5").show();
|
||||
$("#liedu6").show();
|
||||
|
||||
$("#ligrade2").show();
|
||||
$("#ligrade3").show();
|
||||
$("#ligrade4").show();
|
||||
}
|
||||
|
||||
if (num == 2 && name == "건설사업관리기술인") {
|
||||
$("#liedu04").show();
|
||||
$("#liedu4").show();
|
||||
}
|
||||
if (num == 2 && name == "품질관리기술인") {
|
||||
/*$("#msSel5 li a").each(function (i, d) {
|
||||
if (d.text != "품질관리") {
|
||||
//var item = d.closest("li").id;
|
||||
$("#lijob" + code).hide();
|
||||
}
|
||||
});*/
|
||||
|
||||
$("#liedu4").hide();
|
||||
$("#msSel5 li").each(function () {
|
||||
$(this).hide();
|
||||
});
|
||||
|
|
@ -457,6 +590,10 @@
|
|||
if (num == 3) {
|
||||
$("#msSel4 li").show();
|
||||
}
|
||||
|
||||
if (num == 3 && name == "최초교육") {
|
||||
$("#ligrade1").hide()
|
||||
}
|
||||
if (num == 3 && name == "승급교육") {
|
||||
$('#msSel4 > span').text("승급가능등급");
|
||||
$("#ligrade01").hide();
|
||||
|
|
|
|||
Loading…
Reference in New Issue