Merge remote-tracking branch 'origin/master'

jiangping

2024-11-05 abc14c4f8a402e4c41b0645bfa0e1c797f0210a1

 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" />
    <!-- 隐患 -->
@@ -133,7 +133,7 @@
      isShowDriver: false,
      filters: {
        queryType: '0',
        fastdate: 0
        // fastdate: 0
      },
      queryFormConfig: {
        formItems: [
@@ -165,12 +165,12 @@
      },
      pagination: {
        capacity: 10,
        page: 1
        page: 1,
        total: 0,
      },
      loading: false,
      dataList: [],
      headData: {},
      total: 0,

      cateList: [
        { name: '访客申请', id: 0 },
@@ -183,7 +183,7 @@
  },
  created () {
    // this.getHeadData()
    this.changeRadio('0')
    // this.changeRadio('0')
    this.getList()
  },
  methods: {
@@ -191,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) {
@@ -250,7 +254,7 @@
    getList (page) {
      this.getHeadData()
      const { filters, pagination } = this
      if (filters.selTime && filters.selTime.length > 0 && filters.queryType != 0) {
      if (filters.selTime && filters.selTime.length > 0) {
        filters.startDate = filters.selTime[0]
        filters.endDate = filters.selTime[1]
      } else {
@@ -264,6 +268,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 +290,6 @@
    clear () {
      this.filters = {
        queryType: '0',
        fastdate: 0
      }
      this.getList(0)
    },