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

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

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

@@ -13,10 +13,12 @@
    <div class="pt16">
      <el-button type="primary" @click="handleEdit" icon="el-icon-plus"
        v-permissions="['business:platformbooks:create']">新建</el-button>
      <el-button type="primary" @click="complete(ids)">完成作业</el-button>
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformbooks: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="contractNum" label="合同/单据编号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="inReason" label="入园原因" min-width="100" show-overflow-tooltip />
      <el-table-column prop="totalNum" label="总作业量(万支)" min-width="100" show-overflow-tooltip />
@@ -25,6 +27,12 @@
      <el-table-column prop="driverName" label="驾驶员" min-width="100" show-overflow-tooltip />
      <el-table-column prop="driverPhone" label="联系方式" min-width="100" show-overflow-tooltip />
      <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="[2,3,4].includes(scope.row.status)">{{ statusMap[scope.row.jobStatus] || '' }}</span>
          <span v-else>-</span>
        </template>
      </el-table-column>
      <el-table-column prop="arriveDate" label="预约到场时间" min-width="150" show-overflow-tooltip />
      <el-table-column label="审批结果" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
@@ -37,10 +45,12 @@
      </el-table-column>
      <el-table-column prop="auditName" label="当前审批人" min-width="100" show-overflow-tooltip />
      <el-table-column prop="editDate" label="操作时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="name" label="操作" min-width="120" align="center" fixed="right" show-overflow-tooltip>
      <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" v-permissions="['business:platformbooks:detail']"
            @click="handleDetail(scope.row)">预约详情</el-button>
          <el-button type="text" @click="complete([scope.row.jobId])" v-if="[0,1,2].includes(scope.row.jobStatus)">完成作业</el-button>
          <el-button type="text" class="red" v-permissions="['business:platformbooks:delete']"
            @click="handleDel(scope.row)">删除</el-button>
        </template>
@@ -106,12 +116,13 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { platformBooksPage, platformReasonList, platformBooksApply, platformBooksExport } from '@/api'
import { platformBooksPage, platformReasonList, platformBooksApply, platformBooksExport, dealJobFinish } from '@/api'
import { checkSurplusNum, deletebooksById } from '@/api/platform/platform'
import DriverDetail from '@/views/task/driverDetail'
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { Message } from 'element-ui'
import { statusMap } from '../config'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
@@ -125,6 +136,7 @@
  },
  data() {
    return {
      statusMap,
      isShowDriver: false,
      exLoading: false,
      loading: false,
@@ -177,6 +189,26 @@
            label: '合同单号'
          },
          {
            filed: 'jobStatus',
            type: 'select',
            label: '作业状态',
            options: [
              { value: 0, label: '待确认' },
              { value: 1, label: '待签到' },
              { value: 2, label: '等待叫号' },
              { value: 3, label: '入园等待' },
              { value: 4, label: '月台等待' },
              { value: 5, label: '作业中' },
              { value: 6, label: '作业完成' },
              { value: 7, label: '转移中' },
              { value: 8, label: '异常挂起' },
              { value: 9, label: '已授权离园' },
              // { value: 10, label: '已离园' },
              { value: 11, label: '已过号' },
              { value: 12, label: '已取消' },
            ]
          },
          {
            filed: 'status',
            type: 'select',
            label: '审批结果',
@@ -189,10 +221,16 @@
            ]
          },
          {
            filed: 'reasonId',
            type: 'select',
            label: '入园原因',
            options: []
          },
          {
            filed1: 'arriveDateStart',
            filed2: 'arriveDateEnd',
            type: 'datetime',
            label: '操作时间'
            label: '预约到场时间'
          },
          {
            type: 'slot',
@@ -201,14 +239,37 @@
          }
        ],
        online: true
      }
      },
      ids: []
    }
  },
  created() {
    this.changeRadio('0')
    this.getplatformReasons()
    // this.getList()
  },
  methods: {
    handleSelectionChange(ids) {
      this.ids = ids.map(item => item.jobId)
    },
    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(() => {

      });
    },
    checkSurplus() {
      const { arriveDate, reasonId, totalNum } = this.param
      if (!arriveDate || !reasonId || !totalNum) return
@@ -217,8 +278,6 @@
        reasonId,
        totalNum
      }).then(res => {
        console.log('res', res)

        if (res == 0 || res < Number(totalNum)) {
          Message.error(`当日剩余可预约作业量${res}万支不足请选择其他到场日期`)
        }
@@ -316,6 +375,16 @@
        this.reasonList = res || []
      })
    },
    getplatformReasons() {
      platformReasonList().then(res => {
        this.queryFormConfig.formItems[5].options = (res || []).map(item => {
          return {
            value: item.id,
            label: item.reason
          }
        })
      })
    },
    handleSub() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {