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

doum

2025-10-15 2b287056e2f59518888d05a1bbc7e5a55fbd84d5

 admin/src/views/platform/components/PlatformQueuing.vue

@@ -20,13 +20,13 @@
            <div class="status">{{ statusMap[item.status] }}</div>
          </div>
          <div class="info">
            <div v-if="item.type == 4" class="ite">
              <span>合同单号：</span>
              <span>{{ item.contractNum }}</span>
            </div>
            <div v-else class="ite">
            <div v-if="item.billCode" class="ite">
              <span>运输单号：</span>
              <span>{{ item.billCode }}</span>
            </div>
            <div v-else class="ite">
              <span>合同单号：</span>
              <span>{{ item.contractNum }}</span>
            </div>
            <div class="ite">
              <span>驾驶员：</span>
@@ -38,23 +38,31 @@
            </div>
            <div class="ite">
              <span>总运输量：</span>
              <span>{{ item.totalNum }}万支</span>
              <span>{{ item.totalNum || item.ioQty }}万支</span>
            </div>
            <div v-if="item.type != 4" class="ite" style="width: 66%">
            <div v-if="item.billCode" class="ite" style="width: 66%">
              <span>运输公司：</span>
              <span>{{ item.carrierName }}</span>
            </div>
          </div>
          <div class="footer df_sb">
            <div v-if="item.type != 4" class="detail">运单详情</div>
            <div v-else></div>
            <el-button type="primary" @click="handleCall(item)">叫号</el-button>
            <div v-if="item.billCode" @click="handleDetail(item)" class="detail">运单详情</div>
            <div v-else class="detail"  @click="subDetail(item)">预约详情</div>
            <div style="display: flex; align-items: center;">
              <div style="margin-right: 15px; color: #207FF7; font-size: 13px; font-weight: 400;" v-if="item.signDate">
                签到时间：{{item.signDate.substring(5, 10)}} {{item.signDate.substring(11, 16)}}
              </div>
              <el-button v-preventReClick :loading="loadingCall" type="primary" @click="handleCall(item)">叫号</el-button>
            </div>
          </div>
        </div>
      </div>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
      </pagination>
    </div>
    <!--  -->
    <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
  </GlobalWindow>
</template>

@@ -64,10 +72,14 @@
import { platformCallList, platformCallNumber, platformInPark } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
import WaybillDetail from './WaybillDetail.vue'
import DriverDetail from "@/views/task/driverDetail.vue"
export default {
  components: {
    GlobalWindow,
    Pagination
    Pagination,
    WaybillDetail,
    DriverDetail
  },
  data() {
    return {
@@ -83,28 +95,53 @@
      title: '',
      callType: '1',
      activePlat: {},
      dataList: []
      dataList: [],
      isShowDetail: false, // 运单详情
      isShowDriver: false, // 预约详情
      loadingCall: false

    }
  },
  methods: {
    handleCall(item) {
      const { activePlat, callType } = this
      this.loadingCall = true
      if (callType == 1) { // 入园叫号
        platformInPark({
          jobId: item.id,
          platformId: activePlat.id
        }).then(() => {
          Message.success('叫号成功')
          this.getList()
        })
      } else {
        platformCallNumber({ platformId: activePlat.id, jobId: item.id }).then(res => {
          this.loadingCall = false
          Message.success('叫号成功')
          this.$emit('success')
          this.getList()
        })
        },() => {this.loadingCall = false})
      } else {
        this.loadingCall = true
        platformCallNumber({ platformId: activePlat.id, jobId: item.id }).then(res => {
          this.loadingCall = false
          Message.success('叫号成功')
          this.$emit('success')
          this.getList()
        },()=> {this.loadingCall = false})
      }
    },
    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()
      })
    },
    getList() {
      const { activePlat, pagination, carCodeFront, callType } = this
@@ -125,7 +162,7 @@
    },
    handleSizeChange(e) {
      this.pagination.pageSize = e
      this.getList()
      this.getList(1)
    },
    handlePageChange(e) {
      this.pagination.page = e
@@ -152,7 +189,9 @@

<style lang="scss" scoped>
@import "@/assets/style/variables.scss";

.table-pagination {
  bottom: 0px !important;
}
.queuing_modal {
  padding: 10px 30px;

@@ -227,6 +266,7 @@
      .footer {
        .detail {
          color: $primaryColor;
          cursor: pointer;
        }
      }
    }