From 1477a1353e96b5620a29c78e2b08647a1a2bc5b7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 15 十月 2024 19:07:25 +0800
Subject: [PATCH] ll
---
admin/src/views/statistics/platformRecord.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index a7edbbe..49f98e1 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -6,9 +6,10 @@
<el-table-column prop="platformGroupName" 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 />
- <el-table-column prop="startDate" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="doneDate" label="浣滀笟缁撴潫" min-width="100" show-overflow-tooltip />
- <el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip /><el-table-column prop="name"
+ <el-table-column prop="param1" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="param2" label="浣滀笟缁撴潫" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="name"
label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
<span>{{ scope.row.billCode || scope.row.contractNum }}</span>
@@ -26,8 +27,8 @@
import QueryForm from '@/components/common/QueryForm'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration);
-import { platformJobPage, getPlatformGroupList } from '@/api'
+dayjs.extend(duration)
+import { platformLogPage, getPlatformGroupList } from '@/api'
export default {
components: {
Pagination,
@@ -55,6 +56,7 @@
filed: 'platformGroupId',
type: 'select',
label: '鏈堝彴缁�',
+ placeholder: '鍏ㄩ儴鏈堝彴缁�',
options: []
},
{
@@ -85,25 +87,27 @@
})
},
getGroupList() {
- getPlatformGroupList({queryData: 0,queryType: 0}).then(res => {
+ getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
this.queryFormConfig.formItems[1].options = res.map(i => {
return {
value: i.id,
label: i.name
}
})
+ // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '鍏ㄩ儴鏈堝彴缁�' })
})
},
getList(page) {
const { pagination, filters } = this
this.loading = true
- platformJobPage({
+ platformLogPage({
model: {
...filters,
- queryStatus: '5,6,9,10',
+ queryStatus: '6,7,8',
beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
+ sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
page: page || pagination.page,
}).then(res => {
@@ -112,7 +116,7 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
})
this.pagination.total = res.total || 0
}, () => {
--
Gitblit v1.9.3