From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 230 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 189 insertions(+), 41 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index d2673f6..fd6b9ad 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -7,41 +7,91 @@
@clear="clear"
/>
<!-- -->
- <el-tabs v-model="activeTab">
+ <el-tabs v-model="filters.queryType" @tab-click="(e) => getList(1)">
<el-tab-pane label="寰呭鐞�" name="0">
<template #label>
<span
>寰呭鐞�
- <el-badge :value="11" class="item" type="danger"> </el-badge>
+ <el-badge
+ v-if="headData.noticeWaitNum"
+ :value="headData.noticeWaitNum"
+ class="item"
+ type="danger"
+ >
+ </el-badge>
</span>
</template>
</el-tab-pane>
- <el-tab-pane label="宸插鐞�" name="1"></el-tab-pane>
- <el-tab-pane label="鎴戝彂璧风殑" name="2"></el-tab-pane>
- <el-tab-pane label="鎶勯�佹垜鐨�" name="3"></el-tab-pane>
+ <el-tab-pane :value="headData.noticeDealNum" label="宸插鐞�" name="1">
+ <template #label>
+ <span
+ >宸插鐞�
+ <el-badge
+ v-if="headData.noticeDealNum"
+ :value="headData.noticeDealNum"
+ class="item"
+ type="danger"
+ >
+ </el-badge>
+ </span>
+ </template>
+ </el-tab-pane>
+ <el-tab-pane :value="headData.noticeCreateNum" label="鎴戝彂璧风殑" name="2">
+ <template #label>
+ <span
+ >鎴戝彂璧风殑
+ <el-badge
+ v-if="headData.noticeCreateNum"
+ :value="headData.noticeCreateNum"
+ class="item"
+ type="danger"
+ >
+ </el-badge>
+ </span>
+ </template>
+ </el-tab-pane>
+ <el-tab-pane :value="headData.noticeCopyNum" label="鎶勯�佹垜鐨�" name="3">
+ <template #label>
+ <span
+ >鎶勯�佹垜鐨�
+ <el-badge
+ v-if="headData.noticeCopyNum"
+ :value="headData.noticeCopyNum"
+ class="item"
+ type="danger"
+ >
+ </el-badge>
+ </span>
+ </template>
+ </el-tab-pane>
</el-tabs>
<el-table
v-loading="loading"
- :data="list"
+ :data="dataList"
stripe
row-key="id"
default-expand-all
>
- <el-table-column
- prop="name"
- label="浠诲姟绫诲瀷"
- min-width="100"
- ></el-table-column>
- <el-table-column
- prop="name"
- label="鎻愪氦浜�"
- min-width="80"
- ></el-table-column>
- <el-table-column
- prop="companyNamePath"
- label="鎻愪氦鏃堕棿"
- min-width="100"
- ></el-table-column>
+ <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="80">
+ <template v-slot="scope">
+ <span v-if="scope.row.title">{{
+ scope.row.title.split(" - ")[1]
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
<template slot-scope="{ row }">
<el-button
@@ -59,62 +109,160 @@
:pagination="pagination"
/>
<TaskDetail v-if="isShowDetail" ref="DetailRef" />
+ <VisReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
+ <DangetDetail v-if="isShowDanger" ref="DangetDetailRef" />
+ <!-- 鐢ㄨ溅鐢宠 -->
+ <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="getList"/>
+ <!-- 闅愭偅 -->
+ <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="getList"/>
+ <!-- 棰勭害璇︽儏 -->
+ <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import TaskDetail from './taskDetail.vue'
+import TaskDetail from './visSubDetail.vue'
+import VisReportDetail from './visReportDetail.vue'
+import DangetDetail from './dangetDetail.vue'
+import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
+import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
+import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
+import {
+ taskCenterHead,
+ taskCenterPage
+} from '@/api'
export default {
components: {
TaskDetail,
+ VisReportDetail,
+ DangetDetail,
QueryForm,
- Pagination
+ Pagination,
+ OperaCarUseBookWindow,
+ OperaHiddenDangerWindow,
+ OperaVisitsDesWindow
},
data () {
return {
isShowDetail: false,
- activeTab: '0',
- filters: {},
+ isShowReport: false,
+ isShowDanger: false,
+ filters: {
+ queryType: '0'
+ },
queryFormConfig: {
formItems: [
{
- filed: 'taskType',
+ filed: 'type',
type: 'select',
label: '浠诲姟绫诲瀷',
- options: []
+ clearable: false,
+ options: [
+ { label: '璁垮鐢宠', value: '0' },
+ { label: '璁垮鎶ュ', value: '1' },
+ { label: '鐢ㄨ溅鐢宠', value: '2' },
+ { label: '闅愭偅闅忔墜鎷�', value: '3' },
+ { label: '鐗╂祦杞︾敵璇�', value: '4' }
+ ]
},
{
- filed: 'status',
+ filed: 'selDate',
type: 'daterange',
label: ''
}
],
online: true
},
- loading: false,
- sorting: false,
- searchForm: {
- // type: 1
- },
pagination: {
capacity: 10,
page: 1
},
- list: [{}],
- total: 0
+ loading: false,
+ dataList: [],
+ headData: {},
+ total: 0,
+
+ cateList: [
+ { name: '璁垮鐢宠', id: 0 },
+ { name: '璁垮鎶ュ', id: 1 },
+ { name: '鐢ㄨ溅鐢宠', id: 2 },
+ { name: '闅愭偅闅忔墜鎷�', id: 3 },
+ { name: '鐗╂祦杞︾敵璇�', id: 4 }
+ ]
}
},
+ created () {
+ this.getHeadData()
+ this.getList()
+ },
methods: {
- handleDetail () {
- this.isShowDetail = true
- this.$nextTick(() => {
- this.$refs.DetailRef.isShowModal = true
+ handleDetail (row) {
+ if (row.objType === 2) {
+ this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)
+ return
+ }
+ if (row.objType === 1) {
+ this.isShowReport = true
+ this.$nextTick(() => {
+ this.$refs.VisReportDetailRef.id = row.objId
+ this.$refs.VisReportDetailRef.type = row.objType
+ this.$refs.VisReportDetailRef.getDetail()
+ this.$refs.VisReportDetailRef.isShowModal = true
+ })
+ return
+ }
+ if (row.objType === 3) {
+ const obj = { ...row, id: row.objId }
+ this.$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', obj)
+ return
+ }
+ if (row.objType === 0) {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.DetailRef.id = row.objId
+ this.$refs.DetailRef.type = row.objType
+ this.$refs.DetailRef.getDetail()
+ this.$refs.DetailRef.isShowModal = true
+ })
+ }
+ },
+ getList (page) {
+ console.log(this.filters)
+ const { filters, pagination } = this
+ if (filters.selDate && filters.selDate.length > 0) {
+ filters.startDate = filters.selDate[0]
+ filters.endDate = filters.selDate[1]
+ } else {
+ filters.startDate = null
+ filters.endDate = null
+ }
+ pagination.page = page || pagination.page
+ taskCenterPage({
+ model: { ...filters, queryType: Number(filters.queryType) },
+ ...pagination
+ }).then(res => {
+ console.log('res', res)
+ this.dataList = res.records || []
+ this.dataList.forEach(i => {
+ i.param1 = JSON.parse(i.param1)
+ })
})
},
- getList (page) { },
- clear () { },
+ getHeadData () {
+ taskCenterHead({
+ isDetail: '1'
+ }).then(res => {
+ this.headData = res
+ })
+ },
+ clear () {
+ this.filters = {
+ queryType: '0'
+ }
+ this.getList(0)
+ },
handleSizeChange (capacity) {
this.pagination.capacity = capacity
}
--
Gitblit v1.9.3