Merge remote-tracking branch 'origin/master'

jiangping

2024-10-28 6bd673610b45c8b7af056d296dde17585c886586

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

@@ -23,7 +23,7 @@
      <el-table-column prop="driverName" label="司机" min-width="100" show-overflow-tooltip />
      <el-table-column prop="drivierPhone" label="司机电话" min-width="100" show-overflow-tooltip />
      <el-table-column prop="inTypeTemp" label="作业类型" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
        <template v-slot="scope"> 
          <span v-if="scope.row.type == '0'">自有车卸货</span>
          <span v-if="scope.row.type == '1'">自有车装货</span>
          <span v-if="scope.row.type == '2'">外协车卸货</span>
@@ -31,7 +31,7 @@
          <span v-if="scope.row.type == '4'">市公司外协车卸货</span>
        </template>
      </el-table-column>
      <el-table-column prop="createDate" label="创建时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="ioCreatedate" label="创建时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="name" label="作业状态" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span>{{ statusMap[scope.row.status] }}</span>
@@ -39,17 +39,17 @@
      </el-table-column>
      <el-table-column prop="name" label="操作" min-width="120" align="center" fixed="right" show-overflow-tooltip>
        <template v-slot="scope">
          <el-button type="text" class="red" v-permissions="['business:platformjob:delete']"
          <el-button v-if="scope.row.status == '12'" type="text" class="red" v-permissions="['business:platformjob:delete']"
            @click="handleDel(scope.row)">删除</el-button>
          <el-button type="text" v-permissions="['business:platformjob:query']"
            @click="handleDetail(scope.row)">预约详情</el-button>
          <el-button v-if="scope.row != 12" type="text" v-permissions="['business:platformjob:query']"
            @click="handleDetail(scope.row)">运单详情</el-button>
        </template>
      </el-table-column>
    </el-table>
    <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: {
@@ -90,7 +90,7 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'code',
            filed: 'billCode',
            type: 'input',
            label: '运单号'
          },
@@ -103,6 +103,23 @@
            filed: 'carCodeFront',
            type: 'input',
            label: '车牌号'
          },
          {
            filed: 'status',
            type: 'select',
            label: '作业状态',
            options: [
              { 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: 'selDate',
@@ -143,8 +160,8 @@
        model: {
          ...filters,
          jobType: '0',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
        },
        capacity: pagination.pageSize,
        page: page || pagination.page,
@@ -198,12 +215,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) {