From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 18 十月 2024 14:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/views/task/index.vue |   50 +++++++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 8d1c350..28e27df 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,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,9 +130,10 @@
       isShowDetail: false,
       isShowReport: false,
       isShowDanger: false,
+      isShowDriver: false,
       filters: {
         queryType: '0',
-        fastdate: 0
+        // fastdate: 0
       },
       queryFormConfig: {
         formItems: [
@@ -192,7 +183,7 @@
   },
   created () {
     // this.getHeadData()
-    this.changeRadio('0')
+    // this.changeRadio('0')
     this.getList()
   },
   methods: {
@@ -200,6 +191,10 @@
       const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
       this.$set(this.filters, 'selTime', arr)
       this.getList()
+    },
+    SubSuccess(str) {
+      this[str] = false
+      this.getTaskList()
     },
     handleDetail (row) {
       if (this.filters.queryType == 3) {
@@ -229,6 +224,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 +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]
@@ -284,7 +289,6 @@
     clear () {
       this.filters = {
         queryType: '0',
-        fastdate: 0
       }
       this.getList(0)
     },

--
Gitblit v1.9.3