From 88be1142bc99017f0ee4146b9fe56311a59d5da1 Mon Sep 17 00:00:00 2001 From: Choins Date: Wed, 7 Oct 2026 09:31:50 +0900 Subject: [PATCH] =?UTF-8?q?20261007=20::=20=EA=B2=BD=EC=98=81=EB=AC=B8?= =?UTF-8?q?=ED=99=94=EB=B3=B8=EB=B6=80=20=EC=9A=94=EC=B2=AD=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- approval/doc_confirm.asp | 13 +-- approval/doc_confirm_ajax.asp | 54 +++++----- approval/doc_final.asp | 12 +-- approval/doc_myun_pay_print.asp | 6 +- ess/doc_attach_add.asp | 7 +- ess/doc_attach_del.asp | 3 +- ess/doc_expense2_print_2014.asp | 14 ++- ess/doc_expense_print_2014.asp | 14 ++- ess/doc_myun_pay_print.asp | 102 ------------------ ess/doc_myun_pay_print2.asp | 102 ------------------ inspection/neakeun_work_confirm_save.asp | 3 - project/project_cost_changelist.asp | 2 +- project/project_list2_dep_2014.asp | 21 ---- project/project_list2_weekly_2014.asp | 6 +- .../project_list2_weekly_ajax_file_check.asp | 7 +- project/project_search_2014.asp | 4 +- project_list/project_list_2014.ASP | 2 +- 17 files changed, 73 insertions(+), 299 deletions(-) diff --git a/approval/doc_confirm.asp b/approval/doc_confirm.asp index fc5edfe..0ccbe28 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,7 +342,8 @@ $("#sumTable > tbody > tr > td:eq("+ idxArr[obj.cost_type] +")").html(commify(obj.cost)); }); } - function openit(z, x, y, subject){ + + function openit(z, x, y){ var tmp_height = 960; var tmp_width = 850; if (z == 'i'){ @@ -354,12 +355,6 @@ }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 f6e9668..dfe8dfb 100644 --- a/approval/doc_confirm_ajax.asp +++ b/approval/doc_confirm_ajax.asp @@ -20,17 +20,15 @@ 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, CASE WHEN PARSENAME(REPLACE(문서번호, '-', '.'), 2) = 't' THEN '' ELSE CONVERT(varchar, M.target10) END AS p_child_sn, " &VBCRLF + SQL = SQL & " SELECT M.id, 문서번호 as d_no, CONVERT(varchar, M.target10) 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 & " 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 & " 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 & " 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 @@ -46,20 +44,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 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서' ) " &VBCRLF + SQL = SQL & " WHERE (문서제목='지출결의서' 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 (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') = '')) " + SQL = SQL & " AND ((문서제목='지출결의서' 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 (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark2), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '3' AND ISNULL(convert(varchar, remark21), '') <> '')) " + SQL = SQL & " AND ((문서제목='지출결의서' 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 (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') = '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') = '')) " + SQL = SQL & " AND ((문서제목='지출결의서' 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 (((문서제목='지출결의서' OR 문서제목='면접원수당지출결의서' OR 문서제목='내근직수당지출결의서') AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark5), '') <> '') OR (문서제목='자금집행서' AND remark1 LIKE '77' AND ISNULL(convert(varchar, remark23), '') <> '')) " + SQL = SQL & " AND ((문서제목='지출결의서' 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 " @@ -97,16 +95,14 @@ Select Case Request("command") Case "finalList" SQL = "" - 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 & " SELECT 문서번호 as d_no, CONVERT(varchar, M.target10) 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, 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 & " 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 & " 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 " @@ -123,15 +119,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 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') AND del_yes_no = 'no' AND remark1 LIKE '77' " + SQL = SQL & " WHERE (문서제목='지출결의서' 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 (((문서제목='지출결의서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') and ISNULL(CONVERT(varchar, remark5), '') = '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') = '')) " + SQL = SQL & " AND ((문서제목='지출결의서' and ISNULL(CONVERT(varchar, remark5), '') = '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') = '')) " ElseIf Request("step") = "2" Then - SQL = SQL & " AND (((문서제목='지출결의서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') and ISNULL(CONVERT(varchar, remark5), '') <> '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') <> '')) " + SQL = SQL & " AND ((문서제목='지출결의서' and ISNULL(CONVERT(varchar, remark5), '') <> '') or (문서제목='자금집행서' and ISNULL(CONVERT(varchar, remark23), '') <> '')) " Else SQL = SQL & " AND 1=2 " End If @@ -172,19 +168,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 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 & " 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 & " WHERE 문서번호 IN ("& Replace(Replace(Replace(Request("checkedList"), """", "'"), "[", ""), "]", "") &") " adoConn.Execute SQL End If If Request("uncheckedList") <> "[]" Then SQL = "" - 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 & " 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 & " 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 " @@ -200,7 +196,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 문서제목='자금집행서' or 문서제목='면접원수당지출결의서' or 문서제목='내근직수당지출결의서') AND del_yes_no = 'no' AND remark1 LIKE '77' " + SQL = SQL & " WHERE (문서제목='지출결의서' 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 " @@ -231,8 +227,6 @@ 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_final.asp b/approval/doc_final.asp index 685a80f..9e38d62 100644 --- a/approval/doc_final.asp +++ b/approval/doc_final.asp @@ -362,9 +362,9 @@ var tmpHTML = ""; $.each(tmpJsonList, function(idx, obj){ tmpHTML += ''; - tmpHTML += ' '+ obj.d_no +''; + tmpHTML += ' '+ obj.d_no +''; //tmpHTML += ' '+ (obj.p_child_sn == "" ? "Multi" : "["+ 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.depart_name +''; tmpHTML += ' '+ obj.hangmok +'-'+ obj.sebu +''; @@ -432,7 +432,7 @@ }); } - function openit(z, x, subject){ + function openit(z, x){ var tmp_height = 960; var tmp_width = 850; if (z == 'i'){ @@ -444,12 +444,6 @@ }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 1f4bcbd..dab57f6 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, remark1) 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) values ( " query = query & "'" & krc_no & "', " query = query & "'" & replace(title, " ", "") & "', " query = query & "'" & gap(1) & "', " query = query & "'" & CheckWord(gap(2)) & "', " - query = query & "'" & year(date) & "-" & zeroformat(month(date),2) & "-" & zeroformat(day(date),2) & "', " + query = query & "'" & gap(3) & "', " 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") & "', '3') " + query = query & "'" & Session("USERIP") & "') " adoconn.execute query diff --git a/ess/doc_attach_add.asp b/ess/doc_attach_add.asp index 64662a8..084dc5d 100644 --- a/ess/doc_attach_add.asp +++ b/ess/doc_attach_add.asp @@ -11,7 +11,8 @@ If attachClientIp <> "10.10.13.47" And _ attachClientIp <> "10.10.13.105" And _ attachClientIp <> "10.10.13.48" And _ attachClientIp <> "10.10.13.6" And _ - attachClientIp <> "10.10.13.29" Then + attachClientIp <> "10.10.13.29" And _ + attachClientIp <> "10.10.13.186" Then Response.Write "{""result"":""denied""}" Response.End End If @@ -34,14 +35,14 @@ If krc_no = "" Or InStr(krc_no, "..") > 0 Or InStr(krc_no, "/") > 0 Or InStr(krc Response.End End If -fileName = uploadform("attach_file")(1).FileName +fileName = Trim(uploadform("attach_file")(1).FileName) If fileName = "" Then Response.Write "{""result"":""fail""}" Response.End End If -ext = LCase(Mid(fileName, InStrRev(fileName, ".") + 1)) +ext = LCase(Trim(Mid(fileName, InStrRev(fileName, ".") + 1))) If InStr(allowedExt, "|" & ext & "|") = 0 Then Response.Write "{""result"":""badtype""}" diff --git a/ess/doc_attach_del.asp b/ess/doc_attach_del.asp index a8e82dc..2e23346 100644 --- a/ess/doc_attach_del.asp +++ b/ess/doc_attach_del.asp @@ -11,7 +11,8 @@ If attachClientIp <> "10.10.13.47" And _ attachClientIp <> "10.10.13.105" And _ attachClientIp <> "10.10.13.48" And _ attachClientIp <> "10.10.13.6" And _ - attachClientIp <> "10.10.13.29" Then + attachClientIp <> "10.10.13.29" And _ + attachClientIp <> "10.10.13.186" Then Response.Write "{""result"":""denied""}" Response.End End If diff --git a/ess/doc_expense2_print_2014.asp b/ess/doc_expense2_print_2014.asp index 6fd527c..db00c81 100644 --- a/ess/doc_expense2_print_2014.asp +++ b/ess/doc_expense2_print_2014.asp @@ -32,7 +32,7 @@ dim xadmin : xadmin = request("xadmin") '-- 수정(edit) dim attachClientIp, attachEditAllowed attachClientIp = Replace(Replace(Trim(Request.ServerVariables("REMOTE_ADDR")), "10.10.20.", "10.10.13."), "10.10.17.", "10.10.13.") - attachEditAllowed = (attachClientIp = "10.10.13.47" Or attachClientIp = "10.10.13.105" Or attachClientIp = "10.10.13.48" Or attachClientIp = "10.10.13.6" Or attachClientIp = "10.10.13.29") + attachEditAllowed = (attachClientIp = "10.10.13.47" Or attachClientIp = "10.10.13.105" Or attachClientIp = "10.10.13.48" Or attachClientIp = "10.10.13.6" Or attachClientIp = "10.10.13.29" Or attachClientIp = "10.10.13.186") 'response.write "[" & xadmin & "]" dim pay_type(4) @@ -888,6 +888,7 @@ if rsc.RecordCount > 0 then Dim attachFolderPath, attachFolderObj, attachOneFile, attachUs, attachDt, attachIdxPart, attachExt Dim attachFileMap(20), attachIsImage(20) Dim imageExtList : imageExtList = "|jpg|jpeg|png|gif|" + Dim attachCacheVersion : attachCacheVersion = CStr(CLng(Timer() * 1000)) attachFolderPath = Server.Mappath("/") & "/Upload/DOC_ATTACH/" & krc_no If fso.FolderExists(attachFolderPath) Then Set attachFolderObj = fso.GetFolder(attachFolderPath) @@ -917,7 +918,7 @@ if rsc.RecordCount > 0 then If attachIsImage(i) Then %>
- " /> + <% If xadmin = "edit" And attachEditAllowed Then %> × <% End If %> @@ -926,7 +927,7 @@ if rsc.RecordCount > 0 then Else %>
- " target="_blank" class="attach_file_link"> + <%=Ucase(Mid(attachFileMap(i), InStrRev(attachFileMap(i),".")+1))%> <%=attachFileMap(i)%> @@ -1303,7 +1304,12 @@ if rsc.RecordCount > 0 then return; } var fd = new FormData(); - fd.append("attach_file", files[idx]); + var uploadName = "upload"; + var dotIdx = files[idx].name.lastIndexOf("."); + if(dotIdx >= 0){ + uploadName += files[idx].name.substring(dotIdx).toLowerCase(); + } + fd.append("attach_file", files[idx], uploadName); fd.append("krc_no", "<%=krc_no%>"); $.ajax({ url: "/ess/doc_attach_add.asp", diff --git a/ess/doc_expense_print_2014.asp b/ess/doc_expense_print_2014.asp index 7793fdd..6ca8f5c 100644 --- a/ess/doc_expense_print_2014.asp +++ b/ess/doc_expense_print_2014.asp @@ -30,7 +30,7 @@ Response.CharSet="euc-kr" dim xadmin : xadmin=request("xadmin") '-- 수정(edit) dim attachClientIp, attachEditAllowed attachClientIp = Replace(Replace(Trim(Request.ServerVariables("REMOTE_ADDR")), "10.10.20.", "10.10.13."), "10.10.17.", "10.10.13.") - attachEditAllowed = (attachClientIp = "10.10.13.47" Or attachClientIp = "10.10.13.105" Or attachClientIp = "10.10.13.48" Or attachClientIp = "10.10.13.6" Or attachClientIp = "10.10.13.29") + attachEditAllowed = (attachClientIp = "10.10.13.47" Or attachClientIp = "10.10.13.105" Or attachClientIp = "10.10.13.48" Or attachClientIp = "10.10.13.6" Or attachClientIp = "10.10.13.29" Or attachClientIp = "10.10.13.186") dim pay_type(4) pay_type(1) = "카드/현금" pay_type(2) = "세금계산서" @@ -920,6 +920,7 @@ if rsc.RecordCount > 0 then Dim attachFolderPath, attachFolderObj, attachOneFile, attachUs, attachDt, attachIdxPart, attachExt Dim attachFileMap(20), attachIsImage(20) Dim imageExtList : imageExtList = "|jpg|jpeg|png|gif|" + Dim attachCacheVersion : attachCacheVersion = CStr(CLng(Timer() * 1000)) attachFolderPath = Server.Mappath("/") & "/Upload/DOC_ATTACH/" & krc_no If fso.FolderExists(attachFolderPath) Then Set attachFolderObj = fso.GetFolder(attachFolderPath) @@ -949,7 +950,7 @@ if rsc.RecordCount > 0 then If attachIsImage(i) Then %>
- " /> + <% If xadmin = "edit" And attachEditAllowed Then %> × <% End If %> @@ -958,7 +959,7 @@ if rsc.RecordCount > 0 then Else %>
- " target="_blank" class="attach_file_link"> + <%=Ucase(Mid(attachFileMap(i), InStrRev(attachFileMap(i),".")+1))%> <%=attachFileMap(i)%> @@ -1239,7 +1240,12 @@ if rsc.RecordCount > 0 then return; } var fd = new FormData(); - fd.append("attach_file", files[idx]); + var uploadName = "upload"; + var dotIdx = files[idx].name.lastIndexOf("."); + if(dotIdx >= 0){ + uploadName += files[idx].name.substring(dotIdx).toLowerCase(); + } + fd.append("attach_file", files[idx], uploadName); fd.append("krc_no", "<%=krc_no%>"); $.ajax({ url: "/ess/doc_attach_add.asp", diff --git a/ess/doc_myun_pay_print.asp b/ess/doc_myun_pay_print.asp index 65b58af..a7924c1 100644 --- a/ess/doc_myun_pay_print.asp +++ b/ess/doc_myun_pay_print.asp @@ -24,7 +24,6 @@ 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 = "문서내용" @@ -254,107 +253,6 @@ 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(); diff --git a/ess/doc_myun_pay_print2.asp b/ess/doc_myun_pay_print2.asp index f1aaf13..75589fb 100644 --- a/ess/doc_myun_pay_print2.asp +++ b/ess/doc_myun_pay_print2.asp @@ -24,7 +24,6 @@ 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,107 +252,6 @@ 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() { diff --git a/inspection/neakeun_work_confirm_save.asp b/inspection/neakeun_work_confirm_save.asp index 1e0f18a..729c428 100644 --- a/inspection/neakeun_work_confirm_save.asp +++ b/inspection/neakeun_work_confirm_save.asp @@ -179,9 +179,6 @@ for i=1 to request("cnt") lunch_alr = true rsa.open query, adoConn, adopenstatic, adlockreadonly - if cstr(rsa("m_lunch_cost")) = cstr(lunch_cost) then - lunch_alr = false - end if If lunch_alr = true Then query = " insert into t_neakeun_pay (p_sn, m_name, m_jumin, work_dt, s_ot, s_gubun, s_pay_unit, s_wan, s_sum, s_time_style, pay_type, pay_month, insert_dt, insert_user, attribute01) " diff --git a/project/project_cost_changelist.asp b/project/project_cost_changelist.asp index 2d1e1d7..02295bc 100644 --- a/project/project_cost_changelist.asp +++ b/project/project_cost_changelist.asp @@ -52,7 +52,7 @@ sql=sql&" FROM 문서내용 M LEFT JOIN Document D ON M.문서번호 = D.d_no "&VbCrlf sql=sql&" LEFT JOIN T_PROJECT_METHOD P ON M.p_sn = P.p_child_sn "&VbCrlf sql=sql&" LEFT JOIN T_PROJECT_BASE TPB ON P.p_sn = TPB.p_sn "&VbCrlf - sql=sql&" LEFT JOIN V_Department VD ON TPB.p_depart_dep = VD.before_t_cd1 "&VbCrlf + sql=sql&" LEFT JOIN V_Department VD ON ((ISNULL(TPB.p_depart_dep, '') = '0' AND ISNULL(TPB.p_Depart_N, '') = 'E' AND ISNULL(TPB.p_Team_N, '') = '101' AND P.p_rsch_dept = VD.before_t_cd1) OR (NOT (ISNULL(TPB.p_depart_dep, '') = '0' AND ISNULL(TPB.p_Depart_N, '') = 'E' AND ISNULL(TPB.p_Team_N, '') = '101') AND (((ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) <> '' AND (ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) = VD.Code) OR ((ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) = '' AND TPB.p_depart_dep = VD.before_t_cd1)))) "&VbCrlf sql=sql&" WHERE 문서제목 = '프로젝트계약액수정' "&VbCrlf sql=sql&" AND d_order_cnt = '77' AND del_yes_no = 'no' "&VbCrlf sql=sql&" AND d_write_date >= CONVERT(varchar(10), DATEADD(MONTH, -3, getdate()), 120) "&VbCrlf diff --git a/project/project_list2_dep_2014.asp b/project/project_list2_dep_2014.asp index 8e319e7..1138f05 100644 --- a/project/project_list2_dep_2014.asp +++ b/project/project_list2_dep_2014.asp @@ -3595,28 +3595,7 @@ var fileAttachCcount = 0; var upload_Flag = true; var depart_no = document.pms.depart_no.value; - var contractAttachFlag = false; - $("input[name^='f_kind'][value='010']").each(function () { - var contractFileIndex = $(this).attr("name").replace("f_kind[", "").replace("]", ""); - var contractFileId = $("input[name='f_id[" + contractFileIndex + "]']").val(); - var contractUploadPath = $("input[name='ATTACH_FILENAME[" + contractFileIndex + "]']").val(); - - if ((contractFileId != null && contractFileId != "") || (contractUploadPath != null && contractUploadPath.length > 0)) { - contractAttachFlag = true; - return false; - } - }); - - if (!contractAttachFlag) { - alert("프로젝트 계약서를 첨부하십시오."); - $("input[name^='f_kind'][value='010']").each(function () { - var contractFileIndex = $(this).attr("name").replace("f_kind[", "").replace("]", ""); - $("input[name='ATTACH_FILENAME[" + contractFileIndex + "]']").focus(); - return false; - }); - return; - } $("input:file").each(function (index) { var uploadpath = $(this).val(); diff --git a/project/project_list2_weekly_2014.asp b/project/project_list2_weekly_2014.asp index 59ac874..9574e83 100644 --- a/project/project_list2_weekly_2014.asp +++ b/project/project_list2_weekly_2014.asp @@ -2292,7 +2292,11 @@ end if if (ajaxResponse == "1") { complete(type, p_child_sn); } else { - alert("관련 File Upload가 미흡합니다. 확인하시기 바랍니다.\n 용역범위-테이블 및 데이터 [제안서or견적서+설문지+전산(DP)]\n 용역범위-보고서 등 [제안서or견적서+보고서+설문지+전산(DP)]"); + if (type == "1") { + alert("관련 File Upload가 미흡합니다. 확인하시기 바랍니다.\n 용역범위-테이블 및 데이터 [프로젝트 계약서+제안서or견적서+설문지+전산(DP)]\n 용역범위-보고서 등 [프로젝트 계약서+제안서or견적서+보고서+설문지+전산(DP)]"); + } else { + alert("관련 File Upload가 미흡합니다. 확인하시기 바랍니다.\n 용역범위-테이블 및 데이터 [제안서or견적서+설문지+전산(DP)]\n 용역범위-보고서 등 [제안서or견적서+보고서+설문지+전산(DP)]"); + } } } function complete(type, p_child_sn) { diff --git a/project/project_list2_weekly_ajax_file_check.asp b/project/project_list2_weekly_ajax_file_check.asp index cd3efe0..c0f1de0 100644 --- a/project/project_list2_weekly_ajax_file_check.asp +++ b/project/project_list2_weekly_ajax_file_check.asp @@ -19,7 +19,8 @@ end if query = "" ' export_range <- 용역범위, a_cnt <- 견적서 또는 제안서, b_cnt <- 보고서, c_cnt <- 설문지, d_cnt <- 전산팀(DP) - query = query & " SELECT isnull(isnull(isnull(a.p_export_range, b.p_export_range), c.p_export_range), d.p_export_range) as export_range , isnull(a.a_CNT, 0) as a_cnt, isnull(b.b_CNT, 0) as b_cnt, isnull(c.c_CNT, 0) as c_cnt, isnull(d.d_CNT, 0) as d_cnt FROM " + query = query & " SELECT isnull(isnull(isnull(a.p_export_range, b.p_export_range), c.p_export_range), d.p_export_range) as export_range , isnull(a.a_CNT, 0) as a_cnt, isnull(b.b_CNT, 0) as b_cnt, isnull(c.c_CNT, 0) as c_cnt, isnull(d.d_CNT, 0) as d_cnt, " + query = query & " (SELECT COUNT(*) FROM T_SYSTEM_ATTACH WHERE f_p_sn = '" & LEFT(p_child_sn, 7) & "' AND f_use_yn = 'Y' AND f_kind = '010') as contract_cnt FROM " query = query & " ( " query = query & " SELECT p_export_range, count(*) as a_CNT FROM " query = query & " (SELECT p_export_range FROM V_PROJECT_METHOD WHERE p_child_sn = '" & p_child_sn & "') A, " @@ -52,11 +53,11 @@ if rsp.recordCount > 0 then if depart_type = "1" then if rsp("export_range") = "001" then '용역범위 - 테이블 및 데이터 인 경우 - if cint(rsp("a_cnt")) >= 1 and cint(rsp("c_cnt")) >= 1 then ' 제안서 또는 견적서가 있고, 설문지가 있으면, + if cint(rsp("contract_cnt")) >= 1 and cint(rsp("a_cnt")) >= 1 and cint(rsp("c_cnt")) >= 1 then ' 제안서 또는 견적서가 있고, 설문지가 있으면, ret_val = "1" end if else '용역범위 - 보고서, Top-line/Brief 경우 - if cint(rsp("a_cnt")) >= 1 and cint(rsp("b_cnt")) >= 1 and cint(rsp("c_cnt")) >= 1 then ' 제안서 또는 견적서가 있고, 보고서가 있으며, 설문지도 있을 때, + if cint(rsp("contract_cnt")) >= 1 and cint(rsp("a_cnt")) >= 1 and cint(rsp("b_cnt")) >= 1 and cint(rsp("c_cnt")) >= 1 then ' 제안서 또는 견적서가 있고, 보고서가 있으며, 설문지도 있을 때, ret_val = "1" end if end if diff --git a/project/project_search_2014.asp b/project/project_search_2014.asp index a867043..c3e8b48 100644 --- a/project/project_search_2014.asp +++ b/project/project_search_2014.asp @@ -559,7 +559,7 @@ end if query = query & " FROM T_PROJECT_BASE TPB " query = query & " LEFT OUTER JOIN T_PROJECT_METHOD TPM ON TPM.p_sn = TPB.p_sn /* 조사방법 맵핑 */ " query = query & " LEFT OUTER JOIN T_PROJECT_METHOD_CD TPMC ON TPM.p_method_cd = TPMC.p_method_cd /* 조사방법 이름 맵핑 */ " - query = query & " LEFT OUTER JOIN V_Department D ON TPB.p_depart_dep = D.before_t_cd1 /* 부서코드 */ " + query = query & " LEFT OUTER JOIN V_Department D ON ((ISNULL(TPB.p_depart_dep, '') = '0' AND ISNULL(TPB.p_Depart_N, '') = 'E' AND ISNULL(TPB.p_Team_N, '') = '101' AND TPM.p_rsch_dept = D.before_t_cd1) OR (NOT (ISNULL(TPB.p_depart_dep, '') = '0' AND ISNULL(TPB.p_Depart_N, '') = 'E' AND ISNULL(TPB.p_Team_N, '') = '101') AND (((ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) <> '' AND (ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) = D.Code) OR ((ISNULL(TPB.p_Depart_N, '') + ISNULL(TPB.p_Team_N, '')) = '' AND TPB.p_depart_dep = D.before_t_cd1)))) /* 부서코드 */ " query = query & " LEFT OUTER JOIN V_CLIENT_COMP TCC ON TPB.p_cli_company_cd = TCC.p_cli_company_cd /* 회사코드 맵핑 */ " query = query & " LEFT OUTER JOIN T_SYSTEM_ATTACH TSA ON TPB.p_sn = TSA.f_p_sn AND f_use_yn = 'y' " query = query & " LEFT OUTER JOIN T_COMMON_CODE_DETAIL TCCD ON TSA.f_work_type = TCCD.c_kind_code AND TSA.f_kind = TCCD.c_common_code /* 문서종류 맵핑 */ " @@ -883,7 +883,7 @@ end if psql=psql&" left outer join V_CLIENT_COMP as E on PB.p_cli_company_cd = E.p_cli_company_cd " psql=psql&" left outer join V_CLIENT_PERSON as CP on PB.p_cli_company_cd = CP.p_cli_company_cd AND PB.p_cli_per_cd = CP.p_cli_per_cd " psql=psql&" left outer join T_CLIENT_TYPE_CD as CT on PB.p_client_type_cd = CT.p_client_type_cd " - psql=psql&" INNER JOIN V_Department D ON PB.p_depart_dep = d.before_t_cd1 " + psql=psql&" INNER JOIN V_Department D ON ((ISNULL(PB.p_Depart_N, '') + ISNULL(PB.p_Team_N, '')) <> '' AND (ISNULL(PB.p_Depart_N, '') + ISNULL(PB.p_Team_N, '')) = D.Code) OR ((ISNULL(PB.p_Depart_N, '') + ISNULL(PB.p_Team_N, '')) = '' AND PB.p_depart_dep = D.before_t_cd1) " psql=psql&" WHERE p_sn in ( " psql=psql&" select AA.p_sn from ("&query&") AA group by AA.p_sn " psql=psql&" ) " diff --git a/project_list/project_list_2014.ASP b/project_list/project_list_2014.ASP index 96703ac..b19cb81 100644 --- a/project_list/project_list_2014.ASP +++ b/project_list/project_list_2014.ASP @@ -92,7 +92,7 @@ End if - <% If (Session("N_depart") = "M" And Session("N_team") = "101") Or (Session("N_depart") = "S" And Session("N_team") = "601") Then %> + <% If (Session("N_depart") = "M" And Session("N_team") = "101") Or (Session("N_depart") = "S" And Session("N_team") = "601") Or (Session("User_Number") = "20250301") Then %>
일반업무