{영남소스 개발건 추가 반영}
This commit is contained in:
parent
b2b0a0483a
commit
b24bc280f4
|
|
@ -701,6 +701,7 @@
|
||||||
<Content Include="Views\cc\homesemployess.cshtml" />
|
<Content Include="Views\cc\homesemployess.cshtml" />
|
||||||
<Content Include="Views\cc\exelboard.cshtml" />
|
<Content Include="Views\cc\exelboard.cshtml" />
|
||||||
<Content Include="Views\cc\homer2.cshtml" />
|
<Content Include="Views\cc\homer2.cshtml" />
|
||||||
|
<Content Include="Views\Shared\Partial\ExcelCommentBox.cshtml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="App_Data\" />
|
<Folder Include="App_Data\" />
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,10 @@
|
||||||
$("#mainexcelform *").remove();
|
$("#mainexcelform *").remove();
|
||||||
$("#mainexcelform").attr("action", url);
|
$("#mainexcelform").attr("action", url);
|
||||||
|
|
||||||
|
let comment = $("#comment").val();
|
||||||
|
$("#mainexcelform").append("<input type=\"hidden\" name=\"excellog.url\" value=\"@(ViewBag.Title)\" />");
|
||||||
|
$("#mainexcelform").append("<input type=\"hidden\" name=\"excellog.comment\" value=\"" + comment + "\" />");
|
||||||
|
|
||||||
$("#mainexcelform").append("<input type=\"hidden\" name=\"isexceldown\" value=\"1\" />");
|
$("#mainexcelform").append("<input type=\"hidden\" name=\"isexceldown\" value=\"1\" />");
|
||||||
$("#mainexcelform").append("<input type=\"hidden\" name=\"excelname\" value=\"" + exname + "_@DateTime.Now.ToString("yyyyMMdd")\" />");
|
$("#mainexcelform").append("<input type=\"hidden\" name=\"excelname\" value=\"" + exname + "_@DateTime.Now.ToString("yyyyMMdd")\" />");
|
||||||
if ($("#" + fid).find("*[name='tabidx']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"tabidx\" value=\"" + $("#" + fid).find("*[name='tabidx']").val() + "\" />"); }
|
if ($("#" + fid).find("*[name='tabidx']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"tabidx\" value=\"" + $("#" + fid).find("*[name='tabidx']").val() + "\" />"); }
|
||||||
|
|
|
||||||
|
|
@ -124,6 +124,7 @@
|
||||||
@Html.Partial("./Partial/FileScript")
|
@Html.Partial("./Partial/FileScript")
|
||||||
@Html.Partial("./Partial/ScriptDate")
|
@Html.Partial("./Partial/ScriptDate")
|
||||||
@Html.Partial("./Partial/ScdScript")
|
@Html.Partial("./Partial/ScdScript")
|
||||||
|
@Html.Partial("./Partial/ExcelCommentBox")
|
||||||
}
|
}
|
||||||
@section scripts{
|
@section scripts{
|
||||||
<script>
|
<script>
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@
|
||||||
<div style="padding:5px 10px; text-align:right;">
|
<div style="padding:5px 10px; text-align:right;">
|
||||||
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
|
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
|
||||||
@*<a href="#" onclick="javascript:exceldown('mform', '/croom/tax', 'tbody1', '계산서요청');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
|
@*<a href="#" onclick="javascript:exceldown('mform', '/croom/tax', 'tbody1', '계산서요청');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
|
||||||
<a href="#" onclick="javascript:callexcel();" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
|
<a href="#" onclick="callComment('mform', '/croom/tax', 'tbody1', '계산서요청')" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
|
||||||
<a href="#" onclick="javascript:taxcancel();" class="btn btn-s-xs btn-danger" style="margin-left: 5px;">일괄발행취소</a>
|
<a href="#" onclick="javascript:taxcancel();" class="btn btn-s-xs btn-danger" style="margin-left: 5px;">일괄발행취소</a>
|
||||||
<a href="#" onclick="javascript:taxcheck();" class="btn btn-s-xs btn-info" style="margin-left: 5px;">일괄확인</a>
|
<a href="#" onclick="javascript:taxcheck();" class="btn btn-s-xs btn-info" style="margin-left: 5px;">일괄확인</a>
|
||||||
<a href="#" onclick="javascript:taxuncheck();" class="btn btn-s-xs btn-danger" style="margin-left: 5px;">일괄확인취소</a>
|
<a href="#" onclick="javascript:taxuncheck();" class="btn btn-s-xs btn-danger" style="margin-left: 5px;">일괄확인취소</a>
|
||||||
|
|
@ -123,6 +123,7 @@
|
||||||
</form>
|
</form>
|
||||||
<form id="dform" method="post" action="">
|
<form id="dform" method="post" action="">
|
||||||
@Html.Partial("./Partial/dform", Model, new ViewDataDictionary { { "preform", 1 } })
|
@Html.Partial("./Partial/dform", Model, new ViewDataDictionary { { "preform", 1 } })
|
||||||
|
@Html.Partial("./Partial/ExcelCommentBox")
|
||||||
</form>
|
</form>
|
||||||
@section styles{
|
@section styles{
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|
|
||||||
|
|
@ -209,7 +209,7 @@
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
<bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,8 @@ namespace NP.Model
|
||||||
public int isdel { get; set; }
|
public int isdel { get; set; }
|
||||||
}
|
}
|
||||||
/*엑셀 다운로드 기록*/
|
/*엑셀 다운로드 기록*/
|
||||||
public partial class Excellog
|
[Serializable]
|
||||||
|
public class Excellog : BaseModel
|
||||||
{
|
{
|
||||||
public int edno { get; set; }
|
public int edno { get; set; }
|
||||||
|
|
||||||
|
|
@ -97,6 +98,11 @@ namespace NP.Model
|
||||||
public string comment { get; set; }
|
public string comment { get; set; }
|
||||||
|
|
||||||
public string userip { get; set; }
|
public string userip { get; set; }
|
||||||
|
|
||||||
|
public static implicit operator Excellog(string v)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/*엑셀을 다운로드 기록 끝*/
|
/*엑셀을 다운로드 기록 끝*/
|
||||||
|
|
||||||
|
|
@ -462,6 +468,8 @@ namespace NP.Model
|
||||||
|
|
||||||
public bool haschild { get; set; }
|
public bool haschild { get; set; }
|
||||||
|
|
||||||
|
public string menu { get; set; }
|
||||||
|
|
||||||
public int m0 { get; set; }
|
public int m0 { get; set; }
|
||||||
public int m1 { get; set; }
|
public int m1 { get; set; }
|
||||||
public int m2 { get; set; }
|
public int m2 { get; set; }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue