From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index 5fd969c..e37d5b3 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -1,11 +1,10 @@
 <script setup>
 import BasicTable from "@/components/BasicTable.vue"
-import request from "@/utils/request"
 import { ref} from "vue"
-
+import request from "@/utils/request"
 const childrenData = ref({
   columns:[
-    {type:'expand',fixed:"left",width: 80},
+    {type:'expand',fixed:"left",width: 80,slots: { content:'content' }},
     {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
     {field: 'order.orderType',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
     {field: 'order.customerName',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -45,10 +44,27 @@
     {field: 'order.customerBatch',width:120, title: '瀹㈡埛鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
   ],//琛ㄦ牸琛ㄥご瀛楁
   data:[],//琛ㄦ牸鏁版嵁
-  url :'/order/getOrderReport/1',
+  url :'/order/getOrderReport',
   footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']
 })
 
+request.post('/order/exportOrderReport',null,{responseType :'blob'}).then(res => {
+  const blob = new Blob([res])
+  // console.log(blob)
+  // if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
+  //   const elink = document.createElement('a')
+  //   elink.download = 'a.xlsx'
+  //   elink.style.display = 'none'
+  //   elink.href = URL.createObjectURL(blob)
+  //   document.body.appendChild(elink)
+  //   elink.click()
+  //   URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
+  //   document.body.removeChild(elink)
+  // } else { // IE10+涓嬭浇
+  //   navigator.msSaveBlob(blob, fileName)
+  // }
+
+  })
 </script>
 
 <template>

--
Gitblit v1.8.0