记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 3c0847d7 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'pre' into 'master' 

提交 快递面单 76*130

See merge request !349
parents aeb27e75 1231da58
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ 3c0847d7
...@@ -219,10 +219,10 @@ ...@@ -219,10 +219,10 @@
LODOP.ADD_PRINT_LINE("0mm", "76mm", "127mm", "76mm", 0, 1); LODOP.ADD_PRINT_LINE("0mm", "76mm", "127mm", "76mm", 0, 1);
LODOP.ADD_PRINT_LINE("127mm", "0mm", "0mm", "0mm", 0, 1); LODOP.ADD_PRINT_LINE("127mm", "0mm", "0mm", "0mm", 0, 1);
LODOP.ADD_PRINT_LINE("127mm", "0mm", "127mm", "76mm", 0, 1); LODOP.ADD_PRINT_LINE("127mm", "0mm", "127mm", "76mm", 0, 1);
LODOP.ADD_PRINT_TEXT(22, 50, 200, 20, "打印时间：" + getNowFormatDate()); LODOP.ADD_PRINT_TEXT(22, 70, 200, 20, "打印时间：" + getNowFormatDate());
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(32, 123, 200, 20, "第" + index + "/" + listLen + "个"); LODOP.ADD_PRINT_TEXT(32, 93, 200, 20, "第" + index + "/" + listLen + "个");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(60, 17, 100, 20, "FQ"); LODOP.ADD_PRINT_TEXT(60, 17, 100, 20, "FQ");
...@@ -236,9 +236,9 @@ ...@@ -236,9 +236,9 @@
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 26); LODOP.SET_PRINT_STYLEA(0, "FontSize", 26);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(125, 10, 500, 45, dataInfo.destRouteLabel); LODOP.ADD_PRINT_TEXT(125, 10, 450, 45, dataInfo.destRouteLabel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 28); LODOP.SET_PRINT_STYLEA(0, "FontSize", 22);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(181, 59, 189, 20, dataInfo.expressContacts); LODOP.ADD_PRINT_TEXT(181, 59, 189, 20, dataInfo.expressContacts);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
...@@ -295,11 +295,11 @@ ...@@ -295,11 +295,11 @@
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(325, 212, 180, 15, jTel); LODOP.ADD_PRINT_TEXT(325, 207, 180, 15, jTel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(340, 70, 255, 25, jAddress); LODOP.ADD_PRINT_TEXT(340, 70, 250, 25, jAddress);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
View file @ 3c0847d7
...@@ -153,10 +153,10 @@ ...@@ -153,10 +153,10 @@
LODOP.ADD_PRINT_LINE("0mm", "76mm", "127mm", "76mm", 0, 1); LODOP.ADD_PRINT_LINE("0mm", "76mm", "127mm", "76mm", 0, 1);
LODOP.ADD_PRINT_LINE("127mm", "0mm", "0mm", "0mm", 0, 1); LODOP.ADD_PRINT_LINE("127mm", "0mm", "0mm", "0mm", 0, 1);
LODOP.ADD_PRINT_LINE("127mm", "0mm", "127mm", "76mm", 0, 1); LODOP.ADD_PRINT_LINE("127mm", "0mm", "127mm", "76mm", 0, 1);
LODOP.ADD_PRINT_TEXT(22, 50, 200, 20, "打印时间：" + getNowFormatDate()); LODOP.ADD_PRINT_TEXT(22, 70, 200, 20, "打印时间：" + getNowFormatDate());
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(32, 123, 200, 20, "第" + index + "/" + listLen + "个"); LODOP.ADD_PRINT_TEXT(32, 93, 200, 20, "第" + index + "/" + listLen + "个");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(60, 17, 100, 20, "FQ"); LODOP.ADD_PRINT_TEXT(60, 17, 100, 20, "FQ");
...@@ -170,9 +170,9 @@ ...@@ -170,9 +170,9 @@
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 26); LODOP.SET_PRINT_STYLEA(0, "FontSize", 26);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(125, 10, 500, 45, dataInfo.destRouteLabel); LODOP.ADD_PRINT_TEXT(125, 10, 450, 45, dataInfo.destRouteLabel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 28); LODOP.SET_PRINT_STYLEA(0, "FontSize", 22);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(181, 59, 189, 20, dataInfo.expressContacts); LODOP.ADD_PRINT_TEXT(181, 59, 189, 20, dataInfo.expressContacts);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
...@@ -229,11 +229,11 @@ ...@@ -229,11 +229,11 @@
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(325, 212, 180, 15, jTel); LODOP.ADD_PRINT_TEXT(325, 207, 180, 15, jTel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(340, 70, 255, 25, jAddress); LODOP.ADD_PRINT_TEXT(340, 70, 250, 25, jAddress);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment