Merge remote-tracking branch 'origin/master'

jiangping

2024-08-27 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d

 h5/pages/driver/reservedRecord.vue

@@ -4,74 +4,77 @@
    <view class="box_list">
      <view
        class="box_list_item"
        v-for="(item, index) in 3"
        v-for="(item, index) in datalist"
        :key="index"
        @click="handleDetail()"
        @click="handleDetail(item.id)"
      >
        <view class="box_list_item_head">
          <text>丁恩凯的劳务入园申请</text>
          <text class="loading">待审核</text>
          <text>{{item.driverName}}的入园预约</text>
          <text class="loading">{{ statusMap[item.status] }}</text>
        </view>
        <view class="box_list_item_nr">
          <view class="box_list_item_nr_item">
            <text>被访问人：</text>
            <text>人事部-王亚蓝</text>
            <text>合同编号：</text>
            <text>{{item.contractNum}}</text>
          </view>
          <view class="box_list_item_nr_item">
            <text>进厂时间：</text>
            <text>12-12 09:00</text>
            <text>到场时间：</text>
            <text>{{item.arriveDate.slice(5,16)}}</text>
          </view>
          <view class="box_list_item_nr_item">
            <text>离园时间：</text>
            <text>12-12 12:00</text>
            <text>司机姓名：</text>
            <text>{{item.driverName}}</text>
          </view>
          <view class="box_list_item_nr_item">
            <text>来访事由：</text>
            <text>业务来往</text>
            <text>车辆信息：</text>
            <text>{{item.carCodeFront}}</text>
          </view>
          <view class="box_list_item_nr_item">
            <text>随行车辆：</text>
            <text>皖A88888</text>
            <text class="placeholder9">{{item.createDate.slice(0,16)}}提交</text>
          </view>
        </view>
      </view>
    </view>
    <!-- 选择车辆 -->
    <u-picker
      keyName="name"
      closeOnClickOverlay
      @close="isShowCar = false"
      :show="isShowCar"
      :columns="carList"
      @confirm="seletedCar"
      @cancel="isShowCar = false"
    ></u-picker>
    <!-- 日期 -->
    <u-datetime-picker
      :show="isShowDate"
      :minDate="minDate"
      @confirm="confirmDate"
      @cancel="isShowDate = false"
      mode="date"
    ></u-datetime-picker>
  </view>
</template>

<script>
   import { driverApplyRecord } from "@/api"
export default {
  data() {
    return {
      isShowCar: false,
      isShowDate: false,
      param: {},
      carList: [[{ name: 'aa', value: '11' }]],
      timeList: [{ time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }, { time: '08:30-09:00' }]
         page: 1,
         capacity: 10,
         total: 0,
         datalist: [],
         statusMap: {
            0: '待审批',
            1: '审批中',
            2: '审批通过',
            3: '审批不通过',
            4: '已取消',
         }
    }
  },
   created() {
      this.getList()
   },
  methods: {
    handleDetail() {
      getList() {
         const { page, capacity } = this
         driverApplyRecord({
            page, capacity,model: {}
         }).then(res => {
            this.datalist = res.data.records
            this.total = res.data.total
         })
      },
    handleDetail(id) {
      uni.navigateTo({
        url: "/pages/driver/reservedDetail"
        url: `/pages/driver/reservedDetail?id=${id}`
      })
    },
    confirmDate(e) {
@@ -89,6 +92,9 @@
</script>

<style lang="scss">
   page{
      background: #f7f7f7;
   }
.main_app {
  background: #f7f7f7;
  padding: 0;
@@ -151,7 +157,7 @@
      }
    }
    .box_list_item_nr {
      padding: 30rpx;
      padding: 30rpx 30rpx 10rpx;
      width: 100%;
      box-sizing: border-box;
      background-color: #ffffff;
@@ -159,18 +165,11 @@
        width: 100%;
        display: flex;
        align-items: center;
        margin-bottom: 20rpx;
        margin-bottom: 16rpx;
        text {
          &:nth-child(1) {
            font-size: 26rpx;
            font-weight: 400;
            color: #666666;
          }
          &:nth-child(2) {
            font-size: 26rpx;
            font-weight: 400;
            color: #333333;
          }
          font-size: 26rpx;
          font-weight: 400;
          color: #666666;
        }
      }
    }