From 45af9ec519e4d93d79ddfa48a6c6c82b7ef94008 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 14 九月 2024 13:54:34 +0800
Subject: [PATCH] ll
---
h5/pages/staffLogin/login.vue | 2
h5/pages/staff/task/driver.vue | 100 ++++++++++++++++++------
h5/pages/staff/vehicle/sendACarDetail.vue | 93 +++++++++++++++++-----
h5/pages/staff/task/vDangetAppr.vue | 28 +++---
admin/.env.development | 4
5 files changed, 162 insertions(+), 65 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 4f0746f..81a6a8a 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,5 +2,5 @@
NODE_ENV = 'development'
VUE_APP_API_URL = 'http://localhost:10010'
-VUE_APP_API_URL = 'http://192.168.31.42:10010'
-# VUE_APP_API_URL = 'http://10.50.250.178:8088/gateway_interface'
+# VUE_APP_API_URL = 'http://192.168.31.42:10010'
+VUE_APP_API_URL = 'http://10.50.250.178:8088/gateway_interface'
diff --git a/h5/pages/staff/task/driver.vue b/h5/pages/staff/task/driver.vue
index 7bc40ed..dcb6811 100644
--- a/h5/pages/staff/task/driver.vue
+++ b/h5/pages/staff/task/driver.vue
@@ -61,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"
@@ -220,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;
@@ -260,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;
@@ -320,6 +361,11 @@
}
}
}
+ &:nth-last-child(1) {
+ .separate {
+ height: 0;
+ }
+ }
}
}
}
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index a389fb6..3a13b23 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -28,13 +28,13 @@
</view>
<!-- -->
<view class="emyty"></view>
- <view v-if="info.status == 1" class="module_list">
+ <view v-if="info.status == 1 || info.status == 2" class="module_list">
<view class="item">
<view class="label">澶勭悊缁撴灉</view>
- <view class="value primaryColor">{{ statusMap[info.status] }}</view>
+ <view class="value primaryColor" :class="{ red: info.status == 2 }">{{ statusMap[info.status] }}</view>
</view>
<view class="item">
- <view class="label">鏁存敼鍓�</view>
+ <view class="label">{{info.status == '1' ? '鏁存敼鍓�' : '瑙嗛/鍥剧墖'}}</view>
<view class="value">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealBeforeFileList" :key="i">
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
@@ -42,7 +42,7 @@
</view>
</view>
</view>
- <view class="item">
+ <view class="item" v-if="info.dealAfterFileList && info.dealAfterFileList.length > 0">
<view class="label">鏁存敼鍚�</view>
<view class="value">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealAfterFileList" :key="i">
@@ -119,13 +119,13 @@
<view class="label">鍥剧墖/瑙嗛</view>
<view class="upload_wrap">
- <view class="adduser_list_item_ipt1_upload" @click="showUpload = true">
+ <view class="adduser_list_item_ipt1_upload" @click="showUploadBe = true">
<u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon>
<view class="mt6">鍥剧墖/瑙嗛</view>
</view>
- <view class="adduser_list_item_ipt1_upload" v-for="(item, i) in submitFileList" :key="i">
+ <view class="adduser_list_item_ipt1_upload" v-for="(item, i) in dealBeforeFileList" :key="i">
<u-icon class="close" size="20" name="close-circle-fill" color="red"
- @click="fileDel('submitFileList', i)"></u-icon>
+ @click="fileDel('dealBeforeFileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
<video v-if="item.type == 1" :src="item.fileurlFull"></video>
</view>
@@ -340,13 +340,15 @@
},
handleOpen() {
this.isShowHandle = true;
- console.log('info', this.info);
- this.dealBeforeFileList = [...this.info.submitFileList];
+ const submitFileList = this.info.submitFileList || []
+ this.submitFileList = [...submitFileList];
this.$set(this.handleParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'));
},
handleBack() {
- this.isShowBack = true;
- this.submitFileList = [...this.info.submitFileList];
+ this.isShowBack = true;
+ // const submitFileList = this.info.submitFileList || []
+ // this.submitFileList = [...submitFileList];
+ this.dealBeforeFileList = []
this.$set(this.backParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'));
},
getDetail() {
@@ -451,12 +453,12 @@
},
onSubBack() {
const {
- submitFileList,
+ dealBeforeFileList,
backParam
} = this;
dealHiddenDanger({
...backParam,
- dealBeforeFileList: submitFileList,
+ dealBeforeFileList,
status: 2,
id: this.id
}).then(res => {
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index 01c8c2e..da13b54 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -3,12 +3,18 @@
<view class="status_wrap">
<view class="name">{{ info.memberName }}鐨勭敤杞︾敵璇�</view>
<view class="placeholder9">{{ info.companyName }}</view>
+ <view
+ class="desc"
+ :class="{
+ gray: info.businessStatus == '2' || info.businessStatus == '3' || info.businessStatus == '4',
+ }"
+ >{{ infoStatus }}</view
+ >
<view class="status">
- <text class="loading" v-if="info.status == '0'">鐢宠涓�</text>
- <text class="grr" v-if="info.status == '1'">瀹℃壒涓�</text>
- <text class="grr" v-if="info.status == '2'">瀹℃壒閫氳繃</text>
- <text class="error" v-if="info.status == '3'">瀹℃壒涓嶉�氳繃</text>
- <text class="grr" v-if="info.status == '4'">宸插彇娑�</text>
+ <text class="loading" :class="{
+ grr: info.status == 1 || info.status == 2 || info.status == 4,
+ error: info.status == 3
+ }" v-if="info.status == '0'">{{statusMap[info.status]}}</text>
</view>
</view>
<!-- -->
@@ -65,17 +71,27 @@
>
<view class="separate"></view>
<view class="avatar">
+ <image
+ v-if="item.type == 1"
+ class="img"
+ src="@/static/staff/ic_chaosong@2x.png"
+ />
<image
+ v-else-if="item.approveType == 1 || item.approveType == 0"
class="img"
- :src="
- item.faceImg
- ? item.faceImg
- : require('@/static/meeting/common/default_user@2x.png')
- "
+ 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"
src="@/static/staff/liucheng_success@2x.png"
+ mode="widthFix"
+ />
+ <image
+ v-if="item.status == 3"
+ class="status"
+ src="@/static/staff/liucheng_fail@2x.png"
mode="widthFix"
/>
</view>
@@ -206,10 +222,18 @@
isShowDrive: false,
id: '',
appr: '',
+ infoStatus: '',
info: {},
param: {
status: ''
},
+ statusMap: {
+ 0: '寰呭鎵�',
+ 1: '瀹℃壒涓�',
+ 2: '宸查�氳繃',
+ 3: '鎾ゅ洖鐢宠',
+ 4: '宸插彇娑�',
+ },
driveList: []
}
@@ -217,6 +241,7 @@
onLoad(option) {
this.id = option.id
this.appr = option.appr || ''
+ this.infoStatus = option.info
this.getDetail()
},
methods: {
@@ -304,14 +329,14 @@
.flow_wrap {
padding: 30rpx 0;
-
+
.flow_title {
font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
}
-
+
.list {
.item {
display: flex;
@@ -331,13 +356,18 @@
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;
@@ -347,29 +377,29 @@
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;
}
@@ -384,14 +414,29 @@
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;
@@ -479,13 +524,17 @@
.name {
font-weight: 600;
font-size: 32rpx;
- margin-bottom: 20rpx;
+ margin-bottom: 16rpx;
color: #222222;
}
.desc {
font-size: 26rpx;
color: #ed4545;
+ margin-top: 16rpx;
+ }
+ .gray {
+ color: #999999;
}
.status {
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 8cc4c30..a0a5506 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -71,7 +71,7 @@
data() {
return {
form: {
- username: '13956044505',
+ username: '18056814089',
password: '123456',
code: 1
},
--
Gitblit v1.9.3