yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

修正調整很多東西

Browse Source
This commit is contained in:
minom
2026-07-09 17:48:47 +08:00
parent 8d8cf9fed4
commit eeed2c8651
22 changed files with 825 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/admin/print/tablet_edit/editorNewOne.html
+23 -14
View File
@@ -50,7 +50,7 @@
</select>
</div>
<div class="col-2">
<button class="btn btn-primary" onclick="designer.save()">儲存牌位</button>
<button class="btn btn-primary" onclick="designer.save(event)">儲存牌位</button>
</div>
</div>
<div class="row work_space">
@@ -340,27 +340,34 @@
if (x.f_num_tablet != "") {
let tablet = JSON.parse(x.f_num_tablet);
let mid_items = tablet.mid_items;
let left_items = tablet.left_items;
let mid_left = tablet.mid_left;
let mid_right = tablet.mid_right;
let address = tablet.addr_items;
let mid_items = tablet?.mid_items;
let left_items = tablet?.left_items;
let mid_left = tablet?.mid_left;
let mid_right = tablet?.mid_right;
let address = tablet?.addr_items===undefined?"":tablet?.addr_items;
if (address === "") {
if (x.address!="") {
address = x.address
}
}
self.family_deceased_Y_selected.length = 0;
self.family_deceased_N_selected.length = 0;
self.family_address = "";
self.family_address = address;
self.family_left_title.length = 0;
self.family_right_title.length = 0;
Object.assign(self.family_deceased_N_selected, mid_items);
Object.assign(self.family_deceased_Y_selected, left_items);
Object.assign(self.family_left_title, mid_left);
Object.assign(self.family_right_title, mid_right);
self.family_address = tablet.addr_items;
self.family_address = address;//tablet.addr_items;
//let mid = [];
//family_deceased_Y_selected family_deceased_N_selected
mid_items.forEach(y => {
self.properTitle.push(y.fam_name);
if (mid_items) {
mid_items.forEach(y => {
self.properTitle.push(y.fam_name);
});
});
}
if (mid_left) {
mid_left.forEach(y => {
self.leftProperTitle.push(y.fam_name);
@@ -737,8 +744,9 @@
});
} else if (element.hasClass("address")) {//地址
console.log(self.address);
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
<span class="selected">${self.address}</span>
<span class="selected">${self.address==undefined?"":self.address}</span>
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >&minus;</span>`);
} else if (element.hasClass("lefttitle")) {//左正名
self.leftProperTitle.forEach(x => {
@@ -853,7 +861,7 @@
self.bindEvent();
},
async addNewItem() {
async addNewItem() {//已選輸入框按加號
console.log("addNewItem:",$("#custom_txt").val())
if ($("#custom_txt").val()=="") {
@@ -1592,7 +1600,8 @@
}
});
},
async save() {
async save(event) {
event.preventDefault()
//console.log("tabletItem:", designer.tabletItem);
//拚牌位的內容
let self = this;