From 84563466c6b30007a4313ace352786ee5d72ab91 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 09 十二月 2024 15:01:37 +0800
Subject: [PATCH] 修改bug
---
admin/src/views/Inspection/components/taskDetail.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index dfe59dc..54b30a5 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -1,17 +1,23 @@
<template>
<GlobalWindow title="宸℃浠诲姟璇︽儏" :showConfirm="false" :visible.sync="isShowModal">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getDetail(1)" @clear="clear" />
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="" label="宸℃鐐瑰悕绉�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="鐘舵��" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃浜�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃璇存槑" min-width="100" show-overflow-tooltip>
- <template v-slot="scope">
- <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
+ <el-table-column prop="pointName" label="宸℃鐐瑰悕绉�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="" label="鐘舵��" min-width="100" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <span v-if="row.status == 0">寰呭紑濮�</span>
+ <span v-if="row.status == 1">宸插贰妫�</span>
</template>
</el-table-column>
+ <el-table-column prop="realname" label="宸℃浜�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="editDate" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <span class="gray" v-if="row.dealStatus == 0">姝ｅ父</span>
+ <span class="red" v-if="row.dealStatus == 1">寮傚父</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="dealInfo" label="宸℃璇存槑" min-width="100" show-overflow-tooltip />
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getDetail" :pagination="pagination" />
@@ -23,33 +29,39 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import QueryForm from '@/components/common/QueryForm'
import Pagination from '@/components/common/Pagination'
+import { getDetail } from '@/api/Inspection/ywPatrolTask'
+import dayjs from 'dayjs'
export default {
components: { GlobalWindow, QueryForm, Pagination },
data() {
return {
- isShowModal: true,
+ isShowModal: false,
id: '',
pagination: {
pageSize: 10,
page: 1,
total: 0
},
+ loading:false,
filters: {},
list: [],
total: 0,
queryFormConfig: {
formItems: [
{
- filed: 'name',
+ filed: 'pointName',
type: 'input',
label: '宸℃鐐瑰悕绉�'
},
{
filed: 'status',
type: 'select',
- label: '鎵ц鐘舵��',
+ label: '鐘舵��',
placeholder: '鍏ㄩ儴',
- options: []
+ options: [
+ { label: '寰呭紑濮�', value: 0 },
+ { label: '宸插贰妫�', value: 1 },
+ ]
},
],
online: true
@@ -60,10 +72,10 @@
getDetail(page) {
const { pagination, filters, id } = this
this.loading = true
- platformLogPage({
+ getDetail({
model: {
...filters,
- id,
+ taskId: id,
},
sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
@@ -71,11 +83,12 @@
}).then(res => {
this.loading = false
this.list = res.records || []
- this.list.forEach(item => {
- item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
- item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
- })
+ this.pagination.total = res.total
+ // this.list.forEach(item => {
+ // item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
+ // item.taskOrigin = 'WMS鑾峰彇'
+ // item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
+ // })
this.pagination.total = res.total || 0
}, () => {
this.loading = false
@@ -94,5 +107,3 @@
}
}
</script>
-
-<style lang="scss" scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3