From 7b5f1e33b4936c02fbe31d4b064ea3873da2e511 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 18 九月 2025 14:06:55 +0800
Subject: [PATCH] 发货弹窗成品料架
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 147ff47..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,
@@ -115,7 +116,7 @@
}
})
const basicProp = ref({
- pageSize : 100,//椤甸潰鏄剧ず鏁伴噺
+ pageSize : 10000,//椤甸潰鏄剧ず鏁伴噺
pageNum:1,//褰撳墠椤�
selectDate:['',''],//鏌ヨ鐨勬棩鏈�
pageTotal : 0,//鎬婚〉鏁�
@@ -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
@@ -190,7 +200,8 @@
</script>
<template>
- <div class="main-div">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
v-model="orderInfo.reportFormDate"
type="daterange"
@@ -205,10 +216,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"
@@ -227,7 +239,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="text"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -239,6 +254,10 @@
orderInfo.reportFormDate)">
{{$t('basicData.export')}}</vxe-button>
</template>
+ <template #buttons>
+ <slot name="buttons"></slot>
+ </template>
+
<template #pager>
<!--浣跨敤 pager 鎻掓Ы-->
@@ -273,13 +292,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