';
@@ -342,8 +342,7 @@
$("#sumTable > tbody > tr > td:eq("+ idxArr[obj.cost_type] +")").html(commify(obj.cost));
});
}
-
- function openit(z, x, y){
+ function openit(z, x, y, subject){
var tmp_height = 960;
var tmp_width = 850;
if (z == 'i'){
@@ -355,6 +354,12 @@
}else if (z == 'r'){
var title_type = "자금";
var url = '/ess/doc_expense2_print.asp?rev_type=' + y + '&d_no=' + x + '&view_chk=1&x=1&title_type=' + title_type;
+ }else if (z == 't'){
+ if(subject == "면접원수당지출결의서"){
+ var url = '/ess/doc_myun_pay_print2.asp?rev_type=' + y + '&d_no=' + x + '&view_chk=1&x=1';
+ }else{
+ var url = '/ess/doc_myun_pay_print.asp?rev_type=' + y + '&d_no=' + x + '&view_chk=1&x=1';
+ }
}
window.open(url, '', 'left=0,top=0,width=' + tmp_width + ',height=' + tmp_height + ',scrollbars=yes,resizable=yes')
}
diff --git a/approval/doc_confirm_ajax.asp b/approval/doc_confirm_ajax.asp
index dfe8dfb..f6e9668 100644
--- a/approval/doc_confirm_ajax.asp
+++ b/approval/doc_confirm_ajax.asp
@@ -20,15 +20,17 @@ Select Case Request("command")
SQL = ""
SQL = SQL & " SELECT A.d_no,A.p_child_sn,A.p_subject,A.client,A.depart_name,A.cost_type,A.hangmok,A.sebu,A.cost,A.d_write_name,A.cost_date,A.payment_date FROM( " &VBCRLF
- SQL = SQL & " SELECT M.id, 문서번호 as d_no, CONVERT(varchar, M.target10) AS p_child_sn, " &VBCRLF
+ SQL = SQL & " SELECT M.id, 문서번호 as d_no, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '' ELSE CONVERT(varchar, M.target10) END AS p_child_sn, " &VBCRLF
SQL = SQL & "CASE " &VBCRLF
SQL = SQL & " WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 'r' " &VBCRLF
SQL = SQL & " THEN '자금집행서' " &VBCRLF
+ SQL = SQL & " WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' " &VBCRLF
+ SQL = SQL & " THEN 문서제목 " &VBCRLF
SQL = SQL & " ELSE ISNULL(TPM.p_subject, '지출결의서') " &VBCRLF
SQL = SQL & "END AS p_subject, " &VBCRLF
- SQL = SQL & " dbo.FN_RemoveExtraSpaces(RTRIM(CONVERT(NVARCHAR(MAX), target8))) AS client, " &VBCRLF
- SQL = SQL & " ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '-' ELSE '키위서베이' END) AS depart_name, " &VBCRLF
- SQL = SQL & " target4 AS cost_type, DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, target5 AS cost, d_write_name, target3 as cost_date, remark19 as payment_date,remark1,remark2 " &VBCRLF
+ SQL = SQL & " CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '-' ELSE dbo.FN_RemoveExtraSpaces(RTRIM(CONVERT(NVARCHAR(MAX), target8))) END AS client, " &VBCRLF
+ SQL = SQL & " CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN PARSENAME(REPLACE(CONVERT(NVARCHAR(MAX), target97), '^^', '.'), 1) ELSE ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '-' ELSE '키위서베이' END) END AS depart_name, " &VBCRLF
+ SQL = SQL & " target4 AS cost_type, DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN ISNULL((SELECT SUM(CAST(REPLACE(SUBSTRING(v.value, CHARINDEX('^^', v.value) + 2, 4000), ',', '') AS money)) FROM STRING_SPLIT(REPLACE(CONVERT(NVARCHAR(MAX), M.target15), '^//^', CHAR(1)), CHAR(1)) v WHERE CHARINDEX('^^', v.value) > 0), 0) ELSE CAST(CONVERT(NVARCHAR(MAX), target5) AS money) END AS cost, d_write_name, target3 as cost_date, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '-' ELSE CONVERT(NVARCHAR(MAX), remark19) END AS payment_date,remark1,remark2 " &VBCRLF
SQL = SQL & " FROM 문서내용 M WITH(nolock) LEFT JOIN Document D WITH(nolock) ON M.문서번호 = D.d_no " &VBCRLF
SQL = SQL & " LEFT JOIN T_PROJECT_METHOD TPM WITH(nolock) ON CONVERT(varchar, M.target10) = TPM.p_child_sn " &VBCRLF
SQL = SQL & " LEFT JOIN T_PROJECT_BASE TPB WITH(nolock) ON TPM.p_sn = TPB.p_sn LEFT JOIN " &VBCRLF
@@ -44,20 +46,20 @@ Select Case Request("command")
SQL = SQL & " ) DFI ON CASE WHEN TPM.p_field_dept IN ('12', '9', '8') THEN '12' ELSE TPM.p_field_dept END = DFI.depart_code " &VBCRLF
SQL = SQL & " LEFT JOIN direct_costcode DC1 WITH(nolock) ON CONVERT(varchar, target11) = CONVERT(varchar, DC1.id) " &VBCRLF
SQL = SQL & " LEFT JOIN direct_costcode DC2 WITH(nolock) ON CONVERT(varchar, target12) = CONVERT(varchar, DC2.id) " &VBCRLF
- SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서' ) " &VBCRLF
+ SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서' ) " &VBCRLF
'SQL = SQL & " AND target3 LIKE '"& Request("smonth") &"%' "
SQL = SQL & " AND ISDATE(CONVERT(varchar(30),target3)) = 1 "
SQL = SQL & " AND CONVERT(DATE,CONVERT(varchar(30),target3)) > DATEADD(DD,-1,CONVERT(DATE,'"&SMONTH&"-01')) " &VBCRLF
SQL = SQL & " AND CONVERT(DATE,CONVERT(varchar(30),target3)) < "&EMONTH&" " &VBCRLF
SQL = SQL & " AND del_yes_no = 'no' " &VBCRLF
If Request("step") = "1" Then
- SQL = SQL & " AND ((문서제목='지출결의서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') = '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') = '')) "
ElseIf Request("step") = "2" Then
- SQL = SQL & " AND ((문서제목='지출결의서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') <> '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') <> '')) "
ElseIf Request("step") = "3" Then
- SQL = SQL & " AND ((문서제목='지출결의서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') = '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') = '')) "
ElseIf Request("step") = "4" Then
- SQL = SQL & " AND ((문서제목='지출결의서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') <> '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') <> '')) "
End If
SQL = SQL & " AND d_delok = 'N' AND D.d_order_cnt = 77 "
SQL = SQL & " ) A WHERE 1 = 1 "
@@ -95,14 +97,16 @@ Select Case Request("command")
Case "finalList"
SQL = ""
- SQL = SQL & " SELECT 문서번호 as d_no, CONVERT(varchar, M.target10) AS p_child_sn, "
+ SQL = SQL & " SELECT 문서번호 as d_no, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '' ELSE CONVERT(varchar, M.target10) END AS p_child_sn, "
SQL = SQL & " CASE " &VBCRLF
SQL = SQL & " WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 'r' " &VBCRLF
SQL = SQL & " THEN '자금집행서' " &VBCRLF
+ SQL = SQL & " WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' " &VBCRLF
+ SQL = SQL & " THEN 문서제목 " &VBCRLF
SQL = SQL & " ELSE ISNULL(TPM.p_subject, '지출결의서') " &VBCRLF
- SQL = SQL & " END AS p_subject, dbo.FN_RemoveExtraSpaces(RTRIM(CONVERT(NVARCHAR(MAX), target8))) AS client, " &VBCRLF
- SQL = SQL & " ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '' ELSE '키위서베이' END) AS depart_name, target4 AS cost_type, "
- SQL = SQL & " DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, target5 AS cost, ISNULL(CONVERT(varchar, remark5), '') AS chk, "
+ SQL = SQL & " END AS p_subject, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '-' ELSE dbo.FN_RemoveExtraSpaces(RTRIM(CONVERT(NVARCHAR(MAX), target8))) END AS client, " &VBCRLF
+ SQL = SQL & " CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN PARSENAME(REPLACE(CONVERT(NVARCHAR(MAX), target97), '^^', '.'), 1) ELSE ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '' ELSE '키위서베이' END) END AS depart_name, target4 AS cost_type, "
+ SQL = SQL & " DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN ISNULL((SELECT SUM(CAST(REPLACE(SUBSTRING(v.value, CHARINDEX('^^', v.value) + 2, 4000), ',', '') AS money)) FROM STRING_SPLIT(REPLACE(CONVERT(NVARCHAR(MAX), M.target15), '^//^', CHAR(1)), CHAR(1)) v WHERE CHARINDEX('^^', v.value) > 0), 0) ELSE CAST(CONVERT(NVARCHAR(MAX), target5) AS money) END AS cost, ISNULL(CONVERT(varchar, remark5), '') AS chk, "
SQL = SQL & " CONVERT(varchar(4000), target2) AS contents, CONVERT(varchar(4000), target17) AS over_comment "
SQL = SQL & " FROM 문서내용 M WITH(nolock) LEFT JOIN Document D WITH(nolock) ON M.문서번호 = D.d_no "
SQL = SQL & " LEFT JOIN T_PROJECT_METHOD TPM WITH(nolock) ON CONVERT(varchar, M.target10) = TPM.p_child_sn "
@@ -119,15 +123,15 @@ Select Case Request("command")
SQL = SQL & " ) DFI ON CASE WHEN TPM.p_field_dept IN ('12', '9', '8') THEN '12' ELSE TPM.p_field_dept END = DFI.depart_code "
SQL = SQL & " LEFT JOIN direct_costcode DC1 WITH(nolock) ON CONVERT(varchar, target11) = CONVERT(varchar, DC1.id) "
SQL = SQL & " LEFT JOIN direct_costcode DC2 WITH(nolock) ON CONVERT(varchar, target12) = CONVERT(varchar, DC2.id) "
- SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서') AND del_yes_no = 'no' AND remark1 LIKE '77' "
+ SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') AND del_yes_no = 'no' AND remark1 LIKE '77' "
SQL = SQL & " AND d_delok = 'N' AND D.d_order_cnt = 77 "
If Request("smonth") <> "" Then
SQL = SQL & " AND target3 LIKE '"& Request("smonth") &"%' "
End If
If Request("step") = "1" Then
- SQL = SQL & " AND ((문서제목='지출결의서' and ISNULL(CONVERT(varchar, remark5), '') = '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') = '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') and ISNULL(CONVERT(varchar, remark5), '') = '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') = '')) "
ElseIf Request("step") = "2" Then
- SQL = SQL & " AND ((문서제목='지출결의서' and ISNULL(CONVERT(varchar, remark5), '') <> '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') <> '')) "
+ SQL = SQL & " AND (((문서제목='지출결의서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') and ISNULL(CONVERT(varchar, remark5), '') <> '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') <> '')) "
Else
SQL = SQL & " AND 1=2 "
End If
@@ -168,19 +172,19 @@ Select Case Request("command")
'SQL = SQL & " UPDATE 문서내용 SET remark5 = '20190301', remark15 = '"& Request("today") &"' "
'SQL = SQL & " WHERE 문서번호 IN ("& Replace(Replace(Replace(Request("checkedList"), """", "'"), "[", ""), "]", "") &") "
SQL = SQL & " UPDATE 문서내용 "
- SQL = SQL & " SET remark5 = CASE WHEN 문서번호 NOT LIKE '%-r-%' THEN '20190301' ELSE remark5 END, "
- SQL = SQL & " remark15 = CASE WHEN 문서번호 NOT LIKE '%-r-%' THEN '" & Replace(Request("today"), "'", "''") & "' ELSE remark15 END, "
- SQL = SQL & " remark23 = CASE WHEN 문서번호 LIKE '%-r-%' THEN '20190301' ELSE remark23 END, "
- SQL = SQL & " remark26 = CASE WHEN 문서번호 LIKE '%-r-%' THEN '" & Replace(Request("today"), "'", "''") & "' ELSE remark26 END "
+ SQL = SQL & " SET remark5 = CASE WHEN 문서번호 NOT LIKE '%-r-%' THEN '20190301' ELSE CONVERT(NVARCHAR(MAX), remark5) END, "
+ SQL = SQL & " remark15 = CASE WHEN 문서번호 NOT LIKE '%-r-%' THEN '" & Replace(Request("today"), "'", "''") & "' ELSE CONVERT(NVARCHAR(MAX), remark15) END, "
+ SQL = SQL & " remark23 = CASE WHEN 문서번호 LIKE '%-r-%' THEN '20190301' ELSE CONVERT(NVARCHAR(MAX), remark23) END, "
+ SQL = SQL & " remark26 = CASE WHEN 문서번호 LIKE '%-r-%' THEN '" & Replace(Request("today"), "'", "''") & "' ELSE CONVERT(NVARCHAR(MAX), remark26) END "
SQL = SQL & " WHERE 문서번호 IN ("& Replace(Replace(Replace(Request("checkedList"), """", "'"), "[", ""), "]", "") &") "
adoConn.Execute SQL
End If
If Request("uncheckedList") <> "[]" Then
SQL = ""
- SQL = SQL & " SELECT 문서번호 as d_no, CONVERT(varchar, M.target10) AS p_child_sn, ISNULL(TPM.p_subject, '') AS p_subject, target8 AS client, "
- SQL = SQL & " ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '' ELSE '키위서베이' END) AS depart_name, "
- SQL = SQL & " DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, target5 AS cost, ISNULL(CONVERT(varchar, remark5), '') AS chk "
+ SQL = SQL & " SELECT 문서번호 as d_no, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '' ELSE CONVERT(varchar, M.target10) END AS p_child_sn, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN 문서제목 ELSE ISNULL(TPM.p_subject, '') END AS p_subject, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '-' ELSE target8 END AS client, "
+ SQL = SQL & " CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN PARSENAME(REPLACE(CONVERT(NVARCHAR(MAX), target97), '^^', '.'), 1) ELSE ISNULL(ISNULL(DRE.depart_name, DFI.depart_name), CASE WHEN TPM.p_subject IS NULL THEN '' ELSE '키위서베이' END) END AS depart_name, "
+ SQL = SQL & " DC1.d_cost_name AS hangmok, DC2.d_cost_name AS sebu, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN ISNULL((SELECT SUM(CAST(REPLACE(SUBSTRING(v.value, CHARINDEX('^^', v.value) + 2, 4000), ',', '') AS money)) FROM STRING_SPLIT(REPLACE(CONVERT(NVARCHAR(MAX), M.target15), '^//^', CHAR(1)), CHAR(1)) v WHERE CHARINDEX('^^', v.value) > 0), 0) ELSE CAST(CONVERT(NVARCHAR(MAX), target5) AS money) END AS cost, ISNULL(CONVERT(varchar, remark5), '') AS chk "
SQL = SQL & " FROM 문서내용 M WITH(nolock) LEFT JOIN Document D WITH(nolock) ON M.문서번호 = D.d_no "
SQL = SQL & " LEFT JOIN T_PROJECT_METHOD TPM WITH(nolock) ON CONVERT(varchar, M.target10) = TPM.p_child_sn "
SQL = SQL & " LEFT JOIN T_PROJECT_BASE TPB WITH(nolock) ON TPM.p_sn = TPB.p_sn LEFT JOIN "
@@ -196,7 +200,7 @@ Select Case Request("command")
SQL = SQL & " ) DFI ON CASE WHEN TPM.p_field_dept IN ('12', '9', '8') THEN '12' ELSE TPM.p_field_dept END = DFI.depart_code "
SQL = SQL & " LEFT JOIN direct_costcode DC1 WITH(nolock) ON CONVERT(varchar, target11) = CONVERT(varchar, DC1.id) "
SQL = SQL & " LEFT JOIN direct_costcode DC2 WITH(nolock) ON CONVERT(varchar, target12) = CONVERT(varchar, DC2.id) "
- SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서') AND del_yes_no = 'no' AND remark1 LIKE '77' "
+ SQL = SQL & " WHERE (문서제목='지출결의서' or 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') AND del_yes_no = 'no' AND remark1 LIKE '77' "
SQL = SQL & " AND d_delok = 'N' AND D.d_order_cnt = 77 AND ISNULL(CONVERT(varchar, remark5), '') = '' "
SQL = SQL & " AND 문서번호 IN ("& Replace(Replace(Replace(Request("uncheckedList"), """", "'"), "[", ""), "]", "") &") "
SQL = SQL & " ORDER BY M.id desc "
@@ -227,6 +231,8 @@ Select Case Request("command")
tmp_body = tmp_body & "