Merge remote-tracking branch 'origin/master'

k94314517

2024-09-30 af3434a79c2a096105668273cfa27c09eacf6ff1

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

@@ -49,7 +49,7 @@
    <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
    <!--  -->
    <!--  -->
    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
    <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
  </div>
</template>

@@ -58,7 +58,7 @@
import QueryForm from '@/components/common/QueryForm'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import DriverDetail from "@/views/task/driverDetail"
import WaybillDetailRef from "../components/WaybillDetail.vue"
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
@@ -67,14 +67,14 @@
  components: {
    Pagination,
    QueryForm,
    DriverDetail,
    WaybillDetailRef,
    GlobalWindow,
    UploadFaceImg
  },
  data() {
    return {
      statusMap,
      isShowDriver: false,
      isShowDetail: false,
      exLoading: false,
      loading: false,
      pagination: {
@@ -198,12 +198,11 @@
      this.getList()
    },
    handleDetail(row) {
      this.isShowDriver = true
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.DriverDetailRef.id = row.id
        this.$refs.DriverDetailRef.type = 6
        this.$refs.DriverDetailRef.getDetail()
        this.$refs.DriverDetailRef.isShowModal = true
        this.$refs.WaybillDetailRef.isShowModal = true
        this.$refs.WaybillDetailRef.id = row.id
        this.$refs.WaybillDetailRef.getDetail()
      })
    },
    handleSizeChange(capacity) {