diff --git a/web/App_Code/api/FollowerController.cs b/web/App_Code/api/FollowerController.cs index 01b01c6..0237f1c 100644 --- a/web/App_Code/api/FollowerController.cs +++ b/web/App_Code/api/FollowerController.cs @@ -143,6 +143,25 @@ public class FollowerController : ApiController return count; } + [HttpPost] + [Route("api/follower/GetFollowerFamilies")] + public IHttpActionResult GetFollowerFamilies([FromBody] Model.ViewModel.follower q) + { + + var qry = _db.family_members.AsQueryable(); + if (q.num.HasValue&&q.num>0) + { + qry = qry.Where(x=>x.follower_num==q.num); + } + return Ok(new + { + list = qry.Select(x => new + { + x.num,x.follower_num,x.fam_name,x.deceased,x.fam_gender,x.fam_title + }).ToList(), + }); + } + [HttpPost] [Route("api/follower/GetFollowerNew")] public IHttpActionResult GetFollowerNew([FromBody] Model.ViewModel.follower q) @@ -1222,6 +1241,60 @@ public class FollowerController : ApiController } + + [HttpPost] + [Route("api/follower/GetTabletTemplateNameList")] + public IHttpActionResult GetTabletTemplateNameList([FromBody] Model.ViewModel.follower q) + { + var qry=_db.followers_tablet_template.AsQueryable(); + if (q.num.HasValue&&q.num>0) + { + qry= qry.Where(x => x.follower_num == q.num); + } + return Ok(new + { + list=qry.Select(x=>new + { + x.name,x.num,x.follower_num + }).ToList() + }); + } + + [HttpPost] + [Route("api/follower/GetTabletTemplateList")] + public IHttpActionResult GetTabletTemplateList([FromBody] Model.ViewModel.follower q) + { + var qry = _db.followers_tablet_template.AsQueryable(); + if (q.num.HasValue && q.num > 0) + { + qry = qry.Where(x => x.follower_num == q.num); + } + return Ok(new + { + list = qry.Select(x => new + { + x.name, + x.num, + x.follower_num,x.style_id,x.tablet,x.shuwen + }).ToList() + }); + } + + [HttpPost] + [Route("api/follower/SaveTabletTemplate")] + public IHttpActionResult SaveTabletTemplate([FromBody] Model.followers_tablet_template q) + { + if (q.num>0) + {//表示要更新 + var qry = _db.followers_tablet_template.AsQueryable(); + + } + else + { + + } + return Ok(); + } } public static class AutoOrderService diff --git a/web/admin/follower/reg.aspx b/web/admin/follower/reg.aspx index 78a335e..8a6afad 100644 --- a/web/admin/follower/reg.aspx +++ b/web/admin/follower/reg.aspx @@ -550,18 +550,21 @@ { text: '亥時 (21:00~23:00)', value: '亥時' } ], currentView: 'shuwen-component', + externalHtml:'

loading...

' } }, mounted() { this.search_dialog.current = this.search_dialog.controls.search1 ///default //console.log("mounted"); //this.initialize(); - + //取得家人列表 this.getFamilyMembers(); this.getCityOptions(); this.onCityChange(); this.initAutoEnroll(); + this.loadExternalHtml(); + }, watch: { options: { @@ -608,6 +611,22 @@ 'shuwen-component': httpVueLoader('./tablet_template.vue'), }, methods: { + async loadExternalHtml() { + try { + // 請求外部的 HTML 檔案或 API 路由 + const response = await axios.get('tablet_template.html'); + // 將取得的 HTML 字串存入變數 + this.externalHtml = response.data; + $("#sec2-page6").html(this.externalHtml); + setTimeout(() => { + //console.log("load html:",this.follower_id); + designer.follower_num = this.follower_id; + //designer.getFamilies(); + },100); + } catch (error) { + console.error('載入失敗', error); + } + }, initAutoEnroll() { if (this.follower_id != '') { axios.get(HTTP_HOST + `api/follower/GetAutoEnrollList/${this.follower_id}`) @@ -2497,12 +2516,7 @@
- - - - - - + <%--
--%>
diff --git a/web/admin/follower/tablet_template.html b/web/admin/follower/tablet_template.html new file mode 100644 index 0000000..9f83980 --- /dev/null +++ b/web/admin/follower/tablet_template.html @@ -0,0 +1,1034 @@ + + + +
+
+ 範本設定: + +
+
+ 範本名稱: + +
+
+ +
+
+
+ ➖ + + ➕ + 50% +
+
+
+ +
+ +
+
+
+ +
123
+ + +
+
+
+ + +
+ + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ + +
+
    +
    + +
    + + +
      +
      +
      +
      +
      + + \ No newline at end of file diff --git a/web/admin/print/tablet_edit/editorNewOne.html b/web/admin/print/tablet_edit/editorNewOne.html index 796d423..590c152 100644 --- a/web/admin/print/tablet_edit/editorNewOne.html +++ b/web/admin/print/tablet_edit/editorNewOne.html @@ -476,12 +476,6 @@ let pageSize = self.allSize.find(y => y.paperID == style.paperSize); //包含空白用來折的尺寸 let printSize = self.allSize.find(y => y.paperID == style.printSize); - //let scaleSize = 1 - //let documentHeight = document.documentElement.scrollHeight; - //if ((Number(pageSize.height) / 0.265) >= (Number(documentHeight) * 0.8)) { - // scaleSize = (Number(documentHeight) * 0.8) / (Number(pageSize.height) / 0.265) - //} - //$("#scaleSize").html((scaleSize * 100) + "%") tabletpaper = $(`
      `) let img = self.bg.find(y => y.name == style.backendImg); let details = this.allStyleDetails.filter(y => y.styleID == style.styleID);