From 0627bb7ce8c035ee5a295f16fbba3e748511cff3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 17:47:43 +0800
Subject: [PATCH] 代码初始化
---
h5/pages/staff/task/driver.vue | 123 ++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 31 deletions(-)
diff --git a/h5/pages/staff/task/driver.vue b/h5/pages/staff/task/driver.vue
index 6532036..dcb6811 100644
--- a/h5/pages/staff/task/driver.vue
+++ b/h5/pages/staff/task/driver.vue
@@ -3,7 +3,9 @@
<view class="status_wrap">
<view class="name">{{info.driverName}}鐨勫叆鍥绾�</view>
<view class="desc">{{info.carCodeFront}}</view>
- <view class="status">{{ statusMap[info.status] }}</view>
+ <view class="status" v-if="info.status != 2 && info.status != 3">{{ statusMap[info.status] }}</view>
+ <image v-if="info.status == 2" class="icon" src="@/static/ic_passed@2x.png" mode=""></image>
+ <image v-if="info.status == 3" class="icon" src="@/static/ic_refused@2x.png" mode=""></image>
</view>
<!-- -->
<view class="emyty"></view>
@@ -59,15 +61,18 @@
<view class="list" v-if="info.approveDateVO != null && info.approveDateVO.approveList != null">
<view class="item" v-for="item,index in info.approveDateVO.approveList">
<view v-if="index != info.approveDateVO.approveList.length - 1" class="separate"></view>
- <view class="avatar_wrap">
+ <view class="avatar">
<image
+ v-if="item.type == 1"
class="img"
- :src="
- item.faceImg
- ? item.faceImg
- : require('@/static/meeting/common/default_user@2x.png')
- "
+ src="@/static/staff/ic_chaosong@2x.png"
/>
+ <image
+ v-else-if="item.approveType == 1 || item.approveType == 0"
+ class="img"
+ src="@/static/staff/ic_shenpiren@2x.png"
+ />
+ <span v-else class="img_name">{{item.memberName && item.memberName.slice(0,1)}}</span>
<image
v-if="item.status == 2"
class="status"
@@ -89,6 +94,9 @@
<view class="name_wrap">
<text>{{item.memberName}}<text v-if="item.statusInfo" class="status">({{item.statusInfo}})</text></text>
</view>
+ <div v-if="item.checkInfo" class="remark">
+ {{ item.checkInfo }}
+ </div>
<view v-if="item.approveType == 1" class="carbon">
<view class="carbon_item" v-for="child in item.approveList"
:key="child.id">
@@ -121,6 +129,7 @@
<view class="appr_modal">
<view class="title">{{ this.flag == '0' ? '鎷掔粷' : '鍚屾剰' }}</view>
<textarea
+ v-model="checkInfo"
:placeholder="this.flag == '0' ? '鎷掔粷璇存槑锛屽繀濉�' : '鍚屾剰璇存槑锛岄潪蹇呭～'"
placeholder-class="placeholder9"
/>
@@ -146,8 +155,8 @@
statusMap: {
0: '寰呭鎵�',
1: '瀹℃壒涓�',
- 2: '瀹℃壒閫氳繃',
- 3: '瀹℃壒涓嶉�氳繃',
+ 2: '宸查�氳繃',
+ 3: '宸叉嫆缁�',
4: '宸插彇娑�',
},
}
@@ -176,7 +185,7 @@
},
handleAppy() {
const {flag,checkInfo, type,info } = this
- if(flag == 0 && !checkInfo) return this.showToast('鎷掔粷璇存槑蹇呭～')
+ if(flag == 0 && checkInfo == '') return this.showToast('鎷掔粷璇存槑蹇呭～')
carUseBookAppr({
checkInfo,objId: info.id,objType: 6,status: flag == 0 ? 3 : 2
}).then(res => {
@@ -214,38 +223,45 @@
.flow_wrap {
padding: 30rpx 0;
-
+
.flow_title {
font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
}
-
+
.list {
.item {
display: flex;
margin-bottom: 48rpx;
- position: relative;
- .separate {
- position: absolute;
- width: 4rpx;
- height: calc( 100% - 52rpx );
- background-color: #eeeeee;
- left: 40rpx;
- top: 90rpx;
- }
- .avatar_wrap {
+ position: relative;
+ .separate {
+ position: absolute;
+ width: 4rpx;
+ height: 100%;
+ background-color: #eeeeee;
+ left: 40rpx;
+ transform: translate(-50%, 0);
+ top: 80rpx;
+ }
+ .avatar {
width: 80rpx;
height: 80rpx;
position: relative;
margin-right: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.img {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
}
-
+ .img_name{
+ font-size: 32rpx;
+ color: #FFFFFF;
+ }
.status {
width: 28rpx;
height: 28rpx;
@@ -254,36 +270,67 @@
right: 0;
bottom: 0;
}
-
}
-
+
.content {
flex: 1;
-
+
.head {
display: flex;
justify-content: space-between;
margin-bottom: 4rpx;
-
+
.event {
font-size: 30rpx;
}
-
+
.time {
font-size: 26rpx;
color: #999999;
}
}
-
+
.name_wrap {
font-size: 26rpx;
color: #777777;
-
+
.status {
color: $uni-color-primary;
}
}
-
+ .children {
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 12rpx;
+ .child {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ margin-right: 12rpx;
+ font-size: 26rpx;
+ color: #777777;
+ .child_img {
+ width: 48rpx;
+ height: 48rpx;
+ border-radius: 50%;
+ margin-bottom: 2rpx;
+ }
+ .child_name{
+ margin-bottom: 2rpx;
+ width: 48rpx;
+ height: 48rpx;
+ text-align: center;
+ justify-content: center;
+ padding-top: 4rpx;
+ font-size: 28rpx;
+ border-radius: 50%;
+ color: #FFFFFF;
+ background-color: $uni-color-primary;
+ }
+ }
+ }
+
.remark {
margin-top: 12rpx;
background-color: #f7f7f7;
@@ -312,6 +359,11 @@
font-size: 26rpx;
color: #777777;
}
+ }
+ }
+ &:nth-last-child(1) {
+ .separate {
+ height: 0;
}
}
}
@@ -386,6 +438,15 @@
background-color: #e9edff;
color: $uni-color-primary;
}
+ .icon{
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ position: absolute;
+ right: 0rpx;
+ top: 20rpx;
+
+ }
}
.main_footer {
--
Gitblit v1.9.3