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-10 17:35:02 +08:00
parent 266aeb4426
commit 2686506f9c
16 changed files with 249 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/admin/print/print_list.aspx
+3 -2
View File
@@ -246,7 +246,7 @@
if (this.search_dialog.current.id == 'search7' || this.search_dialog.current.id == 'search8') {
search['num'] = this.follower_id;
}
console.log("search_get", api_url, search, params, this.options);
//console.log("search_get", api_url, search, params, this.options);
this.search_dialog.loading = true
axios.post(api_url, search, { params: params })
.then(response => {
@@ -337,7 +337,7 @@
},
multiPrintNew() {
let list = []
console.log("print_data.selected:",this.print_data.item);
//console.log("print_data.selected:",this.print_data.item);
this.print_data.selected.forEach(item => {
list.push({
num: item.num, print_id: item.print_id, order_no: item.order_no, from_id: item.from_id,
@@ -406,6 +406,7 @@
addHiddenField("title", `${item.act_item_selected} / ${item.subject}`);
localStorage.setItem("item", item.act_item_selected?.val);
localStorage.setItem("list", JSON.stringify(list));
localStorage.setItem("mode","print");
document.body.appendChild(form); // Not entirely sure if this is necessary
form.submit();
web/admin/print/print_multi_new.aspx
+12 -3
View File
@@ -73,7 +73,7 @@
</div>
</div>
<span class="btn btn-primary no-print" onclick="Printer.print()">列印</span>
<span class="btn btn-primary no-print" id="printBtn" onclick="Printer.print()">列印</span>
<select id="paperSizeSel" onchange="Printer.render()">
<!-- onchange="Printer.render()"-->
<option value="">紙張尺寸</option>
@@ -128,6 +128,7 @@
observer: null,
isInit: true,
toast: null,
mode:"",
bg: [
{ name: "超薦1", path: "../../../admin/print/html/tablet-1_new.svg" },
{ name: "超薦2", path: "../../../admin/print/html/tablet-1B_new.svg" },
@@ -138,6 +139,7 @@
this.toast = new bootstrap.Toast($('#liveToast'));
let HTTP_HOST = "<%=UrlHost()%>";
this.http_host = HTTP_HOST;
//
Promise.all([
this.getActItem(),
@@ -283,6 +285,7 @@
this.printData.forEach(x => {
let style = self.allStyle.find(y => y.styleID == x.style);
//用來印內容的尺寸
console.log("style.paperSize:", style.paperSize)
let size = self.allSize.find(y => y.paperID == style.paperSize);
//包含空白用來折的尺寸
let printSize = self.allSize.find(y => y.paperID == style.printSize);
@@ -384,7 +387,7 @@
"column-gap": "1px",
"row-gap": "1px",
"align-items": "center",
"justify-content": "space-between",
"justify-content": "start",
});
mid.forEach(z => {
@@ -1192,10 +1195,16 @@
}, 1200);
},
}
$(document).click(function (e) {
$(document).ready(function (e) {
//if (!$("#customMenu").is(e.target) && $("#customMenu").has(e.target).length === 0) {
// $("#customMenu").hide();
//}
console.log(localStorage.getItem("mode"))
if (localStorage.getItem("mode") && localStorage.getItem("mode") == "preview") {
//this.mode = "preview"
$("#printBtn").attr("style", "display:none")
$("#customMenu").attr("style","display:none")
}
});
$(() => Printer.init());
</script>
web/admin/print/tablet_edit/editorNewOne.html
+14 -9
View File
@@ -1249,7 +1249,7 @@
} else if ($(self.selectedElement).children().first().hasClass("lefttitle") ||
$(self.selectedElement).children().first().hasClass("righttitle") ||
$(self.selectedElement).children().first().hasClass("address")) {
//要重新render陽上
let data = []
if ($(self.selectedElement).children().first().hasClass("lefttitle")) {
$(self.selectedElement).empty();
@@ -1340,7 +1340,7 @@
"align-items": "flex-start",
"justify-content": "start",
});
console.log("吼優:",mid);
//console.log("吼優:",mid);
mid.forEach(x => {
let dd = $(`<div>${x}</div>`).css({
"margin-bottom": "10px",
@@ -1378,7 +1378,7 @@
"column-gap": "1px",
"row-gap": "1px",
"align-items": "center",
"justify-content": "space-between",
"justify-content": "start",
});
mid.forEach(z => {
@@ -1594,6 +1594,9 @@
self.renderItem(element);
}
$("#toast_body").html(`${"新增成功"}`)
$("#family_txt").val("");
$("#title_txt").val("");
$("#deceased_sel").val("False")
self.toast.show();
} else {
@@ -1604,6 +1607,7 @@
event.preventDefault()
//console.log("tabletItem:", designer.tabletItem);
//拚牌位的內容
console.log("AA")
let self = this;
let tablet = {
mid_items: designer.family_deceased_N_selected,
@@ -1613,7 +1617,7 @@
mid_right: designer.family_right_title,
addr_items: designer.family_address
}
//console.log(JSON.stringify(tablet));
console.log("BB")
var pro_order_detail =
{
num: designer.tabletItem.num <= 0 ? null : designer.tabletItem.num,
@@ -1639,7 +1643,7 @@
customize_data: designer.tabletItem.customize_data,
style: designer.selectStyle.style
}
console.log("CC")
await axios
.post('/api/order/SaveDetailData', pro_order_detail)
.then(response => {
@@ -1734,6 +1738,7 @@
//designer.toast.show();
//designer.reset();
let e = event.originalEvent;
console.log("QOO");
if (e.origin === window.parent.location.origin) {
//console.log('editor.html - origin check passed');
//console.log('editor.html - received data:', event.data);
@@ -1744,7 +1749,7 @@
designer.family_right_title = [];
designer.http_host = receivedData.host;
designer.follower_id = receivedData.follower_id;
console.log("三小:", receivedData.tabletItem)
if (receivedData.tabletItem) {
//console.log('editor.html - updating tabletItem:', receivedData.tabletItem);
designer.tabletItem = receivedData.tabletItem;
@@ -1752,9 +1757,9 @@
designer.familyMembers = receivedData.familyMembers; // 更新 familyMembers
//console.log("app mounted, window message: ", this.familyMembers, receivedData);
}
if (receivedData.tabletItem) {
designer.tabletItem = receivedData.tabletItem;
}
//if (receivedData.tabletItem) {
// designer.tabletItem = receivedData.tabletItem;
//}
//console.log("actitem:", receivedData.tabletItem.actitem_num_selected.val);
if (receivedData.tabletItem.style) {
web/admin/print/tablet_edit/editornew.html
+6 -6
View File
@@ -175,7 +175,7 @@
class="checkbox-narrow d-inline-flex align-center" />
</v-list-item-action>
<v-list-item-content>
<v-list-item-title>
<v-list-item-title :title="member.fam_name">
<span class="badge-zero" v-if="member.num==0">0</span>
<span class="badge-deceased" v-if="member.deceased">{{ member.deceased ? '卍' : '' }}</span>
{{ member.fam_name }}
@@ -215,7 +215,7 @@
<v-list-item-group>
<v-list-item v-for="member in family_deceased_Y_unselected" :key="member.fam_name">
<v-list-item-content>
<v-list-item-title>
<v-list-item-title :title="member.fam_name">
<span class="badge-deceased" v-if="member.deceased">{{ member.deceased ? '卍' : '' }}</span>
{{ member.fam_name }}
<v-chip v-if="member.fam_title" small>
@@ -265,9 +265,9 @@
class="checkbox-narrow d-inline-flex align-center" />
</v-list-item-action>
<v-list-item-content>
<v-list-item-title>
<v-list-item-title :title="member.fam_name">
<span class="badge-zero" v-if="member.num==0">0</span>
<span class="badge-deceased" v-if="member.deceased">{{ member.deceased ? '卍' : '' }}</span>
<span class="badge-deceased" v-if="member.deceased" >{{ member.deceased ? '卍' : '' }}</span>
{{ member.fam_name }}
<v-chip v-if="member.fam_title" small>
{{ member.fam_title }}
@@ -305,8 +305,8 @@
<v-list-item-group>
<v-list-item v-for="member in family_deceased_N_unselected" :key="member.fam_name">
<v-list-item-content>
<v-list-item-title>
<span class="badge-deceased" v-if="member.deceased">{{ member.deceased ? '卍' : '' }}</span>
<v-list-item-title :title="member.fam_name">
<span class="badge-deceased" v-if="member.deceased" >{{ member.deceased ? '卍' : '' }}</span>
{{ member.fam_name }}
<v-chip v-if="member.fam_title" small>
{{ member.fam_title }}