From caca10d4ab8bc3d79b1c2f80b332ef6296f29e5e Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 11 Nov 2024 15:16:34 +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/apply_plan_detail.js      |  3 +-
 .../child/demand_plan_detail_list.js          | 56 +++++++++----------
 page/demandPlan/child/delivery_all_list.html  |  4 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/js/demandPlan/child/apply_plan_detail.js b/js/demandPlan/child/apply_plan_detail.js
index 0995b7d..dac5d6a 100644
--- a/js/demandPlan/child/apply_plan_detail.js
+++ b/js/demandPlan/child/apply_plan_detail.js
@@ -87,7 +87,8 @@ function exportData() {
     let params = {
         "id": idParam
     }
-    exportCommon(bonuspath + '/backstage/planApplication/exportDetail', 'POST', params, "机具明细");
+    let url = dataUrl + "backstage/export/exportDetail";
+    exportExcelUtil(url, '机具明细', JSON.stringify(params));
 }
 
 
diff --git a/js/demandPlan/child/demand_plan_detail_list.js b/js/demandPlan/child/demand_plan_detail_list.js
index 4378fd0..fcf31a5 100644
--- a/js/demandPlan/child/demand_plan_detail_list.js
+++ b/js/demandPlan/child/demand_plan_detail_list.js
@@ -17,34 +17,34 @@ function setParams(obj) {
 // 查询/重置
 function queryTable(type) {
     if (type === 1) {
-      reloadTable(1);
+        reloadTable(1);
     } else if (type === 2) {
-      $('#keyWord').val('');
-      layui.form.render();
-      reloadTable(1);
+        $('#keyWord').val('');
+        layui.form.render();
+        reloadTable(1);
     }
-  }
-  
-  // 刷新页面数据
-  function reloadData() {
+}
+
+// 刷新页面数据
+function reloadData() {
     reloadData(pageNum);
-  }
-  
-  // 重载表格
-  function reloadTable(pageNum) {
+}
+
+// 重载表格
+function reloadTable(pageNum) {
     table.reload("currentTableId", {
-      page: {
-        curr: pageNum ? pageNum : 1,
-      },
-      where: {
-        encryptedData: JSON.stringify({
-          'keyWord': $('#keyWord').val(),
-          'proId': objParam.proId
-        }),
-      },
+        page: {
+            curr: pageNum ? pageNum : 1,
+        },
+        where: {
+            encryptedData: JSON.stringify({
+                'keyWord': $('#keyWord').val(),
+                'proId': objParam.proId
+            }),
+        },
     },
     );
-  }
+}
 
 function initTable() {
     tableIns = table.render({
@@ -135,7 +135,7 @@ function initTable() {
                         let html = "";
                         html += "<a onclick='plan_detail(" + JSON.stringify(d) + ")'>详情</a>";
                         return html;
-                      },
+                    },
                 },
             ]
         ],
@@ -167,14 +167,14 @@ function setNumColor(value, type) {
 // 导出
 function exportExcel() {
     let params = {
-      'proName': $('#proName').val(),
-      'status': $('#status').val()
+        'keyWord': $('#keyWord').val(),
+        'proId': objParam.proId
     }
     let url = dataUrl + "backstage/export/export";
-    exportExcelUtil(url, '机具公司发货数据', JSON.stringify(params));
-  }
+    exportExcelUtil(url, '需求计划', JSON.stringify(params));
+}
 
 // 需求计划编号
-function plan_detail(obj){
+function plan_detail(obj) {
     openIframeByParamObj2("plan_detail", "机具需求计划", "/page/demandPlan/child/apply_plan_detail.html", "92%", "95%", obj);
 }
\ No newline at end of file
diff --git a/page/demandPlan/child/delivery_all_list.html b/page/demandPlan/child/delivery_all_list.html
index 744cd83..bc9fa7b 100644
--- a/page/demandPlan/child/delivery_all_list.html
+++ b/page/demandPlan/child/delivery_all_list.html
@@ -48,8 +48,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>