From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/visitorReport.vue | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/h5/pages/staff/task/visitorReport.vue b/h5/pages/staff/task/visitorReport.vue
index 6bc59ab..566fe2c 100644
--- a/h5/pages/staff/task/visitorReport.vue
+++ b/h5/pages/staff/task/visitorReport.vue
@@ -39,8 +39,8 @@
<view class="item">
<view class="label">棰勮鍏�/绂诲洯鏃堕棿</view>
<view class="value" v-if="info.starttime"
- >{{ info.starttime.slice(0, 16) }} 鑷�
- {{ info.endtime.slice(0, 16) }}</view
+ >{{ info.starttime.slice(5, 16) }} 鑷�
+ {{ info.endtime.slice(5, 16) }}</view
>
</view>
<view class="emyty"></view>
@@ -57,6 +57,10 @@
<view class="label">闅忚溅浜烘暟</view>
<view class="value">{{ info.memberNum }}浜�</view>
</view>
+ <view class="item">
+ <view class="label">璁垮鍗曚綅</view>
+ <view class="value">{{ info.companyName }}浜�</view>
+ </view>
<view class="item">
<view class="label">鏉ヨ浜嬬敱</view>
<view class="value">{{ info.reason }}</view>
@@ -87,17 +91,24 @@
"
/>
<image
+ v-if="item.status == 1"
class="status"
src="@/static/staff/liucheng_success@2x.png"
mode="widthFix"
/>
+ <image
+ v-if="item.status == 2"
+ class="status"
+ src="@/static/staff/liucheng_fail@2x.png"
+ mode="widthFix"
+ />
</view>
<view class="content">
<view class="head">
<view class="event">{{ item.title }}</view>
- <view class="time">{{ item.checkDate }}</view>
+ <view class="time" v-if="item.createDate">{{ item.createDate.slice(0, 16) }}</view>
</view>
- <view class="name_wrap">
+ <view class="name_wrap" v-if="item.type == 0">
<text
>{{ item.memberName
}}<text class="status" v-if="item.statusInfo"
@@ -109,7 +120,7 @@
item.checkInfo
}}</view>
<!-- 鎶勯�佷汉 -->
- <view v-if="item.approveType == 1" class="children">
+ <view class="children">
<view
class="child"
v-for="child in item.approveList"
@@ -131,7 +142,14 @@
</view>
</view>
<view class="emyty"></view>
- <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
+ <view
+ v-if="
+ info.approveDateVO != null &&
+ info.approveDateVO.canBeApproved != null &&
+ info.approveDateVO.canBeApproved == 1
+ "
+ class="main_footer"
+ >
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
@@ -251,7 +269,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -422,7 +440,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -461,7 +479,6 @@
justify-content: space-between;
width: 100%;
left: 0;
- padding: 30rpx 10rpx 60rpx;
display: flex;
justify-content: space-between;
background: #ffffff;
@@ -488,7 +505,7 @@
padding: 36rpx 30rpx 0;
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
--
Gitblit v1.9.3