diff --git a/js/aq_back_material/child/back_material_details.js b/js/aq_back_material/child/back_material_details.js index b70cb4a..c00e313 100644 --- a/js/aq_back_material/child/back_material_details.js +++ b/js/aq_back_material/child/back_material_details.js @@ -43,6 +43,7 @@ function getDetailsById() { $('#phone').html(obj.phone); $('#backTime').html(obj.backTime); $('#remark').html(obj.remark); + $('#projectName').html(obj.projectName); setFileTable(obj.fileList); } } @@ -355,22 +356,14 @@ function downLoadFile(obj) { // 打印 function print() { - /* Print('#body', { - onStart: function () { - console.log('onStart', new Date()) - }, - onEnd: function () { - console.log('onEnd', new Date()) - } - }) */ - $("#main-box").print({ - globalStyles: true, - mediaPrint: false, - noPrintSelector: ".no-print", - iframe: true, - append: null, - prepend: null, - manuallyCopyFormValues: true, - deferred: $.Deferred() - }); + $("#main-box").print({ + globalStyles: true, + mediaPrint: false, + noPrintSelector: ".no-print", + iframe: true, + append: '', + prepend: null, + manuallyCopyFormValues: true, + deferred: $.Deferred() + }); } \ No newline at end of file diff --git a/page/aq_back_material/child/back_material_details.html b/page/aq_back_material/child/back_material_details.html index 3405def..7712ed4 100644 --- a/page/aq_back_material/child/back_material_details.html +++ b/page/aq_back_material/child/back_material_details.html @@ -29,15 +29,65 @@ width: 50px; height: 50px; } - @media print { - .layui-table-page { - visibility: hidden; - } + /* 签字区域样式 */ + #signature-box { + width: 100%; + margin-top: 30px; + flex-direction: column; + align-items: baseline; + justify-content: space-evenly; + } - .layui-table-cell{ - width: 145px; - } - } + .signature-table { + margin-top: 10px; + } + + .signature-table td { + vertical-align: top; + padding: 15px 10px; + } + + @media print { + .layui-table-page { + visibility: hidden; + } + + .layui-table-cell{ + width: 145px; + } + + /* 签字区域打印样式 */ + #signature-box { + page-break-inside: avoid; + break-inside: avoid; + margin-top: 20px; + } + + /* 确保各个区块不会强制分页 */ + #basic-box, + #file-box, + #fhjj-box, + #signature-box { + page-break-inside: avoid; + break-inside: avoid; + } + + .layuimini-container { + height: auto !important; + min-height: auto !important; + max-height: none !important; + } + + .layuimini-main { + height: auto !important; + min-height: auto !important; + max-height: none !important; + } + + .no-print { + display: none !important; + } + } @@ -51,7 +101,7 @@
- +
@@ -76,10 +126,12 @@ - 备注 + 备注 + 工程名称 - + +
@@ -152,6 +204,35 @@ + +
+
+ +

签字确认

+
+
+ + + + + + + +
+
记账人
+
+
+
退料人
+
+
+
制单人
+
+
+
审核人
+
+
+
+
diff --git a/page/aq_demand_plan/child/send_out_detail.html b/page/aq_demand_plan/child/send_out_detail.html index d20ee9e..4b716a1 100644 --- a/page/aq_demand_plan/child/send_out_detail.html +++ b/page/aq_demand_plan/child/send_out_detail.html @@ -182,6 +182,10 @@
+ -
+
记账人
+
+
领料人
@@ -194,10 +198,6 @@
审核人
-
出库人
-
-