Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 h5/pages/staff/vehicle/sendACar.vue

@@ -7,8 +7,7 @@
        <u-icon class="ml12" name="arrow-down" color="#999999" />
      </view>
      <view class="item" @click="isShowCar = true">
        <text v-if="param.carCode">{{ param.carCode }}</text>
        <text v-else class="placeholder9">选择车辆</text>
        <text>{{ param.carCode || '全部车辆' }}</text>
        <u-icon class="ml12" name="arrow-down" color="#999999" />
      </view>
    </view>
@@ -91,7 +90,7 @@
      carsList: [],
      param: {
        queryDate: dayjs().format('YYYY-MM-DD'),
        memberId: uni.getStorageSync('userInfo').memberId
        // memberId: uni.getStorageSync('userInfo').memberId
      },
      minDate: '',
      pagination: {
@@ -134,12 +133,13 @@
    },
    itemDetail(item) {
      uni.navigateTo({
        url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
        url: `/pages/staff/vehicle/sendACarDetail?id=${item.id}`
      })
    },
    seletedCar(e) {
      const item = e.value[0]
      this.pagination.page = 0
         this.dataList = []
      this.$set(this.param, 'carCode', item.code)
      this.$set(this.param, 'carId', item.id)
      this.isShowCar = false
@@ -150,6 +150,7 @@
        this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
        this.pagination.page = 0
        this.isShowDate = false
            this.dataList = []
        this.getList()
      })
    },
@@ -168,7 +169,7 @@
      getCarsList({
        type: 0
      }).then(res => {
        this.carsList = [res.data]
        this.carsList = [[{ code: '全部车辆', id: '' }, ...res.data]]
      })
    },
  }