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/operation.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index ebb64e6..1dd0260 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -16,7 +16,7 @@
<div class="pt16">
<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="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
@@ -57,8 +57,10 @@
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
+import BasePage from '@/components/base/BasePage'
dayjs.extend(duration);
export default {
+ extends: BasePage,
components: {
Pagination,
QueryForm,
@@ -150,7 +152,11 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if(item.workTime && item.workTime>=24*60*60 ){
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
+ }else{
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ }
})
this.pagination.total = res.total || 0
}, () => {
@@ -169,11 +175,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,
+ },
+ sorts: [{ direction: 'DESC', property: 'create_date' }],
+ capacity: 10000,
+ page: 1,
})
.then(response => {
this.download(response)
@@ -190,7 +202,6 @@
this.pagination.page = 1
this.filters = {
selDate: [],
- fastdate: 0
}
this.getList()
},
--
Gitblit v1.9.3