From 2d4615e081365ccd0d0ab15f8ccbb3389a7c2d68 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Sun, 11 Aug 2024 13:54:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestOrderMTypeMain/index.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index d472bab8e..ad1fd9943 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -691,7 +691,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, '采购收货申请主.xlsx')
+    download.excel(data, 'M类型采购收货.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

From 689c0aff72a5438297013ed7becb069fd1568db8 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sun, 11 Aug 2024 13:55:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?HL-5070=EF=BC=9A=E5=8F=91=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=85=B3=E9=97=AD=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=86=8D=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 5dca54016..9dc9bf340 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -511,10 +511,11 @@ const butttondata = (row, $index) => {
     return []
   }
   return [
-    defaultButtons.mainListPurchasePlanOpeBtn({
-      hide: isShowMainButton(row, ['5']),
-      hasPermi: 'wms:supplierdeliver-request-main:open'
-    }), // 打开
+    //202408111354需求变更供应商发货申请关闭后不能打开 去掉打开按钮
+    // defaultButtons.mainListPurchasePlanOpeBtn({
+    //   hide: isShowMainButton(row, ['5']),
+    //   hasPermi: 'wms:supplierdeliver-request-main:open'
+    // }), // 打开 
     defaultButtons.mainListPlanUploadQualityReportBtn({
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'