Merge remote-tracking branch 'origin/master'

jiangping

2024-12-20 53b6400ec10c8ca61ccec91c82c358d2488eead8

 h5/pages/staff/vehicle/apply.vue

@@ -91,13 +91,15 @@
            }"
          >
            <text v-if="param.memberNames">
              <text v-for="mem,i in param.memberList" :key="mem.id">
                        <template v-if="i < 2">
                           <text>{{ mem.name }}</text>
                           <text v-if="i < 1 && param.memberList.length > 1">,</text>
                        </template>
                     </text>
                     <text v-if="param.memberList.length > 2">等{{ param.memberList.length }}人</text>
              <text v-for="(mem, i) in param.memberList" :key="mem.id">
                <template v-if="i < 2">
                  <text>{{ mem.name }}</text>
                  <text v-if="i < 1 && param.memberList.length > 1">,</text>
                </template>
              </text>
              <text v-if="param.memberList.length > 2"
                >等{{ param.memberList.length }}人</text
              >
            </text>
            <text v-else>请选择</text>
          </text>
@@ -132,14 +134,16 @@
      <view class="line"
        >4、公司借给申请人用车，申请借车人为第一责任人，不允许转借给其他人使用，若要借给他人使用。责任人要承担全部责任。</view
      >
         <view class="sub_btn" @click="handleSub">提交</view>
    </view>
    <view class="sub_btn" @click="handleSub">提交</view>
    <!--  -->
    <!-- :minDate="new Date(param.startTime).getTime()"
      :maxDate="new Date(param.endTime).getTime()" -->
    <u-datetime-picker
      :show="isShowDatetime"
      @confirm="confirmDate"
      :minDate="new Date(param.startTime).getTime()"
      :maxDate="new Date(param.endTime).getTime()"
      @confirm="confirmDate"
      @cancel="isShowDatetime = false"
      mode="datetime"
    ></u-datetime-picker>
@@ -168,7 +172,7 @@
    console.log(option)
    this.param = { ...option }
    this.minDate = new Date().getTime()

      this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
  },
  methods: {
    handleSub() {
@@ -207,7 +211,7 @@
      })
    },
    selPeople() {
      if(this.param.memberList && this.param.memberList.length > 0){
      if (this.param.memberList && this.param.memberList.length > 0) {
        setTimeout(() => {
          this.$eventBus.$emit('applePeoDetail', this.param.memberList || [])
        }, 500)
@@ -223,13 +227,19 @@
</script>

<style lang="scss">
   page{
      background-color: #f7f7f7;
   }
.main_wrap {
  .line {
    display: flex;
    justify-content: space-between;
    align-items: center;
    border-bottom: 1rpx solid #e5e5e5;
    padding: 30rpx 0;
    padding: 30rpx;
      background-color: #fff;
      width: 750rpx;
      margin: 0 -30rpx;
    .label {
      font-size: 30rpx;
      font-weight: 400;
@@ -258,11 +268,14 @@
    }
  }
  .upload_line {
    padding: 30rpx 0;
    padding: 30rpx;
      width: 750rpx;
      margin: 0 -30rpx;
      background-color: #fff;
    textarea {
      margin-top: 12rpx;
      width: 100%;
      height: 180rpx;
      height: 120rpx;
      font-size: 28rpx;
      font-weight: 400;
      color: #222222;
@@ -287,9 +300,10 @@
  }
}
.sub_btn {
  position: fixed;
  bottom: 84rpx;
  left: 30rpx;
  // position: fixed;
  // bottom: 84rpx;
  // left: 30rpx;
   margin-top: 60rpx;
  width: 690rpx;
  height: 88rpx;
  line-height: 88rpx;
@@ -302,7 +316,7 @@
}
.tip {
  background: #f7f7f7;
  padding: 30rpx 30rpx 180rpx;
  padding: 30rpx 30rpx 10rpx;
  margin: 0 -30rpx;
  .title {
    line-height: 40rpx;