From 844c062cff67840bb781563caaa3cc9731541ad4 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 11 Nov 2024 15:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/demandPlan/child/delivery_batch_list.js        |  5 +++--
 page/demandPlan/child/delivery_batch_list.html    | 15 +++++++++++----
 page/demandPlan/child/delivery_not_send_list.html |  8 ++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/js/demandPlan/child/delivery_batch_list.js b/js/demandPlan/child/delivery_batch_list.js
index 2e7194e..14ce8d4 100644
--- a/js/demandPlan/child/delivery_batch_list.js
+++ b/js/demandPlan/child/delivery_batch_list.js
@@ -261,7 +261,8 @@ function exportExcel() {
         'name': $('#name').val(),
         'module': $('#module').val(),
         'proId': objParam.proId,
-        'id': id
+        'id': id,
+        'curryDay':time
     }
     let url = dataUrl + "backstage/export/exportPcList";
     exportExcelUtil(url, '发货详情-批次-' + time, JSON.stringify(params));
@@ -269,7 +270,7 @@ function exportExcel() {
 
 // 打印
 function print() {
-    Print('#body', {
+    Print('#table-box', {
         onStart: function () {
             console.log('onStart', new Date())
         },
diff --git a/page/demandPlan/child/delivery_batch_list.html b/page/demandPlan/child/delivery_batch_list.html
index 7804fa7..6b96ff0 100644
--- a/page/demandPlan/child/delivery_batch_list.html
+++ b/page/demandPlan/child/delivery_batch_list.html
@@ -10,6 +10,11 @@
     <link rel="stylesheet" href="../../../css/public.css" media="all">
     <link rel="stylesheet" href="../../../css/demandPlan/delivery_batch_list.css" media="all">
 </head>
+<style>
+    .layuimini-container {
+        height: auto;
+    }
+</style>
 
 <body>
     <div id="main-box">
@@ -68,7 +73,8 @@
                                     <div class="layui-inline">
                                         <div class="layui-input-inline" style="width: 300px;">
                                             <input type="text" name="name" id="name" autocomplete="off"
-                                                class="layui-input" lay-affix="clear" placeholder="输入物机名称" maxlength="30">
+                                                class="layui-input" lay-affix="clear" placeholder="输入物机名称"
+                                                maxlength="30">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
@@ -84,14 +90,14 @@
                                                 class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                         <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
                                                 class="layui-icon layui-icon-download-circle"></i> 下 载</button>
-                                        <button class="layui-btn layui-btn-primary" onclick="print()"><i
-                                                class="layui-icon layui-icon-print"></i> 打 印</button>
+                                        <!-- <button class="layui-btn layui-btn-primary" onclick="print()"><i
+                                                class="layui-icon layui-icon-print"></i> 打 印</button> -->
                                     </div>
                                 </div>
                             </form>
                         </div>
                     </fieldset>
-                    <div class="table-box" table-responsive style="z-index: 1;">
+                    <div class="table-box" table-responsive style="z-index: 1;" id="table-box">
                         <table class="layui-hide" id="currentTableId" lay-filter="currentTableId2"></table>
                     </div>
                 </div>
@@ -101,6 +107,7 @@
 </body>
 <script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
 <script src="../../../js/public.js" charset="utf-8"></script>
+<script src="../../../js/Print.js" charset="utf-8"></script>
 <script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
 <script src="../../../js/demandPlan/child/delivery_batch_list.js" charset="utf-8"></script>
 
diff --git a/page/demandPlan/child/delivery_not_send_list.html b/page/demandPlan/child/delivery_not_send_list.html
index b79a34a..751ff70 100644
--- a/page/demandPlan/child/delivery_not_send_list.html
+++ b/page/demandPlan/child/delivery_not_send_list.html
@@ -15,6 +15,9 @@
         padding: 0;
         height: 100%;
     }
+    .layuimini-container {
+        height: auto;
+    }
 </style>
 <body>
     <div class="layuimini-container">
@@ -43,8 +46,8 @@
                                         class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                 <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
                                         class="layui-icon layui-icon-download-circle"></i> 下 载</button>
-                                <button class="layui-btn layui-btn-primary" onclick="print()"><i
-                                        class="layui-icon layui-icon-print"></i> 打 印</button>
+                                <!-- <button class="layui-btn layui-btn-primary" onclick="print()"><i
+                                        class="layui-icon layui-icon-print"></i> 打 印</button> -->
                             </div>
                         </div>
                     </form>
@@ -58,6 +61,7 @@
 </body>
 <script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
 <script src="../../../js/public.js" charset="utf-8"></script>
+<script src="../../../js/Print.js" charset="utf-8"></script>
 <script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
 <script src="../../../js/demandPlan/child/delivery_not_send_list.js" charset="utf-8"></script>
 
