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 | 163 ++++++++++++++++++++++--------------------------------
1 files changed, 66 insertions(+), 97 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 7940bfe..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,107 +1,76 @@
<script setup>
+import BasicTable from "@/components/BasicTable.vue"
+import { ref} from "vue"
+import request from "@/utils/request"
+const childrenData = ref({
+ columns:[
+ {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},
+ {field: 'order.project',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.orderId',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.batch',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'productId',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'productName',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderNumber',width:120, title: '璁㈠崟搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ // {field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'width',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'height',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'quantity',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'bendRadius',width:120, title: '寮挗寮у害',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'grossArea',width:120, title: '瀹為檯闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'computeGrossArea',width:150, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'shape',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'edgingType',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.processingNote',width:140, title: '涓诲姞宸ヨ姹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'processingNote',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.remarks',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.icon',width:120, title: '鍟嗘爣閫夐」',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.packType',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ // {field: 'prodID',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'perimeter',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'price',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'grossAmount',width:120, title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.alType',width:120, title: '閾濇潯鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ // {field: 'prodID',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.salesman',width:120, title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.deliveryAddress',width:120, title: '閫佽揣鍦板潃',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.creator',width:120, title: '鍒跺崟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'createTime',width:120, title: '寤虹珛鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'totalThickness',width:120, title: '鎬诲帤搴�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'levelOne',width:120, title: '浜у搧澶х被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'levelTwo',width:120, title: '浜у搧灏忕被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.customerBatch',width:120, title: '瀹㈡埛鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ ],//琛ㄦ牸琛ㄥご瀛楁
+ data:[],//琛ㄦ牸鏁版嵁
+ url :'/order/getOrderReport',
+ footList:['quantity','grossArea','computeGrossArea','perimeter','price','grossAmount']
+})
-import {Folder, Search} from "@element-plus/icons-vue";
+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)
+ // }
-let titleList = [
- '搴忓彿',
- '璁㈠崟绫诲瀷',
- '瀹㈡埛鍚嶇О',
- '椤圭洰鍚嶇О',
- '閿�鍞崟鍙�',
- '鎵规',
- '浜у搧缂栧彿',
- '浜у搧缂栫爜',
- '浜у搧鍚嶇О',
- '璁㈠崟搴忓彿',
- '妤煎彿',
- '瀹�',
- '楂�',
- '鏁伴噺',
- '鍗婂緞',
- '瀹為檯闈㈢Н',
- '缁撶畻鎬婚潰绉�',
- '褰㈢姸',
- '纾ㄨ竟绫诲瀷',
- '涓诲姞宸ヨ姹�',
- '鍔犲伐瑕佹眰',
- '澶囨敞',
- '鍟嗘爣閫夐」',
- '鍖呰鏂瑰紡',
- '宸ヨ壓娴佺▼',
- '鍛ㄩ暱',
- '鍗曚环',
- '閲戦',
- '閾濇潯鏂瑰紡',
- '璁㈠崟绫诲瀷',
- '涓氬姟鍛�',
- '閫佽揣鍦板潃',
- '鍒跺崟鍛�',
- '寤虹珛鏃堕棿',
- '鎬诲帤搴�',
- '浜у搧澶х被',
- '浜у搧灏忕被',
- '瀹㈡埛鎵规'
-
-
-]
+ })
</script>
<template>
- <div class="main-div">
- <el-date-picker
- v-model="value1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- />
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Folder">瀵煎嚭</el-button>
- <div class="order-detail">
- <el-table
- :data="dataList"
- :header-cell-style="{ 'text-align': 'center' }"
- :cell-style="{ 'text-align': 'center' }"
- border
- >
-
- <el-table-column type="expand" fixed>
- <template #default="props" >
- <div m="4">
- <p m="t-0 b-2">: {{ props.row['2'] }}</p>
- </div>
- </template>
- </el-table-column>
-
-
- <el-table-column
- :prop="index.toString()"
- :show-overflow-tooltip='true'
- width="100" v-for="(item,index) in titleList"
- :label="item" />
- </el-table>
- </div>
- </div>
+ <basic-table
+ :childrenData="childrenData"/>
</template>
<style scoped>
-.main-div {
- width: 100%;
- height: 100%;
-}
-.el-col{
- border: #181818 1px solid;
-}
-:deep(.el-table .el-input__wrapper) {
- box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
- cursor: default;
- border: none !important;
- background-color: transparent;
-}
-.order-primary{
- width: 100%;
-}
-.order-detail{
- width: 100%;
- height: 80%;
-}
</style>
\ No newline at end of file
--
Gitblit v1.8.0