diff --git a/web/App_Code/api/hrs/companyController.cs b/web/App_Code/api/hrs/companyController.cs new file mode 100644 index 0000000..00aab1d --- /dev/null +++ b/web/App_Code/api/hrs/companyController.cs @@ -0,0 +1,47 @@ +using PagedList; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; + +/// +/// companyController 的摘要描述 +/// +[ezAuthorize] +public class companyController : BaseApiController +{ + public companyController() + { + // + // TODO: 在這裡新增建構函式邏輯 + // + } + + [HttpPost] + [Route("api/hrs/basic/GetCompanys")] + public IHttpActionResult GetCompanys([FromBody] Model.hr_company comp, int page, int pageSize = 10, + string sortBy = "", bool sortDesc = false) + { + var qry = _db.hr_company.AsQueryable(); + + + var count = qry.Count(); + var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList(); + + var ret = new + { + list = qryList.Select(x => new + { + x.company_id, + x.name, + x.parent_id, + x.super_visor, + x.contactor + }), + count = count + }; + + return Ok(ret); + } +} \ No newline at end of file diff --git a/web/admin/activity/item_reg.aspx b/web/admin/activity/item_reg.aspx index 4bc172f..c0f7aac 100644 --- a/web/admin/activity/item_reg.aspx +++ b/web/admin/activity/item_reg.aspx @@ -612,6 +612,9 @@ + <%----%> @@ -884,6 +887,10 @@ + + <%--
+ 總疏文維護 +
--%> diff --git a/web/admin/activity/reg.aspx b/web/admin/activity/reg.aspx index d4fd668..2e079de 100644 --- a/web/admin/activity/reg.aspx +++ b/web/admin/activity/reg.aspx @@ -2,6 +2,7 @@ <%@ Register Src="~/admin/_uc/alert.ascx" TagPrefix="uc1" TagName="alert" %> + + \ No newline at end of file diff --git a/web/admin/activity/shuwen02.vue b/web/admin/activity/shuwen02.vue new file mode 100644 index 0000000..6ad92b7 --- /dev/null +++ b/web/admin/activity/shuwen02.vue @@ -0,0 +1,558 @@ + + + \ No newline at end of file