Merge remote-tracking branch 'origin/master'

k94314517

2025-07-09 06b2f5be922e87d086d1d4e6cdcc2119e7d3a1a4

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

@@ -1,6 +1,6 @@
<template>
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
    <QueryForm ref="QueryForm" v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
      @clear="clear">
      <template #fastdate>
        <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
@@ -14,10 +14,13 @@
      <el-button type="primary" @click="complete(ids)">完成作业</el-button>
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformjob:exportExcel']">导出</el-button>
      <el-button :loading="updateLoading" @click="updateTotalNum"
        v-permissions="['business:platformjob:updateTotalNum']">重置总作业量</el-button>
    </div>
    <el-table :height="tableHeightNew" v-loading="loading" :data="list" @selection-change="handleSelectionChange" stripe>
      <el-table-column type="selection" width="55"></el-table-column>
      <el-table-column prop="billCode" label="运单号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="totalNum" label="总作业量（万支）" min-width="130" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="车牌前照号" min-width="100" show-overflow-tooltip />
      <!-- <el-table-column prop="carCodeBack" label="车牌后照号" min-width="100" show-overflow-tooltip /> -->
      <el-table-column prop="taskOrigin" label="任务来源" min-width="100" show-overflow-tooltip />
@@ -44,9 +47,10 @@
          <span>{{ statusMap[scope.row.status] }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="editUserName" label="最后操作人员" min-width="150" show-overflow-tooltip />
      <el-table-column prop="name" label="操作" min-width="170" align="center" fixed="right" show-overflow-tooltip>
        <template v-slot="scope">
          <el-button type="text" @click="complete([scope.row.id])" v-if="[0,1].includes(scope.row.status)">完成作业</el-button>
          <el-button type="text" @click="complete([scope.row.id])" v-if="[0,1,2].includes(scope.row.status)">完成作业</el-button>
          <el-button v-if="scope.row.status == '12'" type="text" class="red"
            v-permissions="['business:platformjob:delete']" @click="handleDel(scope.row)">删除</el-button>
          <el-button v-if="scope.row != 12" type="text" v-permissions="['business:platformjob:query']"
@@ -64,7 +68,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { platformJobPage, platformJobExport, platformJobDel, dealJobFinish } from '@/api'
import { platformJobPage, platformJobExport, platformJobDel, dealJobFinish ,updateTotalNum} from '@/api'
import { statusMap } from '../config'
import WaybillDetailRef from "../components/WaybillDetail.vue"
import GlobalWindow from '@/components/common/GlobalWindow'
@@ -86,6 +90,7 @@
      statusMap,
      isShowDetail: false,
      exLoading: false,
      updateLoading: false,
      loading: false,
      pagination: {
        pageSize: 10,
@@ -136,7 +141,7 @@
              { value: 7, label: '转移中' },
              { value: 8, label: '异常挂起' },
              { value: 9, label: '已授权离园' },
              { value: 10, label: '已离园' },
              // { value: 10, label: '已离园' },
              { value: 11, label: '已过号' },
              { value: 12, label: '已取消' },
            ]
@@ -172,6 +177,9 @@
  },
  created() {
    this.changeRadio('0')
    this.$nextTick(() => {
      this.$refs.QueryForm.zkBtn()
    })
  },
  methods: {
    handleSelectionChange(ids) {
@@ -263,6 +271,19 @@
            })
        })
    },
    updateTotalNum() {
      this.$dialog.actionConfirm('确认进行该操作吗？','操作提示')
        .then(() => {
          this.updateLoading = true
          updateTotalNum('')
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.updateLoading = false
            })
        })
    },
    clear() {
      this.pagination.page = 1
      this.filters = {}