From bdad06349901c13f8ce2c9381a3ace2b7f80c652 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 14:33:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/operationCity.vue | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 2714f42..c390db5 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -14,7 +14,7 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="contractNum" label="鍚堝悓鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="reason" label="鍏ュ洯鍘熷洜" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="120" show-overflow-tooltip />
@@ -57,7 +57,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -79,7 +79,8 @@
total: 0
},
filters: {
- selDate: [],
+ createDateStart: '',
+ createDateEnd: '',
fastdate: 0
},
list: [],
@@ -101,10 +102,10 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '浣滀笟鏃堕棿'
},
{
type: 'slot',
@@ -123,14 +124,16 @@
methods: {
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
- this.$set(this.filters, 'selDate', arr)
- this.getList()
+ this.filters.createDateStart = arr[0]
+ this.filters.createDateEnd = arr[1]
+ this.getList(1)
},
changeForm(str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
+ if (this.filters.createDateStart > this.filters.createDateEnd) {
+ this.filters.createDateStart = this.filters.createDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
+ this.getList()
},
getList(page) {
const { pagination, filters } = this
@@ -138,9 +141,7 @@
platformJobPage({
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,
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -151,10 +152,10 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- 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鏃秏鍒唖绉�');
+ 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鏃秏鍒唖绉�')
})
@@ -179,9 +180,7 @@
platformJobExport({
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
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
--
Gitblit v1.9.3