From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/views/task/index.vue |   83 ++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index ca44648..686c2a4 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -36,32 +36,8 @@
         </template>
       </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>
@@ -83,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">
@@ -124,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" />
     <!-- 闅愭偅 -->
@@ -139,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 {
-  taskCenterHead,
-  taskCenterPage
+  taskCenterHeadPC,
+  taskCenterPage,
+  taskSignRead
 } from '@/api'
 export default {
   components: {
@@ -153,6 +119,7 @@
     VisReportDetail,
     DangetDetail,
     QueryForm,
+    DriverDetail,
     Pagination,
     OperaCarUseBookWindow,
     OperaHiddenDangerWindow,
@@ -163,6 +130,7 @@
       isShowDetail: false,
       isShowReport: false,
       isShowDanger: false,
+      isShowDriver: false,
       filters: {
         queryType: '0',
         fastdate: 0
@@ -173,7 +141,6 @@
             filed: 'type',
             type: 'select',
             label: '浠诲姟绫诲瀷',
-            clearable: false,
             options: [
               { label: '璁垮鐢宠', value: '0' },
               { label: '璁垮鎶ュ', value: '1' },
@@ -226,8 +193,16 @@
       this.getList()
     },
     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) {
@@ -243,6 +218,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) {
@@ -263,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]
@@ -285,9 +270,15 @@
       })
     },
     getHeadData () {
-      taskCenterHead({
-        isDetail: '1'
-      }).then(res => {
+      const { filters } = this
+      if (filters.selTime && filters.selTime.length > 0) {
+        filters.startDate = filters.selTime[0]
+        filters.endDate = filters.selTime[1]
+      } else {
+        filters.startDate = null
+        filters.endDate = null
+      }
+      taskCenterHeadPC({ ...filters, queryType: Number(filters.queryType), isDetail: '1' }).then(res => {
         this.headData = res
       })
     },

--
Gitblit v1.9.3