From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007

---
 h5/pages/staff/vehicle/sendACar.vue |   92 +++++++++++++++++++++++++++++++--------------
 1 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index 3df0a80..57a4afe 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/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>
@@ -18,7 +17,7 @@
         class="box_list_item"
         v-for="(item, index) in dataList"
         :key="index"
-				@click="itemDetail(item)"
+        @click="itemDetail(item)"
       >
         <view class="box_list_item_head">
           <text>{{ item.carCode }}</text>
@@ -47,6 +46,14 @@
           </view>
         </view>
       </view>
+      <view v-if="dataList.length === 0" style="text-align: center">
+        <image
+          src="@/static/empty.png"
+          style="width: 320rpx; margin: 120rpx auto 0"
+          mode="widthFix"
+        />
+        <view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
+      </view>
     </view>
     <!-- 閫夋嫨杞﹁締 -->
     <u-picker
@@ -62,6 +69,7 @@
     <u-datetime-picker
       mode="date"
       v-model="param.queryDate"
+			:formatter="formatter"
       :show="isShowDate"
       :minDate="minDate"
       closeOnClickOverlay
@@ -83,12 +91,12 @@
       carsList: [],
       param: {
         queryDate: dayjs().format('YYYY-MM-DD'),
-        memberId: uni.getStorageSync('userInfo').memberId
+        // memberId: uni.getStorageSync('userInfo').memberId
       },
       minDate: '',
       pagination: {
         page: 0,
-        capacity: 10
+        capacity: 6
       },
       total: 0,
       dataList: [],
@@ -101,48 +109,73 @@
     this.initData()
   },
   onReachBottom() {
-    if (this.total > 10) {
+		console.log('onReachBottom');
+    if (this.total > this.dataList.length) {
       this.getList()
-    }
+    }else {
+			this.showToast('鏆傛棤鏇村鏁版嵁')
+		}
   },
   methods: {
+		formatter(type, value) {
+			if (type === 'year') {
+				return `${value}骞碻
+			}
+			if (type === 'month') {
+				return `${value}鏈坄
+			}
+			if (type === 'day') {
+				return `${value}鏃
+			}
+			if (type === 'hour') {
+				return `${value}鏃禶
+			}
+			if (type === 'minute') {
+				return `${value}鍒哷
+			}
+			return value
+		},
     getList() {
       const { param, pagination } = this
       pagination.page = pagination.page + 1
-      if(param.queryDate){
+      if (param.queryDate) {
         param.queryStartTime = param.queryDate + ' 00:00:00'
         param.queryEndTime = param.queryDate + ' 23:59:59'
       }
+			if(param.carCode == '鍏ㄩ儴杞﹁締'){
+				param.carCode = null
+				param.carId = null
+			}
       carUseBookPaiche({
         ...pagination,
         model: { ...param }
       }).then(res => {
-        if (pagination.page === 1) {
-          this.dataList = res.data.records
-        } else {
-          this.dataList = [...list, ...res.data.records]
-        }
+        this.dataList = [...this.dataList, ...res.data.records]
         this.total = res.data.total
       })
     },
-		itemDetail(item) {
-			uni.navigateTo({
-				url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
-			})
-		},
+    itemDetail(item) {
+      uni.navigateTo({
+        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
       this.getList()
     },
     seletedDate(e) {
-      this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
-      this.pagination.page = 0
-      this.isShowDate = false
-      this.getList()
+      setTimeout(() => {
+        this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
+        this.pagination.page = 0
+        this.isShowDate = false
+				this.dataList = []
+        this.getList()
+      })
     },
     endtimeClose() {
       this.param.endTime = ''
@@ -157,9 +190,9 @@
     },
     initData() {
       getCarsList({
-        type: 1
+        type: 0
       }).then(res => {
-        this.carsList = [res.data]
+        this.carsList = [[{ code: '鍏ㄩ儴杞﹁締', id: '' }, ...res.data]]
       })
     },
   }
@@ -169,12 +202,13 @@
 <style lang="scss">
 .main_app {
   background: #f7f7f7;
+  min-height: 100vh;
   padding: 0;
 }
 .app_header {
   display: flex;
   align-items: center;
-  margin: 0 -15rpx;
+  // margin: 0 -15rpx;
   background-color: #fff;
   .item {
     width: 360rpx;
@@ -216,13 +250,13 @@
       .error {
         color: #e0312a;
       }
-			.grr{
-				color: #999999;
-			}
+      .grr {
+        color: #999999;
+      }
       text {
         &:nth-child(1) {
           font-size: 32rpx;
-          font-weight: 500;
+          font-weight: 600;
           color: #222222;
         }
         &:nth-child(2) {

--
Gitblit v1.9.3