Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

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

@@ -14,7 +14,7 @@
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformjob:exportExcel']">导出</el-button>
    </div>
    <el-table class="mb20" v-loading="loading" :data="list" stripe>
    <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
      <el-table-column prop="contractNum" label="合同号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="reason" label="入园原因" min-width="100" show-overflow-tooltip />
      <el-table-column prop="totalNum" label="总作业量(万支)" min-width="120" show-overflow-tooltip />
@@ -50,14 +50,16 @@
import QueryForm from '@/components/common/QueryForm'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import DriverDetail from "@/views/task/driverDetail"
import DriverDetail from '@/views/task/driverDetail'
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm,
@@ -77,7 +79,8 @@
        total: 0
      },
      filters: {
        selDate: [],
        createDateStart: '',
        createDateEnd: '',
        fastdate: 0
      },
      list: [],
@@ -99,10 +102,10 @@
            label: '驾驶员'
          },
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '',
            pickerOptions: {}
            filed1: 'createDateStart',
            filed2: 'createDateEnd',
            type: 'datetime',
            label: '创建时间'
          },
          {
            type: 'slot',
@@ -121,14 +124,16 @@
  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.createDateStart = arr[0]
      this.filters.createDateEnd = arr[1]
      this.getList(1)
    },
    changeForm(str) {
      if (str === 'selDate') {
        this.$set(this.filters, 'fastdate', null)
        this.getList()
      if (this.filters.createDateStart > this.filters.createDateEnd) {
        this.filters.createDateStart = this.filters.createDateEnd
        return this.$message.error('开始时间不能大于结束时间')
      }
      this.getList()
    },
    getList(page) {
      const { pagination, filters } = this
@@ -136,9 +141,7 @@
      platformJobPage({
        model: {
          ...filters,
          jobType: 1,
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          jobType: 1
        },
        sorts: [{ direction: 'DESC', property: 'create_date' }],
        capacity: pagination.pageSize,
@@ -149,7 +152,12 @@
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒')
          if (item.workTime && item.workTime >= 24 * 60 * 60) {
            item.workTime = dayjs.duration(item.workTime, 'seconds').format('D天H时m分s秒')
          } else {
            item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒')
          }
          // item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒')
        })
        this.pagination.total = res.total || 0
      }, () => {
@@ -168,11 +176,15 @@
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.exLoading = true
          const { filters } = this
          platformJobExport({
            page: this.pagination.page,
            capacity: 1000000,
            jobType: 1,
            model: this.filters
            model: {
              ...filters,
              jobType: 1
            },
            sorts: [{ direction: 'DESC', property: 'create_date' }],
            capacity: 10000,
            page: 1,
          })
            .then(response => {
              this.download(response)
@@ -189,7 +201,6 @@
      this.pagination.page = 1
      this.filters = {
        selDate: [],
        fastdate: 0
      }
      this.getList()
    },
@@ -204,7 +215,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
      this.getList(1)
    }
  }
}