Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-09 0e35f7cdaecc1c05f6a28784c2d66ce623ff77f1

 admin/src/views/platform/queueUp.vue

@@ -21,9 +21,9 @@
        <span></span>
      </div>
    </div>
    <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
    <el-table v-if="activeGroup.type == 2" class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
      <el-table-column type="index" label="序号" width="80" />
      <el-table-column label="车牌号" width="160">
      <el-table-column label="车牌号" width="130">
        <template slot-scope="{ row }">
          <div class="plate_id">
            <span>{{ row.carCodeFront.slice(0, 1) }}</span>
@@ -33,19 +33,46 @@
          </div>
        </template>
      </el-table-column>
      <el-table-column prop="carrierName" label="运输公司" min-width="200" />
      <el-table-column prop="billCode" label="运单号" min-width="200" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="130" />
      <el-table-column prop="driverName" label="驾驶员" min-width="140">
      <el-table-column prop="contractNum" label="合同单号" min-width="120" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" />
      <el-table-column label="驾驶员" min-width="130">
        <template slot-scope="{ row }">
          <span class="mr10">{{ row.driverName }}</span>
          <span>{{ row.drivierPhone }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" width="100" fixed="right">
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">运单详情</el-button>
          <el-button v-if="activeGroup.type == 2" type="text" @click="subDetail(row)">预约详情</el-button>
        </template>
      </el-table-column>
    </el-table>
    <el-table v-else class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
      <el-table-column type="index" label="序号" width="80" />
      <el-table-column label="车牌号" width="130">
        <template slot-scope="{ row }">
          <div class="plate_id">
            <span>{{ row.carCodeFront.slice(0, 1) }}</span>
            <span>{{ row.carCodeFront.slice(1, 2) }}</span>
            <span>·</span>
            <span>{{ row.carCodeFront.slice(2) }}</span>
          </div>
        </template>
      </el-table-column>
      <el-table-column prop="carrierName" label="运输公司" min-width="120" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" />
      <el-table-column label="驾驶员" min-width="130">
        <template slot-scope="{ row }">
          <span class="mr10">{{ row.driverName }}</span>
          <span>{{ row.drivierPhone }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -55,12 +82,14 @@
    <PlatformSign ref="PlatformSignRef" v-if="isPlatformSign" @success="getPlatGroupList"
      @close="isPlatformSign = false" />
    <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
  </div>
</template>

<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import DriverDetail from "@/views/task/driverDetail.vue"
import {
  getPlatformGroupList,
  platformLineUpPage,
@@ -74,16 +103,20 @@
    Pagination,
    QueryForm,
    PlatformSign,
    WaybillDetail
    WaybillDetail,
    DriverDetail
  },
  data() {
    return {
      filters: {},
      activeGroup: {},
      activeGroup: {
        type: 2
      },
      PlatGroupList: [],
      staticParam: {},
      dataList: [],
      loading: false,
      isShowDriver: false,
      isPlatformSign: false,
      pagination: {
        pageSize: 10,
@@ -104,6 +137,12 @@
      this.$nextTick(() => {
        this.$refs.PlatformSignRef.isShowModal = true
        this.$refs.PlatformSignRef.activePlat = this.activeGroup
        this.$refs.PlatformSignRef.carCodeFront = ''
        this.$refs.PlatformSignRef.pagination = {
          total: 0,
          pageSize: 10,
          page: 1
        }
        this.$refs.PlatformSignRef.getList()
      })
    },
@@ -119,6 +158,7 @@
          } else {
            this.activeGroup = res[0]
          }

          this.getPlatformGroupWork()
          this.getList()
        }
@@ -165,10 +205,21 @@
      this.filters = {}
      this.getList()
    },
    subDetail(row) {
      this.isShowDriver = true
      this.$nextTick(() => {
        this.$refs.DriverDetailRef.id = row.bookId
        this.$refs.DriverDetailRef.type = row.objType
        this.$refs.DriverDetailRef.getDetail()
        this.$refs.DriverDetailRef.isShowModal = true
      })
    },
    handleDetail(row) {
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.WaybillDetailRef.isShowModal = true
        this.$refs.WaybillDetailRef.id = row.id
        this.$refs.WaybillDetailRef.getDetail()
      })
    },
  }
@@ -204,7 +255,7 @@

.plate_id {
  display: flex;
  width: 111px;
  width: 120px;
  font-weight: 600;
  height: 30px;
  line-height: 30px;