From 06b2f5be922e87d086d1d4e6cdcc2119e7d3a1a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 14:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/driverDetail.vue | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/task/driverDetail.vue b/admin/src/views/task/driverDetail.vue
index a63e59c..d62bf96 100644
--- a/admin/src/views/task/driverDetail.vue
+++ b/admin/src/views/task/driverDetail.vue
@@ -3,15 +3,19 @@
<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>
@@ -25,7 +29,7 @@
<div class="value">鍓� {{ info.carCodeFront }}锛屽悗 {{ info.carCodeBack }}</div>
</div>
<div class="item">
- <div class="label">鍚堝悓缂栧彿</div>
+ <div class="label">鍚堝悓/鍗曟嵁缂栧彿</div>
<div class="value">{{ info.contractNum }}</div>
</div>
<div class="item">
@@ -33,17 +37,18 @@
<div class="value">{{ info.arriveDate }}</div>
</div>
<div class="item">
- <div class="label">鍏ュ簱绫诲瀷</div>
+ <div class="label">浣滀笟绫诲瀷</div>
<div class="value">{{ info.inType == 0 ? '鏁存墭鐩�' : '浠剁儫' }}</div>
</div>
<div class="item">
<div class="label">鎬昏繍杈撻噺</div>
- <div class="value">{{ info.totalNum }}涓囨敮</div>
+ <div class="value">{{ info.totalNum || info.ioQty }}涓囨敮</div>
</div>
<div class="item">
- <div class="label">鍑嗚繍璇佺収鐗�</div>
+ <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>
@@ -210,7 +215,7 @@
}
})
},
- close(){
+ close() {
this.isShowModal = false
this.$emit('close')
},
@@ -275,6 +280,7 @@
border-radius: 8px;
overflow: hidden;
height: 100%;
+
.title {
font-weight: 600;
font-size: 18px;
@@ -317,7 +323,8 @@
margin: 0 -30px;
border-radius: 8px 8px 0 0;
position: relative;
- .head_bg{
+
+ .head_bg {
position: absolute;
width: 100%;
height: 100%;
@@ -325,6 +332,7 @@
top: 0;
z-index: 9;
}
+
.h1 {
font-weight: 600;
font-size: 22px;
@@ -349,10 +357,12 @@
position: relative;
z-index: 99;
}
- .scs{
+
+ .scs {
background-color: #00BA67;
}
- .msg{
+
+ .msg {
background-color: #ED4545;
}
}
@@ -398,6 +408,7 @@
display: flex;
margin-bottom: 24px;
position: relative;
+
.separate {
position: absolute;
border-left: 2px dashed #cccccc;
@@ -405,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;
@@ -460,7 +474,7 @@
color: #777777;
.status {
- color: $primary-color;
+ color: $primaryColor;
}
}
@@ -480,6 +494,7 @@
width: 100%;
overflow-x: auto;
margin-top: 12px;
+
.carbon_item {
text-align: center;
flex-shrink: 0;
--
Gitblit v1.9.3