From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index c4d2c55..d5f8fc3 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -14,7 +14,7 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
<!-- <el-table-column prop="carCodeBack" label="杞︾墝鍚庣収鍙�" min-width="100" show-overflow-tooltip /> -->
@@ -61,6 +61,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import BasePage from '@/components/base/BasePage'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import WaybillDetailRef from "../components/WaybillDetail.vue"
@@ -76,6 +77,7 @@
GlobalWindow,
UploadFaceImg
},
+ extends: BasePage,
data() {
return {
statusMap,
@@ -190,7 +192,7 @@
})
},
handleDel(row) {
- this.$dialog.exportConfirm('纭鍒犻櫎鍚楋紵').then(() => {
+ this.$dialog.deleteConfirm('纭鍒犻櫎鍚楋紵').then(() => {
platformJobDel(row.id).then(res => {
Message.success('鍒犻櫎鎴愬姛')
this.getList()
@@ -201,11 +203,17 @@
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
+ const { filters } = this
platformJobExport({
page: this.pagination.page,
capacity: 1000000,
jobType: '0',
- model: this.filters
+ model: {
+ ...filters,
+ jobType: '0',
+ createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ }
})
.then(response => {
this.download(response)
@@ -222,9 +230,9 @@
this.pagination.page = 1
this.filters = {
selDate: [],
- fastdate: 0
}
- this.changeRadio('0')
+ this.getList()
+ // this.changeRadio('0')
},
handleDetail(row) {
this.isShowDetail = true
--
Gitblit v1.9.3