@@ -225,8 +225,8 @@
allSize: [
],
bg: [
- { name: "黃1", path: "../../admin/print/html/tablet-1.svg" },
- { name: "黃2", path: "../../admin/print/html/tablet-1B.svg" },
+ { name: "黃1", path: "../../admin/print/html/tablet-1_new.svg" },
+ { name: "黃2", path: "../../admin/print/html/tablet-1B_new.svg" },
{ name: "紅1", path: "../../admin/print/html/tablet-2.svg" },
{ name: "紅2", path: "../../admin/print/html/tablet-2B.svg" }
],
@@ -572,6 +572,13 @@
},
changePrintSize() {
+ },
+ changePosition() {
+ //this.activeId = id;
+ const el = this.elements.find(x => x.id === this.activeId);
+ el.x=$('#xPosition').val();
+ el.y = $("#yPosition").val();
+ $(`.tablet-element[id="${this.activeId}"]`).css({ left: el.x + "mm", top: el.y + "mm" });
},
changePaper() {
let paperSize = $("#paperSize").val()
@@ -599,6 +606,9 @@
.post(HTTP_HOST + 'api/tablet/SavePaperSize', ps)
.then(response => {
if (response.status == "200") {
+ if (response.data.result=="Y") {
+ alert("ok");
+ }
}
});
@@ -926,7 +936,7 @@
const id = `${prefix}-${Date.now()}-${i}`;
this.elements.push({
id, type: 'title', text: `正名${i}`, x: 100 - (i * 30), y: 80,
- style: { fontSize: 24, fontFamily: 'Kaiti', isVertical: true }
+ style: { fontSize: 24, fontFamily: 'DFKai-sb', isVertical: true }
});
}
//this.render();
@@ -937,7 +947,7 @@
this.elements.push({
id: 'combined-' + Date.now(), type: 'combined-center', text: '林張\n氏歷代祖先', x: 130, y: 80,
- style: { fontSize: 24, fontFamily: 'Kaiti', isVertical: true }
+ style: { fontSize: 24, fontFamily: 'DFKai-sb', isVertical: true }
});
//this.render();
},
@@ -1015,7 +1025,11 @@
await axios
.post(HTTP_HOST + `api/tablet/${path}`, master)
.then(response => {
- console.log(response);
+ if (response.status == "200") {
+ if (response.data.result == "Y") {
+ alert("ok");
+ }
+ }
});
}
};
diff --git a/web/admin/order/reg.aspx b/web/admin/order/reg.aspx
index fe2482e..fe1c0cd 100644
--- a/web/admin/order/reg.aspx
+++ b/web/admin/order/reg.aspx
@@ -2576,7 +2576,7 @@
mdi-close
-
+
diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx
index cf9b22d..c5300ae 100644
--- a/web/admin/print/print_multi_new.aspx
+++ b/web/admin/print/print_multi_new.aspx
@@ -14,38 +14,16 @@
-
-
+ <%--
--%>
列印
-