From c5b5706cd645440a877c546978751b63bf40d008 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 20 九月 2024 10:13:11 +0800
Subject: [PATCH] ll
---
h5/pages/staff/task/vDangetAppr.vue | 130 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 52 deletions(-)
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 6a3b311..53f969b 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -12,7 +12,7 @@
<view class="img_wrap" v-for="item in info.submitFileList" :key="item.id">
<image v-if="item.type == 0" :src="item.fileurlFull" @click="priviewImage(item.fileurlFull)" mode="widthFix"
class="img" />
- <video v-if="item.type == 1" :src="item.fileurlFull" class="video" controls />
+ <video v-if="item.type == 1" :src="item.fileurlFull" class="video" :controls="false" />
</view>
</view>
<view class="text_wrap">
@@ -28,8 +28,8 @@
</view>
<!-- -->
<view class="emyty"></view>
- <view v-if="info.status == 1 || info.status == 2" class="module_list">
- <view class="flow_title">澶勭悊缁撴灉</view>
+ <view v-if="info.status == 1 || info.status == 2" class="module_list">
+ <view class="title">澶勭悊缁撴灉</view>
<view class="item">
<view class="label">澶勭悊缁撴灉</view>
<view class="value primaryColor" :class="{ red: info.status == 2 }">{{ statusMap[info.status] }}</view>
@@ -39,7 +39,7 @@
<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>
- <video v-if="item.type == 1" :src="item.fileurlFull"></video>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
</view>
@@ -48,7 +48,7 @@
<view class="value">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealAfterFileList" :key="i">
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :src="item.fileurlFull"></video>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
</view>
@@ -68,7 +68,7 @@
v-if="info.status == 1 || index < flowList.length - 1" />
<image src="@/static/staff/liucheng_fail@2x.png" class="status"
v-if="info.status == 2 && index == flowList.length - 1" />
- <image v-if="item.avatar != null && item.avatar != ''" :src="item.avatar" class="img" alt="" />
+ <image v-if="item.avatar != null && item.avatar != ''" :src="item.avatar" class="img" alt="" />
<!-- <image v-else src="@/static/default_avatar.png" class="img" mode=""></image> -->
<span v-if="item.avatar == null || item.avatar == ''"
class="img_name">{{ item.createUserName && item.createUserName.slice(0, 1) }}</span>
@@ -76,7 +76,7 @@
<view class="content">
<view class="head">
<view class="event">{{ item.title }}</view>
- <view class="time">{{ item.createDate }}</view>
+ <view class="time" v-if="item.createDate">{{ item.createDate.slice(0,16) }}</view>
</view>
<view class="line">
<view class="company">
@@ -97,9 +97,11 @@
</view>
<view class="emyty"></view>
<view class="main_footer">
- <view v-if="info.status==0&& info.checkUserId == userInfo.memberId" class="btn" @click="handleBack">閫�鍥�</view>
- <view v-if="info.status==0 && info.checkUserId == userInfo.memberId" class="btn transfer" @click="handleTransfer">杞氦</view>
- <view v-if="info.status==0&& info.checkUserId == userInfo.memberId" class="btn handle" @click="handleOpen">澶勭悊</view>
+ <view v-if="info.status==0&& info.checkUserId == userInfo.memberId" class="btn" @click="handleBack">閫�鍥�</view>
+ <view v-if="info.status==0 && info.checkUserId == userInfo.memberId" class="btn transfer" @click="handleTransfer">
+ 杞氦</view>
+ <view v-if="info.status==0&& info.checkUserId == userInfo.memberId" class="btn handle" @click="handleOpen">澶勭悊
+ </view>
</view>
<!-- 閫�鍥� -->
@@ -128,7 +130,7 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@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>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
<view class="label">閫�鍥炶鏄�</view>
@@ -168,7 +170,7 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@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>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
<view class="label">
@@ -184,7 +186,7 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('dealAfterFileList', 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>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
<view class="label">鏁存敼璇存槑</view>
@@ -226,8 +228,8 @@
<view class="member_list">
<view class="mt24 placeholder6">鍏眥{ memberList.length }}鏉℃暟鎹�</view>
<view v-for="item in memberList" :key="item.id" class="line">
- <image :src="item.faceImgFull ? item.faceImgFull : require('@/static/meeting/common/default_user@2x.png')"
- class="avatar" mode=""></image>
+ <image v-if="item.faceImgFull" :src="item.faceImgFull" class="avatar"></image>
+ <span v-else class="img_name">{{item.name && item.name.slice(0,1)}}</span>
<view class="content">
<view class="info">
<text class="name">{{ item.name }}</text>
@@ -235,10 +237,9 @@
</view>
<view class="depart">{{ item.companyName }}</view>
</view>
- <image @click="changeMem(item)" v-if="transferParam.id == item.id"
- src="@/static/checkbox_sel@2x.png" mode="widthFix" class="checked"></image>
- <image @click="changeMem(item)" v-else src="@/static/video@2x.png" mode="widthFix"
- class="checked"></image>
+ <image @click="changeMem(item)" v-if="transferParam.id == item.id" src="@/static/checkbox_sel@2x.png"
+ mode="widthFix" class="checked"></image>
+ <image @click="changeMem(item)" v-else src="@/static/video@2x.png" mode="widthFix" class="checked"></image>
<text></text>
</view>
<view class="empty"></view>
@@ -250,7 +251,8 @@
</view>
</u-popup>
<!-- 閫�鍥炴椂闂� -->
- <u-datetime-picker :show="isShowBackDate" @confirm="confirmBackDate" @cancel="isShowBackDate = false"
+ <u-datetime-picker :show="isShowBackDate" :minDate="new Date().getTime()" :closeOnClickOverlay="false"
+ @confirm="confirmBackDate" @close="isShowBackDate = false" @cancel="isShowBackDate = false"
mode="datetime"></u-datetime-picker>
<u-datetime-picker :minDate="new Date().getTime()" :show="isShowHandleDate" @confirm="confirmHandleDate"
@@ -273,7 +275,7 @@
return {
isShowBack: false,
param: {},
- info: {},
+ info: {},
userInfo: this.$store.state.userInfo,
flowList: [],
@@ -341,14 +343,14 @@
},
handleOpen() {
this.isShowHandle = true;
- const submitFileList = 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.isShowBack = true;
// const submitFileList = this.info.submitFileList || []
- // this.submitFileList = [...submitFileList];
+ // this.submitFileList = [...submitFileList];
this.dealBeforeFileList = []
this.$set(this.backParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'));
},
@@ -435,10 +437,8 @@
},
getMemList() {
findHiddenAreaMemberList({
- model: {
- ...this.transferModel,
- id: this.info.areaId
- },
+ ...this.transferModel,
+ id: this.info.areaId,
...this.pagination
}).then(res => {
this.memberList = res.data || [];
@@ -748,21 +748,27 @@
}
};
</script>
-<style>
+
+<style lang="scss">
page {
background-color: #f7f7f7;
+
+ ::v-deep .u-popup__content {
+ border-top: 1rpx solid #cccccc;
+ }
}
-</style>
-<style lang="scss">
+
.main_app {
background-color: #fff;
padding-bottom: 0;
- .flow_title {
- font-weight: 600;
- font-size: 32rpx;
- color: #222222;
- margin-bottom: 24rpx;
+
+ .flow_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ margin-bottom: 24rpx;
}
+
.flow_wrap {
padding: 30rpx 0;
@@ -831,17 +837,19 @@
}
}
- .line{
- .company{
- font-size: 26rpx;
- color: #777777;
- }
- .status-green{
- color: $uni-color-primary;
- }
- .status-red{
- color: red;
- }
+ .line {
+ .company {
+ font-size: 26rpx;
+ color: #777777;
+ }
+
+ .status-green {
+ color: $uni-color-primary;
+ }
+
+ .status-red {
+ color: red;
+ }
}
.remark {
@@ -920,10 +928,14 @@
}
}
- .module_list {
- .title{
-
+ .module_list {
+ .title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ padding-top: 28rpx;
}
+
.item {
padding: 30rpx 0;
border-bottom: 1rpx solid #e5e5e5;
@@ -1012,7 +1024,8 @@
}
.video {
- height: 160rpx;
+ width: 100%;
+ max-height: 100%;
}
}
@@ -1184,7 +1197,7 @@
video {
width: 100%;
- max-height: 120rpx;
+ height: 100%;
}
}
}
@@ -1227,6 +1240,19 @@
margin-right: 20rpx;
}
+ .img_name {
+ width: 64rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ border-radius: 50%;
+ overflow: hidden;
+ margin-right: 20rpx;
+ background: $uni-color-primary;
+ color: #fff;
+ border: 1rpx solid $uni-color-primary;
+ }
+
.content {
flex: 1;
--
Gitblit v1.9.3