From 1986841c5dc720a8e60ed25be65c181753d257ef Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 18:24:45 +0800
Subject: [PATCH] lll
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 4 ++--
admin/src/views/statistics/platformRecord.vue | 4 ++++
admin/src/views/platform/components/PlatformQueuing.vue | 3 ++-
admin/src/views/platform/LogisticsRecord/operationCity.vue | 3 +++
admin/src/views/platform/LogisticsRecord/operation.vue | 3 +++
5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index e06226e..95dd8c5 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -55,6 +55,8 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration);
export default {
components: {
Pagination,
@@ -146,6 +148,7 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
})
this.pagination.total = res.total || 0
}, () => {
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 0fbb43c..a2017c6 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -56,6 +56,8 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration);
export default {
components: {
Pagination,
@@ -147,6 +149,7 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
})
this.pagination.total = res.total || 0
}, () => {
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index d321663..a86666b 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -39,9 +39,9 @@
</el-table-column>
<el-table-column prop="name" label="鎿嶄綔" min-width="120" align="center" fixed="right" show-overflow-tooltip>
<template v-slot="scope">
- <el-button type="text" class="red" v-permissions="['business:platformjob:delete']"
+ <el-button v-if="scope.row.status == '12'" type="text" class="red" v-permissions="['business:platformjob:delete']"
@click="handleDel(scope.row)">鍒犻櫎</el-button>
- <el-button type="text" v-permissions="['business:platformjob:query']"
+ <el-button v-if="scope.row != 12" type="text" v-permissions="['business:platformjob:query']"
@click="handleDetail(scope.row)">杩愬崟璇︽儏</el-button>
</template>
</el-table-column>
diff --git a/admin/src/views/platform/components/PlatformQueuing.vue b/admin/src/views/platform/components/PlatformQueuing.vue
index 0d9b74d..c175a11 100644
--- a/admin/src/views/platform/components/PlatformQueuing.vue
+++ b/admin/src/views/platform/components/PlatformQueuing.vue
@@ -92,7 +92,8 @@
const { activePlat, callType } = this
if (callType == 1) { // 鍏ュ洯鍙彿
platformInPark({
- jobId: item.id
+ jobId: item.id,
+ platformId: activePlat.id
}).then(() => {
Message.success('鍙彿鎴愬姛')
this.getList()
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 9a2a51b..a7edbbe 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -24,6 +24,9 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration);
import { platformJobPage, getPlatformGroupList } from '@/api'
export default {
components: {
@@ -109,6 +112,7 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
})
this.pagination.total = res.total || 0
}, () => {
--
Gitblit v1.9.3