Merge remote-tracking branch 'origin/master'

jiangping

2024-10-21 d4be41ccac01b155c7a067c73f2045f9ea0aa805

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

@@ -19,13 +19,13 @@
            <div class="status" :class="{ red: item.status == 0 }">{{ 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>
@@ -45,8 +45,8 @@
            </div>
          </div>
          <div class="footer df_sb">
            <div v-if="item.type != 4" class="detail">运单详情</div>
            <div v-else></div>
            <div @click="handleDetail(item)" v-if="item.billCode" class="detail">运单详情</div>
            <div @click="subDetail(item)" v-else class="detail">预约详情</div>
            <el-button type="primary" @click="handleCall(item)">签到</el-button>
          </div>
        </div>
@@ -54,24 +54,32 @@
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
      </pagination>
    </div>
    <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import Pagination from '@/components/common/Pagination'
import WaybillDetailRef from "./WaybillDetail.vue"
import DriverDetail from "@/views/task/driverDetail.vue"
import { platformJobPage, platformJobSign } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
export default {
  components: {
    GlobalWindow,
    Pagination
    Pagination,
    WaybillDetailRef,
    DriverDetail
  },
  data() {
    return {
      statusMap,
      isShowModal: false,
      isShowDetail: false,
      isShowDriver: false,
      subLoading: false,
      pagination: {
        total: 0,
@@ -96,12 +104,29 @@
    getList() {
      const { activePlat, pagination, carCodeFront } = this
      platformJobPage({
        model: { platformGroupId: activePlat.id, queryStatus: '0,1' },
        model: { platformGroupId: activePlat.id, queryStatus: '0,1', carCodeFront },
        page: pagination.page,
        capacity: pagination.pageSize
      }).then(res => {
        this.dataList = res.records
        this.pagination.total = res.total
      })
    },
    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()
      })
    },
    reset() {
@@ -214,6 +239,7 @@
      .footer {
        .detail {
          color: $primaryColor;
          cursor: pointer;
        }
      }
    }