Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 h5/pages/staff/vehicle/apply.vue

@@ -14,7 +14,7 @@
          >
            <text v-if="param.startTime">
              {{ param.startTime.slice(5, 16) }}至{{
                param.endTime.slice(11, 16)
                param.endTime.slice(5, 16)
              }}
            </text>
            <text v-else>请选择</text>
@@ -91,7 +91,13 @@
            }"
          >
            <text v-if="param.memberNames">
              {{ 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>
            <text v-else>请选择</text>
          </text>
@@ -209,7 +215,6 @@
      this.$jump('/pages/staff/vehicle/applePeo')
    },
    confirmDate(e) {

      this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
      this.isShowDatetime = false
    }