From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index e49d379..1744a32 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -9,10 +9,12 @@
import {ElMessage} from "element-plus";
import * as XLSX from "xlsx";
import {useI18n} from "vue-i18n";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
const { t } = useI18n()
const xGrid = ref()
let filterData = ref({})
+const orderInfo = useOrderInfoStore()
const gridOptions = reactive({
loading:true,
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -113,7 +115,7 @@
}
})
const basicProp = ref({
- pageSize : 100,//椤甸潰鏄剧ず鏁伴噺
+ pageSize : 10000,//椤甸潰鏄剧ず鏁伴噺
pageNum:1,//褰撳墠椤�
selectDate:['',''],//鏌ヨ鐨勬棩鏈�
pageTotal : 0,//鎬婚〉鏁�
@@ -172,12 +174,12 @@
}
const getReportData = () => {
- request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${basicProp.value.selectDate}`,filterData.value).then(res => {
+ request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then(res => {
if(res.code === '200'){
props.childrenData.data = res.data.data
basicProp.value.pageTotal = res.data.total.pageTotal
basicProp.value.dataTotal = res.data.total.total
- basicProp.value.selectDate = res.data.selectDate
+ orderInfo.reportFormDate = res.data.selectDate
}
})
}
@@ -188,9 +190,10 @@
</script>
<template>
- <div class="main-div">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="basicProp.selectDate"
+ v-model="orderInfo.reportFormDate"
type="daterange"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
@@ -203,10 +206,11 @@
type="primary"
style="margin-top: -5px"
:icon="Search">{{$t('basicData.search')}}</el-button>
- <div class="order-detail">
+ </div>
+ <div class="main-table">
<vxe-grid
@filter-change="filterChanged"
- height="110%"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -225,7 +229,10 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -234,7 +241,7 @@
<vxe-button style="margin-right: 0.5rem"
@click="exportExcel(props.childrenData.exportUrl,
props.childrenData.exportName,
- basicProp.selectDate)">
+ orderInfo.reportFormDate)">
{{$t('basicData.export')}}</vxe-button>
</template>
@@ -271,13 +278,14 @@
border: none !important;
background-color: transparent;
}
-.order-primary{
+.head{
width: 100%;
+ height: 35px;
}
-.order-detail{
- width: 100%;
- height: calc(100% - 30px);
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
.vxe-grid {
--
Gitblit v1.8.0