Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

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

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

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