Merge remote-tracking branch 'origin/master'

jiangping

2025-03-27 7b51c9e1abc198a501f7858599da9c116130fd6f

 admin/src/views/platform/LogisticsRecord/leaveAuth.vue

@@ -14,7 +14,7 @@
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformjob:exportExcel']">导出</el-button>
    </div>
    <el-table :height="tableHeightNew"  v-loading="loading" :data="list" stripe>
    <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
      <el-table-column type="index" label="序号" width="70" show-overflow-tooltip />
      <el-table-column prop="billCode" label="运单号/合同号" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
@@ -74,7 +74,7 @@
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight";
import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
  extends: BaseComputHeight,
  components: {
@@ -97,7 +97,9 @@
      },
      filters: {
        selDate: [],
        fastdate: 0
        fastdate: 0,
        beginDoneDateStart: '',
        beginDoneDateEnd: ''
      },
      list: [],
      queryFormConfig: {
@@ -131,11 +133,17 @@
              { value: '6', label: '未授权' }
            ]
          },
          // {
          //   filed: 'selDate',
          //   type: 'datetimerange',
          //   label: '作业完成时间搜索',
          //   pickerOptions: {}
          // },
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '作业完成时间搜索',
            pickerOptions: {}
            filed1: 'beginDoneDateStart',
            filed2: 'beginDoneDateEnd',
            type: 'datetime',
            label: '作业完成时间搜索'
          },
          {
            type: 'slot',
@@ -154,8 +162,9 @@
  methods: {
    changeRadio(day) {
      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, 'selDate', arr)
      this.getList()
      this.filters.beginDoneDateStart = arr[0]
      this.filters.beginDoneDateEnd = arr[1]
      this.getList(1)
    },
    changeForm(str) {
      if (str === 'selDate') {
@@ -169,9 +178,7 @@
      platformJobPage({
        model: {
          ...filters,
          queryStatus: '6,9,10,2,3,4',
          beginDoneDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginDoneDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          queryStatus: '6,9,10,2,3,4'
        },
        sorts: [{ direction: 'DESC', property: 'DONE_DATE' }],
        capacity: pagination.pageSize,
@@ -206,7 +213,7 @@
          platformJobExport({
            page: this.pagination.page,
            capacity: 1000000,
            queryStatus: '6,9,10',
            queryStatus: '6,9,10,2,3,4',
            model: this.filters
          })
            .then(response => {
@@ -238,7 +245,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
      this.getList(1)
    }
  }
}