From 4c955cdf207b30cfad957b84c3546e0d37b81493 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 08:45:00 +0800
Subject: [PATCH] 领用单打印Bug修改
---
src/main/webapp/warehouse_reagent_use.xhtml | 8 ++++----
src/main/webapp/resources/css/mybootstrap.css | 14 +++++++-------
src/main/webapp/warehouse_reagent_use_person.xhtml | 8 ++++----
src/main/webapp/personal_use_info.xhtml | 8 ++++----
src/main/webapp/login.xhtml | 2 +-
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/login.xhtml b/src/main/webapp/login.xhtml
index 478242c..e5b6af0 100644
--- a/src/main/webapp/login.xhtml
+++ b/src/main/webapp/login.xhtml
@@ -16,7 +16,7 @@
</h:head>
-<h:body style="margin: 0px">
+<h:body style="margin: 0px;height: 100%">
<div class="login">
<div name="north" style="background: url(resources/images/head_bg.png) no-repeat;background-size: 100% 100%;">
<h:form id="northForm">
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index 5b4174d..de19120 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -196,13 +196,13 @@
</h:form>
</p:dialog>
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
- width="1380">
+ width="1258">
<div id="printTarget">
- <div style=" margin: 20mm 27mm 0mm 30mm;">
+ <div style=" margin: 20mm 16mm 0mm 10mm;">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
<div>
<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
<div style="width: 98px;">单据编号:</div>
diff --git a/src/main/webapp/resources/css/mybootstrap.css b/src/main/webapp/resources/css/mybootstrap.css
index 51569da..a059eac 100644
--- a/src/main/webapp/resources/css/mybootstrap.css
+++ b/src/main/webapp/resources/css/mybootstrap.css
@@ -1,10 +1,12 @@
* {
font-size: 14px;
}
-
-html, body {
+html{
width: 100%;
height: 100%;
+}
+body {
+ width: 100%;
}
:focus {
@@ -185,11 +187,9 @@
border-color: #1B9AF7;
}
-#printTarget{
- border: solid 0 black ;
-
-
-}
+/*#printTarget{*/
+/* border: solid 0 black ;*/
+/*}*/
#apply-ui a{
display: none !important;
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index d631878..1e1f563 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -204,12 +204,12 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style="margin: 11mm 27mm 0mm 30mm;">
+ <div id="printTarget" style="margin-right: -51px;">
+ <div style="margin: 25mm 17mm 0mm 15mm;">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
<div>
<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
<div style="width: 98px;">单据编号:</div>
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index ef3181e..4a40162 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -114,12 +114,12 @@
</p:panel>
</h:form>
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style=" margin: 11mm 27mm 0mm 30mm;">
+ <div id="printTarget" style="margin-right: -51px;">
+ <div style="margin: 25mm 17mm 0mm 15mm; ">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
<div>
<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
<div style="width: 98px;">单据编号:</div>
--
Gitblit v1.9.2