From 1ae471941bbdf9dde5dba668d33acf415fc6ec07 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 16:54:48 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/task/driverDetail.vue | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/task/driverDetail.vue b/admin/src/views/task/driverDetail.vue
index 1af3fe4..385d4dd 100644
--- a/admin/src/views/task/driverDetail.vue
+++ b/admin/src/views/task/driverDetail.vue
@@ -1,20 +1,24 @@
<template>
- <GlobalWindow :title="title" :visible.sync="isShowModal" @confirm="confirm">
+ <GlobalWindow :title="title" :visible.sync="isShowModal" @close="close" @confirm="confirm">
<div class="modal_wrap">
<div class="modal_content">
<div class="header">
- <img v-if="info.status == '3' || info.status == '6'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
- <img v-else-if="info.status == '2' || info.status == '5'" class="head_bg" src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
+ <img v-if="info.status == '3' || info.status == '6'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png"
+ alt="">
+ <img v-else-if="info.status == '2' || info.status == '5'" class="head_bg"
+ src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
<img v-else-if="info.status == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png" alt="">
<img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
<div class="left">
<div class="h1">鐗╂祦杞﹂绾�</div>
<div class="time">鎻愪氦鏃堕棿锛歿{ info.createDate }}</div>
</div>
- <div class="right" :class="{ scs: info.status == '2' || info.status == '5', msg: info.status == '3' || info.status == '6' }">{{ statusMap[info.status] }}</div>
+ <div class="right"
+ :class="{ scs: info.status == '2' || info.status == '5', msg: info.status == '3' || info.status == '6' }">{{
+ statusMap[info.status] }}</div>
</div>
<div class="info">
- <div class="title">鍏姟杞︾敵璇蜂俊鎭�</div>
+ <div class="title">鐗╂祦杞﹂绾︿俊鎭�</div>
<div class="list">
<div class="item">
<div class="label">鐢宠浜�</div>
@@ -43,7 +47,8 @@
<div class="item">
<div class="label">鍑嗚繍璇佺収鐗�</div>
<div v-if="info.transportImg" class="value">
- <el-image style="width: 100px" :preview-src-list="[info.prefixUrl + info.transportImg]" :src="info.prefixUrl + info.transportImg" alt="" />
+ <el-image style="width: 100px" :preview-src-list="[info.prefixUrl + info.transportImg]"
+ :src="info.prefixUrl + info.transportImg" alt="" />
</div>
</div>
</div>
@@ -69,7 +74,7 @@
<div class="content">
<div class="head">
<div class="event">{{ item.title }}</div>
- <div class="time">{{ item.createDate }}</div>
+ <div class="time">{{ item.checkDate }}</div>
</div>
<div class="name_wrap">
<span>{{ item.memberName }}<span v-if="item.statusInfo" class="status">({{ item.statusInfo
@@ -78,12 +83,11 @@
<div v-if="item.checkInfo" class="remark">
{{ item.checkInfo }}
</div>
- <div v-if="item.approveType == 1" class="carbon">
+ <div v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="carbon">
<div class="carbon_item" v-for="child in item.approveList" :key="child.id">
- <img :src="child.faceImg
- ? child.faceImg
- : require('@/assets/avatar/man.png')
- "></img>
+ <img v-if="child.faceImg != null && child.faceImg != ''" :src="child.faceImg" class="avatar" alt="" />
+ <img v-if="child.faceImg == null || child.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
+ alt="" />
<div class="text">{{ child.memberName }}</div>
</div>
</div>
@@ -104,7 +108,7 @@
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
">鎷掔粷</el-button>
- <el-button @click="isShowModal = false">杩斿洖</el-button>
+ <el-button @click="close">杩斿洖</el-button>
</template>
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog append-to-body :title="apprTitle" :visible.sync="isShowAppr" width="480px">
@@ -135,7 +139,7 @@
id: '',
type: '',
- title: '璁垮棰勭害璇︽儏',
+ title: '鐗╂祦杞﹂绾﹁鎯�',
isShowModal: false,
info: {},
isShowAppr: false,
@@ -184,6 +188,8 @@
this.subLoading = false
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
+ this.$emit('success')
+ this.$emit('close')
this.isShowAppr = false
})
.finally(() => {
@@ -208,6 +214,10 @@
})
}
})
+ },
+ close() {
+ this.isShowModal = false
+ this.$emit('close')
},
handleAppr(val) {
this.$set(this.param, 'status', val)
@@ -313,7 +323,8 @@
margin: 0 -30px;
border-radius: 8px 8px 0 0;
position: relative;
- .head_bg{
+
+ .head_bg {
position: absolute;
width: 100%;
height: 100%;
@@ -321,6 +332,7 @@
top: 0;
z-index: 9;
}
+
.h1 {
font-weight: 600;
font-size: 22px;
@@ -345,10 +357,12 @@
position: relative;
z-index: 99;
}
- .scs{
+
+ .scs {
background-color: #00BA67;
}
- .msg{
+
+ .msg {
background-color: #ED4545;
}
}
@@ -394,6 +408,7 @@
display: flex;
margin-bottom: 24px;
position: relative;
+
.separate {
position: absolute;
border-left: 2px dashed #cccccc;
@@ -401,15 +416,18 @@
height: calc(100% - 2px);
top: 42px;
}
- .info{
+
+ .info {
padding-top: 10px;
margin-left: 20px;
margin-right: 16px;
+
.iconnew {
width: 24px;
height: 24px;
}
}
+
.avatar_wrap {
width: 40px;
height: 40px;
@@ -456,7 +474,7 @@
color: #777777;
.status {
- color: $primary-color;
+ color: $primaryColor;
}
}
@@ -476,6 +494,7 @@
width: 100%;
overflow-x: auto;
margin-top: 12px;
+
.carbon_item {
text-align: center;
flex-shrink: 0;
--
Gitblit v1.9.3