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 | 269 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 201 insertions(+), 68 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 fa9da5f..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
@@ -1,11 +1,12 @@
<template>
<view class="main">
- <view style="position: relative;top: -120px;">
+ <view>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
- v-if="!orderPlanData"></u-empty>
+ text="鏆傛棤鏁版嵁"
+ v-if="orderPlanData.length===0"></u-empty>
</view>
<view class="collection-form">
<view class="collection-form-item"
@@ -29,48 +30,73 @@
v-if="item.orderType">{{ item.orderType||'' }}</view>
</view>
</view>
+ <view class="second-line">
+ <view class="coal-name">
+ <view class="">{{ item.orderCode ||''}}</view>
+ </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="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carNO.png') no-repeat;background-size: cover">
+ :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="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
- </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">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <combined-title title="鍘嗗彶楠岃川瀹屾垚"></combined-title>
<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"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="historyCoalData.length==0"></u-empty>
<view class="history-information"
v-for="(item, index) in historyCoalData"
:key="index"
@click="faYundetail(item)">
<view class="first">
- <view class="">{{ item.deptName || '' }}</view>
+ <view class="">{{ item.filedName || '' }}</view>
<view class=""><u-icon name="arrow-right"
color="#999999"
size="40"></u-icon></view>
@@ -79,27 +105,35 @@
<view class="coal-name">{{ item.coalName || '' }}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
+ <!-- 娣诲姞鍒涘缓鏃堕棿 -->
+ <view class="third">
+ <view class="third-line">
+ <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 class="third-line_text">棰嗗彇鏁�:</view>
- <view class="third-line_num">{{ item.cars2 }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鍓╀綑鏁�:</view>
+ <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"
- v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
- <view class="third-line_num"
- v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
- <view class="third-line_num">{{ item.tmCount }}</view>
+ style=" color: #303030;">{{ item.noCarNo == 1 ? '鏃犺溅鐗�' : (item.carNo || '') }}</view>
</view>
</view>
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/clock.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
</view>
</view>
<view class="senddate">{{ item.sendDate }}</view>
@@ -107,7 +141,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carnNUm.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
@@ -118,14 +152,44 @@
<view class="white-block"></view>
</scroll-view>
</view>
- <view style="height: 160rpx;width: 100%;">
-
- </view>
- <tab-bar :current="1"></tab-bar>
+ <!-- <view style="height: 160rpx;width: 100%;">
+ 111111
+ </view> -->
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <view class="previewImage-container">
+ <view class="previewImage-container">
+ <previewImage ref="previewImage"
+ :imgs="qualityTourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
+ </view>
+ <view class="noob-tour"
+ v-if="roleType===4&&isFirstLogin">
+ <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
+ <u-cell-group>
+ <u-cell title="鏂版墜鎸囧紩"
+ name='1'
+ :clickable="true"
+ @click="noobTour">
+ <u-badge type="primary"
+ value="01"
+ slot='icon'></u-badge>
+ <u-icon slot="value"
+ name="arrow-right"
+ size="30"
+ color="#b8b8b8"></u-icon>
+ </u-cell>
+ </u-cell-group>
+ </view>
+ <tab-bar :current="0"></tab-bar>
</view>
</template>
<script>
+ import { onlineurl } from '@/api/request.js'
+ import { mapState } from 'vuex'
+ import { BaseUrl } from '@/api/publicInterface.js'
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
export default {
data() {
return {
@@ -137,19 +201,32 @@
pageCurrent: 1,
// 鏄惁鏄剧ず鏇村鏁版嵁
showMoreData: false,
- total: null
+ total: null,
+ isFirstLogin:false,
+ onlineurl,
};
},
+ components:{
+ previewImage
+ },
computed: {
+ ...mapState(['customerTourImgList','qualityTourImgList']),
roleType() {
return uni.getStorageSync('roleType')
}
+ },
+ mounted() {
+ this.getLogOn();
},
onShow() {
this.GetOrderPlan()
this.qualityInspectionHistory()
},
methods: {
+ init(){
+ this.GetOrderPlan()
+ this.qualityInspectionHistory()
+ },
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('qualityInspection').then(res => {
@@ -188,7 +265,7 @@
this.pageCurrent++;
this.qualityInspectionHistory();
},
- //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ //fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
ArrSet(Arr, id) {
var obj = {};
const arrays = Arr.reduce((setArr, item) => {
@@ -197,11 +274,40 @@
}, []);
return arrays;
},
+ // 楠岃川閫夋嫨
validateClick(item) {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}`
})
- }
+ },
+ // 鍘嗗彶
+ faYundetail(item) {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}&flag=${true}`
+ })
+ },
+ noobTour(v) {
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality1.jpg')
+ },
+ getLogOn() {
+ this.$reqGet('getUserEntity').then(res => {
+ this.phone = res.data.phone
+ }).then(() => {
+ uni.request({
+ url: `${BaseUrl}/admin/log/getLogOnType?phone=${this.phone}`,
+ success: res => {
+ // res.data.data 涓�1 浠ｈ〃绗竴娆＄櫥褰� 涓�0鍙栨秷瀛︿範鎸囧紩 涓�2浠ｈ〃瀛樺湪
+ if (res.data.data === 1) {
+ this.noobTour()
+ } else if (res.data.data === 2) {
+ this.isFirstLogin = true
+ } else {
+ this.isFirstLogin = false
+ }
+ }
+ });
+ })
+ },
},
}
</script>
@@ -214,9 +320,28 @@
align-items: center;
}
+ page{
+ width: 100%;
+ height: 100%;
+ }
.main {
width: 100%;
- margin: 0 auto;
+ height: 100%;
+ margin: 30rpx auto;
+ padding-bottom: 60rpx;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .scroll-Y {
+ height: 100%;
+
+ .more_text {
+ color: #333;
+ font-size: 24rpx;
+ text-align: center;
+ }
}
.history-numbers {
@@ -226,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);
@@ -235,6 +359,8 @@
align-items: flex-start;
justify-content: space-evenly;
overflow: hidden;
+ padding: 20rpx 0;
+ box-sizing: border-box;
.first {
width: 96%;
@@ -264,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;
}
}
@@ -322,7 +450,6 @@
.collection-form-item {
width: 690rpx;
- height: 320rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
@@ -332,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;
@@ -428,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;
@@ -447,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;
}
}
@@ -464,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