修改bug

This commit is contained in:
liuxi 2025-02-17 17:11:45 +08:00
parent f3aa318784
commit daafe0b38d
6 changed files with 25 additions and 11 deletions

View File

@ -66,13 +66,14 @@
<el-table-column prop="bookingEndTime" label="预约结束时间" show-overflow-tooltip></el-table-column>
<el-table-column label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span>
<span v-if="$util.getTimeContrast(scope.row.bookingEndTime)">
{{ scope.row.status.code == 0 ? '未开始': '' }}
{{ scope.row.status.code == 1 ? '进行中': '' }}
{{ scope.row.status.code == 2 ? '已结束': '' }}
{{ scope.row.status.code == 3 ? '视频失败': '' }}
{{ scope.row.status.code == 4 ? '已取消': '' }}
</span>
<span v-else>已过期</span>
</template>
</el-table-column>
@ -86,7 +87,7 @@
<el-table-column label="操作" width="240">
<template slot-scope="scope">
<div class="flex-row align-items-center">
<div class="flex-row align-items-center" v-if="$util.getTimeContrast(scope.row.bookingEndTime)">
<!-- 只有进行中 快开始的时候才能进入视频间 -->
<el-button size="mini" v-if="scope.row.status.code == 0 || scope.row.status.code == 1 " @click="handleDelete(scope.row)">进入视频间</el-button>
<el-button size="mini" v-if="scope.row.status.code == 0" @click="VideoDialog={id:scope.row.id, bookingTime:scope.row.bookingTime}">修改</el-button>

View File

@ -228,7 +228,7 @@
v-model="singlejointlyvisible"
title="案件协办"
trigger="click">
<singleJointlyPopover :caseId="caseId" :singlejointlyvisible.sync="singlejointlyvisible" @handleSubmit="getCaseInfoById()"/>
<singleJointlyPopover :caseId="caseId" :assistMediatorId="baseInfo.assistMediatorId" :singlejointlyvisible.sync="singlejointlyvisible" @handleSubmit="getCaseInfoById()"/>
<span slot="reference" class="flex-row justify-content-between align-items-center cursor-pointer bottom-case-btn">
<i class="f24 el-icon-s-management color-4E5969"></i>
<a class="pl-4 f14">协办</a>

View File

@ -24,14 +24,21 @@
<div class="mr-8 color-000 f-weight600 f16">
{{item.bookingTime}}
</div>
<el-tag size="small" :type="queryCondition.type?'success':''">{{ queryCondition.type ? '已视频' : '待视频' }}</el-tag>
<el-tag v-if="$util.getTimeContrast(item.bookingEndTime)" size="small" :type="queryCondition.type?'success':''">{{ queryCondition.type ? '已视频' : '待视频' }}</el-tag>
<el-tag v-else size="small" type="warning">已过期</el-tag>
</div>
<div class="flex-row align-items-center">
<div class="f16 mr-8 cursor-pointer"
v-if="item.roomId && item.sdkAppId && item.userId && item.userSig && (item.status.code === 0 || item.status.code === 1)"
@click="handleVideoCall(item)">
<i class="el-icon-video-camera"></i>
<div v-if="$util.getTimeContrast(item.bookingEndTime)" >
<div class="f16 mr-8 cursor-pointer"
v-if="item.roomId && item.sdkAppId && item.userId && item.userSig && (item.status.code === 0 || item.status.code === 1)"
@click="handleVideoCall(item)">
<i class="el-icon-video-camera"></i>
</div>
</div>
<div class="f16 mr-8 cursor-pointer"
v-if="item.status.code === 0 && timeComparison(item.bookingTime)"
@click="VideoEditDialog={id:item.id, bookingTime:item.bookingTime}">

View File

@ -87,7 +87,7 @@
<div class="hx-1-content" v-if="rightActive == 1">
<div class="f12 pl-16 pt-16 pb-6">人物画像</div>
<el-scrollbar :style="'height:'+`${CommunicationcontentHeight}`+'px'">
<div class="p-16" :class="portraitInfo.gender == 'Male' ? 'personghximg':'personghximgw'">
<div class="p-16" :class="(portraitInfo.gender == 'Male'||portraitInfo.gender == '') ? 'personghximg':'personghximgw'">
<!-- 基本信息 -->
<div class="position_info character-info theme-blue">
<div class="character-info-title">基本信息</div>
@ -97,7 +97,7 @@
</div>
<div class="character-info-details flex-row">
<div class="character-info-details-label">性别</div>
<div class="character-info-details-text">{{portraitInfo.gender == 'Male' ?'男':'女'}}</div>
<div class="character-info-details-text">{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ?'男':'女'}}</div>
</div>
<div class="character-info-details flex-row">
<div class="character-info-details-label">电话</div>
@ -217,7 +217,7 @@
<div ref="targetPerson" class="f16 mt-16"><a class="dot"></a>身份信息</div>
<div class="person-info flex-column mt-16">
<span>姓名<a class="color-000">{{portraitInfo.name}}</a></span>
<span>性别<a class="color-000">{{portraitInfo.gender == 'Male' ? '男':'女'}}</a></span>
<span>性别<a class="color-000">{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ? '男':'女'}}</a></span>
<span>年龄<a class="color-000">{{portraitInfo.age}}</a></span>
<span>手机号码<a class="color-000">{{portraitInfo.phoneNumber}}</a></span>
<span>身份证号<a class="color-000">{{portraitInfo.idCardNumber}}</a></span>

View File

@ -40,6 +40,10 @@ import api from "@/services/caseManagement";
type: String,
default: () => {},
},
assistMediatorId: {
type: String,
default: () => {},
},
},
data() {
return {
@ -57,6 +61,7 @@ import api from "@/services/caseManagement";
};
},
mounted () {
this.ObjectInfo.assistMediatorId = this.assistMediatorId
this.getuserList()
},
methods: {

View File

@ -374,6 +374,7 @@ const util = {
// 和当前时间对比,判断是否大于当前时间
getTimeContrast(timeString) {
const timedate = moment(timeString);
console.log(timedate > new Date(),'timedate > new Date()')
return timedate > new Date()
},