From aa3438b349bb365bfb4c30a9194b5c10f9f843eb Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期二, 08 四月 2025 17:39:13 +0800 Subject: [PATCH] feat:质检员历史质检单增加上滑更多 --- pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue | 128 +++++++++++++++++++++++++----------------- 1 files changed, 77 insertions(+), 51 deletions(-) diff --git a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue index 6694d1e..8d0edfd 100644 --- a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue +++ b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue @@ -36,40 +36,46 @@ </view> </view> <view class="second-line"> - + <text class="car-num " style="font-size: 28rpx;">渚涘簲鍟嗭細{{ item.customerName }}</text> - + </view> <!-- 娣诲姞鍒涘缓鏃堕棿 --> <view class="second-line"> - + <text class="car-num " style="font-size: 28rpx;">鍒涘缓鏃堕棿锛�</text> - + <view style="font-size: 28rpx;">{{ item.createTime }}</view> </view> + <view class="second-line"> + <text class="car-num " style="font-size: 28rpx;">鍙告満锛歿{ item.xsUser1Name }}</text> + </view> <view class="third-line"> <view class="time-icon"> <view :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carNO.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}"> </view> </view> - <view class="car-num">{{ item.carNo||''}}</view> + <view class="car-num">{{ item.noCarNo == 1 ? '鏃犺溅鐗�' : (item.carNo || '') }}</view> </view> - <view class="third-line"> - <view class="time-icon"> - <view - :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/clock.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}"> - </view> - </view> - <view class="send-date">{{ item.sendDate }}</view> - </view> - <view class="fourth-line"> - <view class="forward" - @click.stop="validateClick(item)" - v-if='roleType===4'> - <view class="button-image">閫夋嫨</view> - </view> - </view> + <view class="fourth-line-outside"> + <view class="third-line"> + <view class="time-icon"> + <view + :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/clock.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}"> + </view> + </view> + <view class="send-date">{{ item.sendDate }}</view> + </view> + <view class="fourth-line"> + <view class="forward" + @click.stop="validateClick(item)" + v-if='roleType===4'> + <view class="button-image">閫夋嫨</view> + </view> + </view> + </view> + </view> </view> <view class="history-numbers"> @@ -77,6 +83,7 @@ <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" + style="height:85vh" @scrolltolower="historyScrolltolower"> <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" @@ -104,20 +111,23 @@ <view class="time-icon"> <text class="car-num " style="font-size: 28rpx;">鍒涘缓鏃堕棿锛�</text> </view> - + <view style="font-size: 28rpx;">{{ item.createTime }}</view> </view> </view> <view class="third"> <text class="car-num " style="font-size: 28rpx;">渚涘簲鍟嗭細{{ item.customerName }}</text> </view> + <view class="third"> + <text class="car-num " style="font-size: 28rpx;">鍙告満锛歿{ item.xsUser1Name }}</text> + </view> <view class="third"> <view class="third-line"> <view :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carNO.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}"> </view> <view class="third-line_num" - style=" color: #303030;">{{ item.carNo }}</view> + style=" color: #303030;">{{ item.noCarNo == 1 ? '鏃犺溅鐗�' : (item.carNo || '') }}</view> </view> </view> <view class="fourth"> @@ -149,7 +159,7 @@ <view class="previewImage-container"> <view class="previewImage-container"> <previewImage ref="previewImage" - :imgs="customerTourImgList" + :imgs="qualityTourImgList" :saveBtn='false'></previewImage> </view> </view> @@ -200,7 +210,7 @@ previewImage }, computed: { - ...mapState(['customerTourImgList']), + ...mapState(['customerTourImgList','qualityTourImgList']), roleType() { return uni.getStorageSync('roleType') } @@ -310,10 +320,18 @@ align-items: center; } + page{ + width: 100%; + height: 100%; + } .main { - width: 100%; - margin: 30px auto; + height: 100%; + margin: 30rpx auto; + padding-bottom: 60rpx; + box-sizing: border-box; + display: flex; + flex-direction: column; } .scroll-Y { @@ -333,7 +351,6 @@ .history-information { width: 690rpx; - height: 398rpx; margin: vww(10) vww(15); background: #ffffff; box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12); @@ -342,6 +359,8 @@ align-items: flex-start; justify-content: space-evenly; overflow: hidden; + padding: 20rpx 0; + box-sizing: border-box; .first { width: 96%; @@ -371,10 +390,12 @@ .order-type { color: #035cfb; - border: 2px solid #035cfb; + border: 1px solid #035cfb; border-radius: 4rpx; - padding: vww(2) vww(4); + padding: vww(4) vww(12); text-align: center; + font-size: 20rpx; + line-height: 1; } } @@ -429,7 +450,6 @@ .collection-form-item { width: 690rpx; - height: 350rpx; background: #ffffff; box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); border-radius: 20rpx; @@ -439,11 +459,13 @@ position: relative; align-items: flex-start; margin-top: vww(10); + padding: 20rpx 0; + box-sizing: border-box; .first-line { width: 94%; height: vww(30); - margin: vww(10) vww(16) 0 vww(16); + margin: vww(0) vww(16) 0 vww(16); display: flex; justify-content: space-between; @@ -535,18 +557,12 @@ } .fourth-line { - width: 100%; - height: vww(30); @include flex; justify-content: flex-end; - position: relative; - bottom: vww(10); - left: 25%; .receive, .forward { - width: vww(123); - height: vww(48); + @include flex; justify-content: center; color: #ffffff; @@ -554,15 +570,19 @@ position: absolute; .button-image { - width: 100%; - height: 100%; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat; - background-size: cover; + border: 1px solid #3b56eb; + border-radius: 40rpx; + width: vww(90); + height: vww(28); + background-size: 100% 100%; font-size: 28rpx; font-weight: 300; color: #ffffff; text-align: center; - line-height: vww(45); + display: flex; + justify-content: center; + align-items: center; + margin-right: 20rpx; } } @@ -571,22 +591,28 @@ } .forward { - width: vww(106); - left: vww(140); + @include flex; .button-image { - width: 100%; - height: 100%; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/transpartent.png') no-repeat; - background-size: cover; font-size: 28rpx; font-weight: 300; color: #3b56eb; text-align: center; - line-height: vww(45); } } + } } } -</style> \ No newline at end of file + .fourth-line-outside{ + width: 100%; + display: flex; + justify-content: space-between; + .third-line{ + width: auto!important; + } + .fourth-line{ + width:auto!important; + } + } +</style> -- Gitblit v1.9.1