diff --git a/approval/doc_confirm.asp b/approval/doc_confirm.asp index 0ccbe28..fc5edfe 100644 --- a/approval/doc_confirm.asp +++ b/approval/doc_confirm.asp @@ -309,9 +309,9 @@ var tmpHTML = ""; $.each(tmpJsonList, function(idx, obj){ tmpHTML += ''; - tmpHTML += ' '+ obj.d_no +''; + tmpHTML += ' '+ obj.d_no +''; // tmpHTML += ' '+ (obj.p_child_sn == "" ? "지출결의서" : "["+ obj.p_child_sn +"] "+ obj.p_subject) +''; - tmpHTML += ' ' + (obj.p_child_sn == "" ? (obj.p_subject == "자금집행서" ? "자금집행서" : "지출결의서") : "[" + obj.p_child_sn + "] " + obj.p_subject) + ''; + tmpHTML += ' ' + (obj.p_child_sn == "" ? obj.p_subject : "[" + obj.p_child_sn + "] " + obj.p_subject) + ''; tmpHTML += ' '+ obj.client +''; tmpHTML += ' '+ obj.hangmok +'-'+ obj.sebu +''; tmpHTML += ' '+ commify(obj.cost) +''; @@ -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 & ""& Adors("d_no") &"" ElseIf Mid(Adors("d_no"), 10, 1) = "r" Then tmp_body = tmp_body & ""& Adors("d_no") &"" + ElseIf Mid(Adors("d_no"), 10, 1) = "t" Then + tmp_body = tmp_body & ""& Adors("d_no") &"" Else tmp_body = tmp_body & ""& Adors("d_no") &"" End If diff --git a/approval/doc_expense2_2014.asp b/approval/doc_expense2_2014.asp index 79a84f0..ee98327 100644 --- a/approval/doc_expense2_2014.asp +++ b/approval/doc_expense2_2014.asp @@ -278,7 +278,7 @@ - 비고
(내용, 수량,
단가 등) + 사용내역
(상세내역 작성필수) @@ -307,7 +307,7 @@ 공급가액 부가세액 지출총액 - 비고(내용, 수량, 단가 등) + 사용내역(상세내역 작성필수) 2201001_C01 diff --git a/approval/doc_expense_2014.asp b/approval/doc_expense_2014.asp index 7b28f96..e80cf8e 100644 --- a/approval/doc_expense_2014.asp +++ b/approval/doc_expense_2014.asp @@ -381,7 +381,7 @@ - + diff --git a/approval/doc_final.asp b/approval/doc_final.asp index 8fb4eb9..685a80f 100644 --- a/approval/doc_final.asp +++ b/approval/doc_final.asp @@ -316,7 +316,7 @@ if($(this).prop("checked") == true){ checkedConfirm.push($(this).data("d_no")); }else{ - uncheckedConfirm.push($(this).data("d_no")); + uncheckedConfirm.push($(this).data("d_no")); // TEST: disable unchecked mail/action } }); if(comment == "" && uncheckedConfirm.length > 0){ @@ -362,9 +362,9 @@ var tmpHTML = ""; $.each(tmpJsonList, function(idx, obj){ tmpHTML += ''; - tmpHTML += ' '; + tmpHTML += ' '; //tmpHTML += ' '; - tmpHTML += ' '; + tmpHTML += ' '; tmpHTML += ' '; tmpHTML += ' '; tmpHTML += ' '; @@ -432,7 +432,7 @@ }); } - function openit(z, x){ + function openit(z, x, subject){ var tmp_height = 960; var tmp_width = 850; if (z == 'i'){ @@ -444,6 +444,12 @@ }else if (z == 'r'){ var title_type = "자금"; var url = '/ess/doc_expense2_print.asp?rev_type=3&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=3&d_no=' + x + '&view_chk=1&x=1'; + }else{ + var url = '/ess/doc_myun_pay_print.asp?rev_type=3&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_myun_pay_print.asp b/approval/doc_myun_pay_print.asp index 567c36a..cb036c6 100644 --- a/approval/doc_myun_pay_print.asp +++ b/approval/doc_myun_pay_print.asp @@ -243,12 +243,12 @@ adoconn.execute query query = "insert into 문서내용 (문서번호, 문서제목, target1, target2, target3, target4, target5, " - query = query & " target6, target7, target8, target9, target10, target11, target12, target13, target14, target15, target16, target17, target20, target21, target97,target98,target99,target100,p_sn, 발급일, 발급시각, login_p_no, login_이름,login_ip) values ( " + query = query & " target6, target7, target8, target9, target10, target11, target12, target13, target14, target15, target16, target17, target20, target21, target97,target98,target99,target100,p_sn, 발급일, 발급시각, login_p_no, login_이름,login_ip, remark1) values ( " query = query & "'" & krc_no & "', " query = query & "'" & replace(title, " ", "") & "', " query = query & "'" & gap(1) & "', " query = query & "'" & CheckWord(gap(2)) & "', " - query = query & "'" & gap(3) & "', " + query = query & "'" & year(date) & "-" & zeroformat(month(date),2) & "-" & zeroformat(day(date),2) & "', " query = query & "'" & gap(4) & "', " query = query & "'" & gap(5) & "', " query = query & "'" & gap(6) & "', " @@ -277,7 +277,7 @@ query = query & "'" & time() & "', " query = query & "'" & user_name(0) & "', " query = query & "'" & user_name(1) & "', " - query = query & "'" & Session("USERIP") & "') " + query = query & "'" & Session("USERIP") & "', '3') " adoconn.execute query diff --git a/ess/doc_myun_pay_print.asp b/ess/doc_myun_pay_print.asp index 9c75795..65b58af 100644 --- a/ess/doc_myun_pay_print.asp +++ b/ess/doc_myun_pay_print.asp @@ -24,6 +24,7 @@ krc_no = d_no print_type = request("print_type") view_chk= request("view_chk") + dim rev_type : rev_type = request("rev_type") db_table_name = "문서내용" @@ -253,6 +254,107 @@ if rsc.RecordCount > 0 Then }); + $(document).ready(function(){ + var today = new Date().getMonth()+1 + " / " + new Date().getDate(); + <% If rev_type = "1" Then %> + var tmpHtml = ""; + tmpHtml += ""; + <% if cstr(tmp_ess(4, 2)) = cstr(session("user_number")) then %> + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html(tmpHtml) // 부서장 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(3)").html(today) // 부서장 + <% Else %> + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(4)").html(tmpHtml) // 담당자 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(4)").html(today) // 담당자 + <% End If %> + + $("#rev_btn").on("click", function(){ + if(confirm("확인처리하시겠습니까?")){ + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revReqApproval", "d_no":"<%=d_no%>", "today":today}, + success: function(ret){ + if(ret == "1"){ + alert("확인요청이 정상 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else if(ret == "2"){ + alert("확인 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else{ + alert("오류가 발생하였습니다.\n관리부서로 문의해주세요."); + } + } + }); + } + }); + <% ElseIf rev_type = "2" Then %> + <% if cstr(tmp_ess(4, 2)) = cstr(session("user_number")) then %> + tmpHtml = "" + tmpHtml += ""; + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html(tmpHtml) // 부서장 + + $("#rev_comp_btn").on("click", function(){ + if(confirm("확인하시겠습니까?")){ + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revCompApproval", "d_no":"<%=d_no%>", "today":today}, + success: function(ret){ + if(ret == "1"){ + alert("확인 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else{ + alert("오류가 발생하였습니다.\n관리부서로 문의해주세요."); + } + } + }); + } + }); + <% End If %> + <% End If %> + <% If d_order_cnt = 77 Then %> + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"2"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(4)").html('') // 담당 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(4)").html(retJson.day) // 담당 + } + } + }); + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"3"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html('') // 부서장 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(3)").html(retJson.day) // 부서장 + } + } + }); + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"5"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(1)").html('') // 대표이사 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(1)").html(retJson.day) // 대표이사 + } + } + }); + <% End If %> + }); + function win_close() { window.close(); @@ -474,7 +576,7 @@ if rsc.RecordCount > 0 Then
비고(메모)사용내역(상세내역 작성필수)
'+ obj.d_no +''+ obj.d_no +''+ (obj.p_child_sn == "" ? "Multi" : "["+ obj.p_child_sn +"] "+ obj.p_subject) +'' + (obj.p_child_sn == "" ? (obj.p_subject == "자금집행서" ? "자금집행서" : "지출결의서") : "[" + obj.p_child_sn + "] " + obj.p_subject) + '' + (obj.p_child_sn == "" ? obj.p_subject : "[" + obj.p_child_sn + "] " + obj.p_subject) + ''+ obj.client +''+ obj.depart_name +''+ obj.hangmok +'-'+ obj.sebu +'
- + diff --git a/ess/doc_myun_pay_print2.asp b/ess/doc_myun_pay_print2.asp index 75589fb..f1aaf13 100644 --- a/ess/doc_myun_pay_print2.asp +++ b/ess/doc_myun_pay_print2.asp @@ -24,6 +24,7 @@ krc_no = d_no print_type = request("print_type") view_chk= request("view_chk") + dim rev_type : rev_type = request("rev_type") db_table_name = "문서내용" @@ -252,6 +253,107 @@ if rsc.RecordCount > 0 Then } }); + $(document).ready(function(){ + var today = new Date().getMonth()+1 + " / " + new Date().getDate(); + <% If rev_type = "1" Then %> + var tmpHtml = ""; + tmpHtml += ""; + <% if cstr(tmp_ess(4, 2)) = cstr(session("user_number")) then %> + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html(tmpHtml) // 부서장 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(3)").html(today) // 부서장 + <% Else %> + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(4)").html(tmpHtml) // 담당자 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(4)").html(today) // 담당자 + <% End If %> + + $("#rev_btn").on("click", function(){ + if(confirm("확인처리하시겠습니까?")){ + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revReqApproval", "d_no":"<%=d_no%>", "today":today}, + success: function(ret){ + if(ret == "1"){ + alert("확인요청이 정상 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else if(ret == "2"){ + alert("확인 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else{ + alert("오류가 발생하였습니다.\n관리부서로 문의해주세요."); + } + } + }); + } + }); + <% ElseIf rev_type = "2" Then %> + <% if cstr(tmp_ess(4, 2)) = cstr(session("user_number")) then %> + tmpHtml = "" + tmpHtml += ""; + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html(tmpHtml) // 부서장 + + $("#rev_comp_btn").on("click", function(){ + if(confirm("확인하시겠습니까?")){ + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revCompApproval", "d_no":"<%=d_no%>", "today":today}, + success: function(ret){ + if(ret == "1"){ + alert("확인 처리되었습니다."); + $(opener.document).find("#tr_<%=d_no%>").remove(); + self.close(); + }else{ + alert("오류가 발생하였습니다.\n관리부서로 문의해주세요."); + } + } + }); + } + }); + <% End If %> + <% End If %> + <% If d_order_cnt = 77 Then %> + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"2"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(4)").html('') // 담당 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(4)").html(retJson.day) // 담당 + } + } + }); + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"3"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(3)").html('') // 부서장 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(3)").html(retJson.day) // 부서장 + } + } + }); + $.ajax({ + url: "/ess/doc_rev_ajax.asp", + type: "POST", + data: {"command":"revIngApproval", "d_no":"<%=d_no%>", "appoval_level":"5"}, + success: function(ret){ + if(ret != "0"){ + var retJson = JSON.parse(ret); + $("#approval_tb > tbody > tr:eq(2) > td:nth-last-child(1)").html('') // 대표이사 + $("#approval_tb > tbody > tr:eq(3) > td:nth-last-child(1)").html(retJson.day) // 대표이사 + } + } + }); + <% End If %> + }); + function win_close() {
수당 결재 기간<%=work_month%><%if pay_type = "2" then%>프로젝트단위<%else%><%=work_month%><%end if%> 수당 담당자 <%=pay_apply_username%>