From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 686c2a4..97d8c7f 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -62,10 +62,11 @@
class="mb20"
default-expand-all
>
- <el-table-column label="澶勭悊浜嬮」" min-width="200">
+ <el-table-column label="澶勭悊浜嬮」" min-width="160">
<template slot-scope="{ row }"> {{ row.title}}
</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">
@@ -73,7 +74,6 @@
<el-button
type="text"
@click="handleDetail(row)"
- v-permissions="['business:company:update']"
>鏌ョ湅璇︽儏</el-button
>
</template>
@@ -84,10 +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" />
- <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
+ <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" />
<!-- 闅愭偅 -->
@@ -109,6 +109,7 @@
import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
import dayjs from 'dayjs'
import {
+ getAppHeaderNav,
taskCenterHeadPC,
taskCenterPage,
taskSignRead
@@ -133,7 +134,7 @@
isShowDriver: false,
filters: {
queryType: '0',
- fastdate: 0
+ // fastdate: 0
},
queryFormConfig: {
formItems: [
@@ -165,12 +166,12 @@
},
pagination: {
capacity: 10,
- page: 1
+ page: 1,
+ total: 0,
},
loading: false,
dataList: [],
headData: {},
- total: 0,
cateList: [
{ name: '璁垮鐢宠', id: 0 },
@@ -183,7 +184,7 @@
},
created () {
// this.getHeadData()
- this.changeRadio('0')
+ // this.changeRadio('0')
this.getList()
},
methods: {
@@ -192,7 +193,26 @@
this.$set(this.filters, 'selTime', arr)
this.getList()
},
+ SubSuccess(str) {
+ this[str] = false
+ this.getTaskList()
+ },
+ handleTest (row) {
+ getAppHeaderNav(5).then(res => {
+ if (res === undefined || res == null) {
+ return
+ }
+ const myWindow = window.open(res)
+ setTimeout(() => {
+ myWindow.postMessage('{"method":"goToApp","argument":' + row.param5 + '}', '*')
+ }, 3000)
+ })
+ },
handleDetail (row) {
+ if (row.type === 7) {
+ this.handleTest(row);
+ return
+ }
if (this.filters.queryType == 3) {
taskSignRead({
noticesId: row.id,
@@ -264,6 +284,7 @@
}).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)
})
@@ -285,7 +306,6 @@
clear () {
this.filters = {
queryType: '0',
- fastdate: 0
}
this.getList(0)
},
--
Gitblit v1.9.3