From e427e49f5d31384d01676705699ebbddd7f9a4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 20 Nov 2023 15:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/issueRequestMain/index.ts                      | 7 ++++++-
 src/views/wms/issueManage/issue/issueRequestMain/index.vue | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/issueRequestMain/index.ts b/src/api/wms/issueRequestMain/index.ts
index f38498d16..0db70e281 100644
--- a/src/api/wms/issueRequestMain/index.ts
+++ b/src/api/wms/issueRequestMain/index.ts
@@ -59,7 +59,12 @@ export const deleteIssueRequestMain = async (id: number) => {
 
 // 导出发料申请主 Excel
 export const exportIssueRequestMain = async (params) => {
-  return await request.download({ url: `/wms/issue-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/issue-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/issue-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index f54535c09..d21bfcb60 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -178,7 +178,7 @@ const butttondata = (row) => {
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
         defaultButtons.mainListEditBtn({hasPermi:'wms:issue-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
     ]
 }
 
@@ -237,7 +237,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await IssueRequestMainApi.exportIssueRequestMain(setSearchParams)
+    const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params)
     download.excel(data, '发料申请主.xlsx')
   } catch {
   } finally {