From 98c6e4b8500d05cd183c5ef327ef7dc6c6d62a8b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 1 Dec 2023 10:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=92=8C=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobMain/index.ts                | 7 ++++++-
 src/api/wms/purchasereceiptRequestMain/index.ts            | 7 ++++++-
 src/components/Form/src/Form.vue                           | 2 +-
 src/views/wms/countManage/count/countPlanMain/index.vue    | 2 +-
 .../purchasereceipt/purchasereceiptJobMain/index.vue       | 2 +-
 .../purchasereceipt/purchasereceiptRequestMain/index.vue   | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 6c8965e80..44601138e 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -80,7 +80,12 @@ export const deletePurchasereceiptJobMain = async (id: number) => {
 
 // 导出采购收货任务主 Excel
 export const exportPurchasereceiptJobMain = async (params) => {
-  return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts
index 9d5c588d7..4aa84e577 100644
--- a/src/api/wms/purchasereceiptRequestMain/index.ts
+++ b/src/api/wms/purchasereceiptRequestMain/index.ts
@@ -64,7 +64,12 @@ export const deletePurchasereceiptRequestMain = async (id: number) => {
 
 // 导出采购收货申请主 Excel
 export const exportPurchasereceiptRequestMain = async (params) => {
-  return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index ecd52eca9..16a4a1000 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -228,7 +228,7 @@ export default defineComponent({
           formItemSlotsSearchList[item.field] = () => {
           return (
             <>
-              <ElTooltip placement="top"  content={formModel.value[item.field]} visible={formModel.value[item.field]}>
+              <ElTooltip placement="top"  content={formModel.value[item.field]} >
                 <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  />
               </ElTooltip>
               <ElButton icon={Search} onClick={()=>{
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index f27acef75..46c9e687b 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -53,7 +53,7 @@
     :tableData="tableData"
     :apiUpdate="CountPlanMainApi.updateCountPlanMain"
     :apiCreate="CountPlanMainApi.createCountPlanMain"
-    :isBusiness="true"
+    :isBusiness="false"
     fromeWhere="countPlan"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 0144dd0e8..ef1305dde 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -210,7 +210,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(setSearchParams)
+    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
     download.excel(data, '采购收货任务主.xlsx')
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 45532afac..9b9ce77ec 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -297,7 +297,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(setSearchParams)
+    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
     download.excel(data, '采购收货申请主.xlsx')
   } catch {
   } finally {