Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-16 611e8f7f1986e96980712a083d06b7cfe45f928c

 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)
    },