diff --git a/web/admin/print/tablet_edit/editorNewOne.html b/web/admin/print/tablet_edit/editorNewOne.html index 556eb67..99dd723 100644 --- a/web/admin/print/tablet_edit/editorNewOne.html +++ b/web/admin/print/tablet_edit/editorNewOne.html @@ -130,6 +130,13 @@ +
+
+ + +
+
@@ -669,6 +676,13 @@ .tablet-element span{ z-index: 999; } + + .selectedItem .canselectItem{ + font-size: 18px; + } + .selectedItem,.rounded-pill .canselectItem,.rounded-pill{ + font-size: 12px; + } ` $("#pageStyle").remove(); @@ -692,8 +706,14 @@ //抓未往生的人出來 //self.familyMembers; self.alive.forEach(x => { + let f = self.familyMembers.find(z => z.fam_name == x); + $(".selectedItem").append(`
  • 卍 ${x} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + − ↑ ↓
    • `); @@ -705,19 +725,29 @@ }); let finalItem = items.filter(y => !self.alive.includes(y)) finalItem.forEach(yy => { - $(".canselectItem").append(`
  • 卍 ${yy}+
    • `); + let f = self.familyMembers.find(z => z.fam_name == yy); + $(".canselectItem").append(`
  • 卍 + ${yy} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + + +
    • `); }); } else if (element.hasClass("address")) {//地址 $(".selectedItem").append(`
  • 卍 - ${self.address}027 + ${self.address} −`); } else if (element.hasClass("lefttitle")) {//左正名 self.leftProperTitle.forEach(x => { - - + let f = self.familyMembers.find(z => z.fam_name == x); $(".selectedItem").append(`
  • 卍 ${x} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + −`); }) let items = []; @@ -730,12 +760,24 @@ }); let finalItem = items.filter(y => !self.leftProperTitle.includes(y)) finalItem.forEach(yy => { - $(".canselectItem").append(`
  • 卍 ${yy}+
    • `); + let f = self.familyMembers.find(z => z.fam_name == yy); + $(".canselectItem").append(`
  • 卍 + ${yy} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + + +
    • `); }); } else if (element.hasClass("righttitle")) {//右正名 self.rightProperTitle.forEach(x => { + let f = self.familyMembers.find(z => z.fam_name == x); $(".selectedItem").append(`
  • 卍 ${x} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + −`); }) let items = []; @@ -748,14 +790,26 @@ }); let finalItem = items.filter(y => !self.rightProperTitle.includes(y)) finalItem.forEach(yy => { - $(".canselectItem").append(`
  • 卍 ${yy}+
    • `); + let f=self.familyMembers.find(z=>z.fam_name==yy); + $(".canselectItem").append(`
  • 卍 + ${yy} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + + +
    • `); }); } else {//其他都是正名 if (element.hasClass("ancestor-wrapper")) {//多姓氏合併，只允許用打的 self.properTitle.forEach(y => { + let f = self.familyMembers.find(z => z.fam_name == y); $(".selectedItem").append(`
  • 卍 ${y} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + − ↑ ↓
    • `); @@ -763,8 +817,13 @@ } else if (element.hasClass("nameList") || element.hasClass("rosterList")) {// self.properTitle.forEach(y => { + let f = self.familyMembers.find(z => z.fam_name == y); $(".selectedItem").append(`
  • 卍 ${y} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + − ↑ ↓
    • `); @@ -779,7 +838,14 @@ }); let finalItem = items.filter(y => !self.properTitle.includes(y)) finalItem.forEach(yy => { - $(".canselectItem").append(`
  • 卍 ${yy}+
    • `); + let f = self.familyMembers.find(z => z.fam_name == yy); + $(".canselectItem").append(`
  • 卍 + ${yy} + + + ${(f && f.fam_title != null) ? f.fam_title : ""} + + +
    • `); }); } } @@ -1444,6 +1510,7 @@ //appellation_id: this.editedItem.appellation_id_selected.val, //儲存時的稱謂 follower_num: this.follower_id, fam_name: $("#family_txt").val(), + fam_title:$("#title_txt").val(), deceased: $("#deceased_sel").val() == "False" ? false : true, num: 0