From cc5cbe5f75ff10dfe9b2e1131e41ea8c0f3ad500 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 11 Nov 2024 14:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/demandPlan/child/view_data_list.js |  8 ++++----
 js/demandPlan/delivery_list.js        | 13 +++++++------
 js/public.js                          | 11 ++++++-----
 page/demandPlan/delivery_list.html    |  8 ++++----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/js/demandPlan/child/view_data_list.js b/js/demandPlan/child/view_data_list.js
index be14774..b4058c8 100644
--- a/js/demandPlan/child/view_data_list.js
+++ b/js/demandPlan/child/view_data_list.js
@@ -212,12 +212,12 @@ function setNumColor(value,type) {
 
 // 导出
 function exportExcel() {
-  let encryptedData = JSON.stringify({
+  let params = {
     'proName': $('#proName').val(),
     'status': $('#status').val()
-  });
-  let url = dataUrl + "backstage/planOut/exportExcel?encryptedData=" + encryptedData;
-  exportExcelUtil(url, '机具公司发货数据');
+  }
+  let url = dataUrl + "backstage/export/export";
+  exportExcelUtil(url, '机具公司发货数据',JSON.stringify(params));
 }
 
 // 打印
diff --git a/js/demandPlan/delivery_list.js b/js/demandPlan/delivery_list.js
index 11cf857..7757c6b 100644
--- a/js/demandPlan/delivery_list.js
+++ b/js/demandPlan/delivery_list.js
@@ -135,7 +135,7 @@ function initTable() {
           align: "center",
           templet: function (d) {
             let html = "";
-            html += "<a onclick='view_plan(" + JSON.stringify(d) + ")'>"+setNumColor(d.planNum)+"</a>";
+            html += "<a onclick='view_plan(" + JSON.stringify(d) + ")'>" + setNumColor(d.planNum) + "</a>";
             return html;
           },
         },
@@ -223,6 +223,7 @@ function setStatusColor(value) {
 
 // 设置进度值
 function schedule(d) {
+  d.progress = parseFloat(d.progress);
   d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter;
   d.progress == undefined ? (d.progress = 100) : d.progress;
   var color = "layui-bg-orange";
@@ -243,12 +244,12 @@ function schedule(d) {
 
 // 导出
 function exportExcel() {
-  let encryptedData = JSON.stringify({
+  let params = {
     'proName': $('#proName').val(),
     'status': $('#status').val()
-  });
-  let url = dataUrl + "backstage/planOut/exportExcel?encryptedData=" + encryptedData;
-  exportExcelUtil(url, '机具公司发货数据');
+  }
+  let url = dataUrl + "backstage/export/export";
+  exportExcelUtil(url, '机具公司发货数据', JSON.stringify(params));
 }
 
 // 发货详情
@@ -272,6 +273,6 @@ function earlyInfo(type) {
 }
 
 // 需求计划
-function view_plan(obj){
+function view_plan(obj) {
   openIframeByParamObj("view_plan", "需求计划", "./child/demand_plan_detail_list.html", "92%", "95%", obj);
 }
\ No newline at end of file
diff --git a/js/public.js b/js/public.js
index 89c8af9..b4eafc4 100644
--- a/js/public.js
+++ b/js/public.js
@@ -58,12 +58,13 @@ function errorFn(xhr, status, error) {
 }
 
 // 公共导出excel
-function exportExcelUtil(url, fileName) {
+function exportExcelUtil(url, fileName,params) {
     let loadingMsg = layer.msg("数据导出中,请稍候...", { icon: 16, scrollbar: false, time: 0, });
     let xhr = new XMLHttpRequest();
-    xhr.open("get", url, true);
+    xhr.open("POST", url, true);
     xhr.responseType = "blob"; // 转换流
-    xhr.setRequestHeader("encauthorizationypt", sessionStorage.getItem("gz-token"));
+    xhr.setRequestHeader('Content-Type','application/json;charset=UTF-8')
+    xhr.setRequestHeader("authorization", sessionStorage.getItem("gz-token"));
     xhr.onload = function () {
         layer.close(loadingMsg);
         if (this.status === 200) {
@@ -71,14 +72,14 @@ function exportExcelUtil(url, fileName) {
             var a = document.createElement("a");
             var url = window.URL.createObjectURL(blob);
             a.href = url;
-            a.download = "机具公司发货" + getNowDate() + ".xlsx"; // 文件名
+            a.download = fileName + getNowDate() + ".xlsx"; // 文件名
         } else {
             layer.msg("数据发生异常,请稍后重试", { icon: 16, scrollbar: false, time: 2000 });
         }
         a.click();
         window.URL.revokeObjectURL(url);
     };
-    xhr.send();
+    xhr.send(params);
 }
 
 // 格式化日对象
diff --git a/page/demandPlan/delivery_list.html b/page/demandPlan/delivery_list.html
index d312ca9..e280999 100644
--- a/page/demandPlan/delivery_list.html
+++ b/page/demandPlan/delivery_list.html
@@ -89,10 +89,10 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <select id="status">
-                                        <option value="0">请选择状态</option>
-                                        <option value="2">未发货</option>
-                                        <option value="2">未发货</option>
-                                        <option value="3">全部发货</option>
+                                        <option value="">请选择状态</option>
+                                        <option value="0">未发货</option>
+                                        <option value="1">部分发货</option>
+                                        <option value="2">全部发货</option>
                                     </select>
                                     </select>
                                     </select>