결제라인 수정 및 직접비(접대비) 관련 수정

This commit is contained in:
2026-01-26 14:17:53 +09:00
parent 923297bc2a
commit dcb647e0b9
5 changed files with 60 additions and 23 deletions

View File

@@ -208,7 +208,10 @@ eddate = iif(conweek <> "1", Dateadd("d", 6, cdate(selweekRange(0))), cdate(selw
weekQuery = weekQuery & " , ROW_NUMBER() OVER(ORDER BY yearnum, weeknum) AS monthnum "
weekQuery = weekQuery & " , sdate, edate,sdate+'~'+edate AS rangedate "
weekQuery = weekQuery & " FROM project2.dbo.login_weeknum with(nolock) "
weekQuery = weekQuery & " WHERE LEFT(sdate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' OR LEFT(edate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' "
weekQuery = weekQuery & " WHERE (LEFT(sdate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' OR LEFT(edate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "') "
If RIGHT("0" & conmonth, 2) = "12" Then
weekQuery = weekQuery & " and weeknum <> 1 "
End if
weekQuery = weekQuery & " ORDER BY yearnum, weeknum "
'response.write weekQuery
@@ -1801,8 +1804,8 @@ eddate = iif(conweek <> "1", Dateadd("d", 6, cdate(selweekRange(0))), cdate(selw
var option = $("<option value='"+ obj.weeknum +"' >"+ obj.monthnum +"<22><><EFBFBD><EFBFBD>("+ obj.rangedate +")</option>");
}
} else if($('#conyear').val() == 2025 && $('#conmonth').val() == 1){
if(obj.weeknum != 53){
} else if($('#conmonth').val() == 1){
if(obj.weeknum < 50 ){
var option = $("<option value='"+ obj.weeknum +"' >"+ obj.monthnum +"<22><><EFBFBD><EFBFBD>("+ obj.rangedate +")</option>");
}
} else {