From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 1744a32..b1ce3de 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -61,7 +61,8 @@
toolbarConfig: {
buttons: [],
slots: {
- tools: 'toolbar_buttons'
+ tools: 'toolbar_buttons',
+ buttons:'buttons'
},
// import: false,
// export: true,
@@ -139,8 +140,6 @@
gridOptions.columns = props.childrenData.columns
getReportData()
addListener(xGrid.value,gridOptions)
-
-
})
function filterChanged(column){
//gridOptions.loading=true
@@ -174,6 +173,17 @@
}
const getReportData = () => {
+ if(props.childrenData.model!=null){
+ request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${orderInfo.reportFormDate}/${props.childrenData.model}/${props.childrenData.scope}`,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
+ orderInfo.reportFormDate = res.data.selectDate
+ }
+ })
+ return
+ }
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
@@ -229,7 +239,7 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type"
+ <input type="text"
v-model="option.data"
@keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
@@ -244,6 +254,10 @@
orderInfo.reportFormDate)">
{{$t('basicData.export')}}</vxe-button>
</template>
+ <template #buttons>
+ <slot name="buttons"></slot>
+ </template>
+
<template #pager>
<!--浣跨敤 pager 鎻掓Ы-->
--
Gitblit v1.8.0