From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 8d1c350..686c2a4 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -59,24 +59,11 @@
:data="dataList"
stripe
row-key="id"
+ class="mb20"
default-expand-all
>
-<!-- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
- <template v-slot="scope">
- <span
- v-if="
- (scope.row.objType || scope.row.objType == 0) &&
- cateList[scope.row.objType].name
- "
- >{{ cateList[scope.row.objType].name }}</span
- >
- </template>
- </el-table-column>-->
<el-table-column label="澶勭悊浜嬮」" min-width="200">
<template slot-scope="{ row }"> {{ row.title}}
-<!-- <span v-if="row.title">{{
- row.title.split("-")[1]
- }}</span>-->
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
@@ -100,6 +87,7 @@
<TaskDetail v-if="isShowDetail" ref="DetailRef" />
<VisReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
<DangetDetail v-if="isShowDanger" ref="DangetDetailRef" />
+ <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
<!-- 鐢ㄨ溅鐢宠 -->
<OperaCarUseBookWindow ref="OperaDetailsWindow" @success="getList" />
<!-- 闅愭偅 -->
@@ -115,6 +103,7 @@
import TaskDetail from './visSubDetail.vue'
import VisReportDetail from './visReportDetail.vue'
import DangetDetail from './dangetDetail.vue'
+import DriverDetail from './driverDetail.vue'
import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
@@ -130,6 +119,7 @@
VisReportDetail,
DangetDetail,
QueryForm,
+ DriverDetail,
Pagination,
OperaCarUseBookWindow,
OperaHiddenDangerWindow,
@@ -140,6 +130,7 @@
isShowDetail: false,
isShowReport: false,
isShowDanger: false,
+ isShowDriver: false,
filters: {
queryType: '0',
fastdate: 0
@@ -229,6 +220,17 @@
this.$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', obj)
return
}
+ if (row.objType === 6) {
+ const obj = { ...row, id: row.objId }
+ this.isShowDriver = true
+ this.$nextTick(() => {
+ this.$refs.DriverDetailRef.id = row.objId
+ this.$refs.DriverDetailRef.type = row.objType
+ this.$refs.DriverDetailRef.getDetail()
+ this.$refs.DriverDetailRef.isShowModal = true
+ })
+ return
+ }
if (row.objType === 0) {
this.isShowDetail = true
this.$nextTick(() => {
@@ -247,7 +249,6 @@
},
getList (page) {
this.getHeadData()
- console.log(this.filters)
const { filters, pagination } = this
if (filters.selTime && filters.selTime.length > 0) {
filters.startDate = filters.selTime[0]
--
Gitblit v1.9.3