Merge remote-tracking branch 'origin/master'

jiangping

2025-04-01 92e2f86210ebaca3f0b4af21c64d22cc91dffba4

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

@@ -11,10 +11,12 @@
      </template>
    </QueryForm>
    <div class="pt16">
      <el-button type="primary" @click="complete(ids)">完成作业</el-button>
      <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" @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="carCodeFront" label="车牌前照号" min-width="100" show-overflow-tooltip />
      <!-- <el-table-column prop="carCodeBack" label="车牌后照号" min-width="100" show-overflow-tooltip /> -->
@@ -27,7 +29,7 @@
        <span v-if="scope.row.platformWmsJob">{{ scope.row.platformWmsJob.contractNum }}</span>
      </template>
      </el-table-column>-->
      <el-table-column prop="inTypeTemp" label="作业类型" min-width="100" show-overflow-tooltip>
      <el-table-column label="作业类型" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span v-if="scope.row.type == '0'">自有车卸货</span>
          <span v-if="scope.row.type == '1'">自有车装货</span>
@@ -37,13 +39,14 @@
        </template>
      </el-table-column>
      <el-table-column prop="ioCreatedate" label="创建时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="name" label="作业状态" min-width="100" show-overflow-tooltip>
      <el-table-column label="作业状态" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span>{{ statusMap[scope.row.status] }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="name" label="操作" min-width="120" align="center" fixed="right" 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 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']"
@@ -61,7 +64,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { platformJobPage, platformJobExport, platformJobDel, dealJobFinish } from '@/api'
import { statusMap } from '../config'
import WaybillDetailRef from "../components/WaybillDetail.vue"
import GlobalWindow from '@/components/common/GlobalWindow'
@@ -139,6 +142,18 @@
            ]
          },
          {
            filed: 'type',
            type: 'select',
            label: '作业类型',
            options: [
              { value: 0, label: '自有车卸货' },
              { value: 1, label: '自有车装货' },
              { value: 2, label: '外协车卸货' },
              { value: 3, label: '外协车装货' },
              { value: 4, label: '市公司外协车卸货' }
            ]
          },
          {
            filed1: 'createDateStart',
            filed2: 'createDateEnd',
            type: 'datetime',
@@ -152,12 +167,34 @@
        ],
        online: true
      },
      ids: []
    }
  },
  created() {
    this.changeRadio('0')
  },
  methods: {
    handleSelectionChange(ids) {
      this.ids = ids.map(item => item.id)
    },
    complete(ids) {
      var that = this;
      if (ids.length === 0) {
        return this.$message.warning('至少选择一项内容')
      }
      this.$confirm('是否确认完成作业？, 是否确认?', '提示', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        dealJobFinish(ids)
          .then(res => {
            that.getList()
          })
      }).catch(() => {

      });
    },
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.filters.createDateStart = arr[0]