From 48b65b8e1618852345d37674042b9923e1549080 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 25 一月 2025 09:31:44 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/operationCity.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 86465e4..5ec9a53 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -137,8 +137,8 @@
model: {
...filters,
jobType: 1,
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ 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: pagination.pageSize,
@@ -149,7 +149,12 @@
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鏃秏鍒唖绉�');
+ }
+ // item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
})
this.pagination.total = res.total || 0
}, () => {
@@ -168,11 +173,17 @@
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
+ const { filters } = this
platformJobExport({
- page: this.pagination.page,
- capacity: 1000000,
- jobType: 1,
- model: this.filters
+ model: {
+ ...filters,
+ jobType: 1,
+ 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)
--
Gitblit v1.9.3