From 1ae471941bbdf9dde5dba668d33acf415fc6ec07 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 16:54:48 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/task/index.vue | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index d4a61d0..ac5d8d1 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -59,26 +59,14 @@
: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">
+ <el-table-column label="澶勭悊浜嬮」" min-width="160">
<template slot-scope="{ row }"> {{ row.title}}
-<!-- <span v-if="row.title">{{
- row.title.split("-")[1]
- }}</span>-->
</template>
</el-table-column>
+ <el-table-column prop="info" label="褰撳墠闃舵" min-width="100"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
</el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
@@ -86,7 +74,6 @@
<el-button
type="text"
@click="handleDetail(row)"
- v-permissions="['business:company:update']"
>鏌ョ湅璇︽儏</el-button
>
</template>
@@ -97,9 +84,10 @@
@current-change="getList"
:pagination="pagination"
/>
- <TaskDetail v-if="isShowDetail" ref="DetailRef" />
- <VisReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
- <DangetDetail v-if="isShowDanger" ref="DangetDetailRef" />
+ <TaskDetail v-if="isShowDetail" ref="DetailRef" @close="isShowDetail = false" @success="SubSuccess('isShowDetail')" />
+ <VisReportDetail v-if="isShowReport" ref="VisReportDetailRef" @close="isShowReport = false" @success="SubSuccess('isShowReport')" />
+ <DangetDetail v-if="isShowDanger" ref="DangetDetailRef" @close="isShowDanger = false" @success="SubSuccess('isShowDanger')" />
+ <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" @close="isShowDriver = false" @success="SubSuccess('isShowDriver')" />
<!-- 鐢ㄨ溅鐢宠 -->
<OperaCarUseBookWindow ref="OperaDetailsWindow" @success="getList" />
<!-- 闅愭偅 -->
@@ -115,13 +103,15 @@
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'
import dayjs from 'dayjs'
import {
taskCenterHeadPC,
- taskCenterPage
+ taskCenterPage,
+ taskSignRead
} from '@/api'
export default {
components: {
@@ -129,6 +119,7 @@
VisReportDetail,
DangetDetail,
QueryForm,
+ DriverDetail,
Pagination,
OperaCarUseBookWindow,
OperaHiddenDangerWindow,
@@ -139,9 +130,10 @@
isShowDetail: false,
isShowReport: false,
isShowDanger: false,
+ isShowDriver: false,
filters: {
queryType: '0',
- fastdate: 0
+ // fastdate: 0
},
queryFormConfig: {
formItems: [
@@ -173,12 +165,12 @@
},
pagination: {
capacity: 10,
- page: 1
+ page: 1,
+ total: 0,
},
loading: false,
dataList: [],
headData: {},
- total: 0,
cateList: [
{ name: '璁垮鐢宠', id: 0 },
@@ -191,7 +183,7 @@
},
created () {
// this.getHeadData()
- this.changeRadio('0')
+ // this.changeRadio('0')
this.getList()
},
methods: {
@@ -200,9 +192,21 @@
this.$set(this.filters, 'selTime', arr)
this.getList()
},
+ SubSuccess(str) {
+ this[str] = false
+ this.getTaskList()
+ },
handleDetail (row) {
+ if (this.filters.queryType == 3) {
+ taskSignRead({
+ noticesId: row.id,
+ signType: 0
+ }).then(res => {
+ this.getHeadData()
+ })
+ }
if (row.objType === 2) {
- this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)
+ this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', { ...row, id: row.objId })
return
}
if (row.objType === 1) {
@@ -218,6 +222,17 @@
if (row.objType === 3) {
const obj = { ...row, id: row.objId }
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) {
@@ -238,7 +253,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]
@@ -254,13 +268,14 @@
}).then(res => {
console.log('res', res)
this.dataList = res.records || []
+ this.pagination.total = res.total || 0
this.dataList.forEach(i => {
i.param1 = JSON.parse(i.param1)
})
})
},
getHeadData () {
- const {filters} = this
+ const { filters } = this
if (filters.selTime && filters.selTime.length > 0) {
filters.startDate = filters.selTime[0]
filters.endDate = filters.selTime[1]
@@ -275,7 +290,6 @@
clear () {
this.filters = {
queryType: '0',
- fastdate: 0
}
this.getList(0)
},
--
Gitblit v1.9.3