diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js index 0565adac..642873bc 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js @@ -162,33 +162,33 @@ $(document).on('click', '#tableApprvBtn', function (){ const apprvAuth = $(this).attr("data-apprvauth") let affairRateFlag = true; $.each($(".apprvTd"), function (idx, el) { - if (apprvAuth === "APC003" || apprvAuth === "APC004") { - const chkbox = $(el).find(".apprvChkbox:checked") - if(chkbox.length>0){ + const chkbox = $(el).find(".apprvChkbox:checked") + if(chkbox.length>0){ + if (chkbox.val() === "DST003" || chkbox.val() === "DST004") { const affairRating = {}; affairRating["affairKey"] = Number($(el).find(".affairKey").val()); affairRating["sectionApprv"] = chkbox.val(); ratingList.push(affairRating); - } - } else { - const chkbox = $(el).find(".apprvChkbox:checked") - const selectorValue = $(el).find(".ratingSelector").val() - if(chkbox.length>0){ - const affairRating = {}; - affairRating["affairKey"] = Number($(el).find(".affairKey").val()); - affairRating["headApprv"] = chkbox.val(); - if(selectorValue !== ""){ - affairRating["affairRate"] = selectorValue; - affairRating["organUp"] = $(el).find(".organUpChkBox").prop("checked")?"T":"F"; - }else{ - if(chkbox.val()==="DST006"){ - //부장승인 & 평가 미입력. - affairRateFlag = false; + } else { + const selectorValue = $(el).find(".ratingSelector").val() + if(chkbox.length>0){ + const affairRating = {}; + affairRating["affairKey"] = Number($(el).find(".affairKey").val()); + affairRating["headApprv"] = chkbox.val(); + if(selectorValue !== ""){ + affairRating["affairRate"] = selectorValue; + affairRating["organUp"] = $(el).find(".organUpChkBox").prop("checked")?"T":"F"; + }else{ + if(chkbox.val()==="DST006"){ + //부장승인 & 평가 미입력. + affairRateFlag = false; + } } + ratingList.push(affairRating); } - ratingList.push(affairRating); } } + }) if(affairRateFlag){ affairStateChange(ratingList); diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 62378071..b59b5056 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -134,7 +134,7 @@
-
+