Merge remote-tracking branch 'origin/master'

jiangping

2025-01-08 ee4c78feff3e03dec51c4a2bd13c6c36aed9b1dd

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

@@ -25,9 +25,10 @@
      <el-table-column prop="carCodeFront" label="车牌号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="电子锁状态" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span class="red" v-if="scope.row.lockStatus == 0">未上锁</span>
          <span class="red" v-if="scope.row.lockStatus == 1">部分上锁</span>
          <span v-if="scope.row.lockStatus == 2">全部上锁</span>
          <span class="red" v-if="scope.row.billCode && scope.row.lockStatus == 0">未上锁</span>
          <span class="red" v-if="scope.row.billCode && scope.row.lockStatus == 1">部分上锁</span>
          <span v-if="scope.row.billCode && scope.row.lockStatus == 2">全部上锁</span>
          <span v-if="!scope.row.billCode">-</span>
        </template>
      </el-table-column>
      <el-table-column prop="carrierName" label="运输公司" min-width="100" show-overflow-tooltip />
@@ -52,7 +53,7 @@
        <template v-slot="scope">
          <el-button v-if="scope.row.status == 6" type="text" v-permissions="['business:platformbooks:detail']"
            @click="handleAuth(scope.row)">离园授权</el-button>
            <span v-else>-</span>
          <span v-else>-</span>
        </template>
      </el-table-column>
    </el-table>
@@ -120,6 +121,15 @@
            label: '驾驶员'
          },
          {
            filed: 'queryStatusForPower',
            type: 'select',
            label: '授权状态',
            options: [
              { value: '9,10', label: '已授权' },
              { value: '6', label: '未授权' }
            ]
          },
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '作业完成时间搜索',
@@ -158,9 +168,10 @@
        model: {
          ...filters,
          queryStatus: '6,9,10,2,3,4',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          beginDoneDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginDoneDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
        },
        sorts: [{ direction: 'DESC', property: 'DONE_DATE' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
@@ -226,6 +237,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}