From 2ef7a952a57fe2aa679ec56b429f4e46923535b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 16:15:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 11 ++++++-----
src/main/webapp/static/js/custOrder/custOrder.js | 3 +--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index f7f038e..212a5a5 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -220,6 +220,7 @@
} else {
layer.msg(res.msg)
}
+ $(".layui-laypage-btn")[0].click();
}
})
});
@@ -270,8 +271,6 @@
var tpl = $('#pakoutPrintTpl').html();
var template = Handlebars.compile(tpl);
var html = template(res);
- console.log(html)
- console.log(res)
var box = $("#pakoutPrintBox");
box.html(html);box.show();
box.print({
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 7de315f..2e807ef 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -63,7 +63,7 @@
<script type="text/template" id="pakoutPrintTpl">
<!-- 澶� -->
- <div id="print-header">
+ <div id="print-header" style="margin-bottom: 20px">
<div style="text-align: center">
<div style="text-align: center;margin-bottom: 10px">
<span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
@@ -81,21 +81,22 @@
</div>
<div style="float: left; width: 50%; text-align: right">
<span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
-
</div>
+ <div style="clear:both;"></div>
</div>
</div>
<!-- 涓讳綋 -->
- <div style="margin-top: 100px">
+ <div style="margin-top: 10px">
{{#each data.list}}
- <div class="pakout-item" style="padding: 10px 5px 20px 5px;">
+ <div class="pakout-item" style="padding: 10px 5px 10px 5px;border-top: 1px solid #525252">
<div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-small">
{{maktx}}
</div>
- <div class="item-content" style="margin-top: 20px">
+ <div class="item-content" style="margin: 10px 0 ">
<div style="float: left;font-family: 瀹嬩綋; font-size: xx-small">{{anfme}}{{unit}}</div>
<div style="float: right;font-family: 瀹嬩綋; font-size: xx-small">璐т綅锛歿{locNo}}</div>
+ <div style="clear: both;"></div>
</div>
</div>
{{/each}}
--
Gitblit v1.9.1