Merge branch 'main' of http://139.155.124.81:8088/cloud-mediate/mediate-manage-web
This commit is contained in:
commit
1f93873ead
@ -378,8 +378,7 @@ import { values } from "lodash";
|
||||
//调解进度
|
||||
MediateProgEnum:this.$util.getMediationprogress(),
|
||||
//调解状态
|
||||
MediateStatusEnum:[{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2},
|
||||
{label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}],
|
||||
MediateStatusEnum:this.$util.getMediationType(),
|
||||
showSearch: true,
|
||||
queryDate: '',
|
||||
activeUsage: '',
|
||||
|
||||
@ -66,7 +66,10 @@
|
||||
<el-table-column prop="bookingEndTime" label="预约结束时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="状态" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="$util.getTimeContrast(scope.row.bookingEndTime)">
|
||||
<span v-if="$util.getTimeContrast(scope.row.bookingEndTime) && scope.row.status.code == 0">
|
||||
未开始
|
||||
</span>
|
||||
<span v-else-if="scope.row.status.code != 0">
|
||||
{{ scope.row.status.code == 0 ? '未开始': '' }}
|
||||
{{ scope.row.status.code == 1 ? '进行中': '' }}
|
||||
{{ scope.row.status.code == 2 ? '已结束': '' }}
|
||||
|
||||
@ -82,6 +82,7 @@
|
||||
<el-input
|
||||
v-model="item.phone"
|
||||
placeholder="请输入"
|
||||
maxlength="11"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -184,6 +185,7 @@ export default {
|
||||
videoTelephone.videoInvite({...this.repaymentObj, litigants: resultArr}).then(res => {
|
||||
this.handleClose()
|
||||
this.$message.success("邀请成功");
|
||||
this.$emit('submitHand', null)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<div class="color-F53F3F" v-if="videoRecordingSts">{{ formattedTime }}</div>
|
||||
</div>
|
||||
<div class="flex-row">
|
||||
<div v-if="remoteUsersViews.length == 1" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
|
||||
<div v-if="remoteUsersViews.length == 0" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
|
||||
@click="handleClose">
|
||||
<span class="mr-4">退出房间</span>
|
||||
</div>
|
||||
@ -27,7 +27,7 @@
|
||||
</div>
|
||||
<!-- 远端 -->
|
||||
<div class="video-col position-r" :class="personnelNumber <= 4 ? 'w-50' : 'w-33'"
|
||||
v-for="(item, index) in remoteUsersViews" :key="index">
|
||||
v-for="(item) in remoteUsersViews" :key="item.id">
|
||||
<div class="video-col-Graphics border-radius-4" :id="item.id"></div>
|
||||
<div class="video-col-btn" v-if="zoomActive">
|
||||
<div class="cursor-pointer" v-if="item.microphone" @click="handleOffRemoteAudio(item.userId)">
|
||||
@ -68,7 +68,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<VideoInvitation v-if="InviteDialog" :eventDialog.sync="InviteDialog" />
|
||||
<VideoInvitation v-if="InviteDialog" :eventDialog.sync="InviteDialog" @submitHand="getVideoDetail" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -380,6 +380,7 @@ export default {
|
||||
const { userId, streamType } = event;
|
||||
try {
|
||||
let obj = this.arrPersonnel.find(item => item.phone === userId)
|
||||
console.log(obj, '---obj远端进入房间')
|
||||
let data = {
|
||||
id: `${userId}_main`,
|
||||
name: obj.name,
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<el-scrollbar :style="'height: 130px'">
|
||||
<div class="pb-6 pt-6 bor-E5E6EB" v-for="(item, index) in videoTableData" :key="index">
|
||||
<div class="flex-row justify-content-between">
|
||||
<div class="flex-row">
|
||||
<div class="flex-row" v-if="queryCondition.type == 0">
|
||||
<div class="mr-8 color-000 f-weight600 f16">
|
||||
{{item.bookingTime}}
|
||||
</div>
|
||||
@ -32,7 +32,21 @@
|
||||
<el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 4" size="small" type="warning">已取消</el-tag>
|
||||
<el-tag v-else size="small" type="warning">已过期</el-tag>
|
||||
</div>
|
||||
<div class="flex-row align-items-center" v-if="$util.getTimeContrast(item.bookingEndTime)">
|
||||
<div class="flex-row" v-else>
|
||||
<div class="mr-8 color-000 f-weight600 f16">
|
||||
{{item.bookingTime}}
|
||||
</div>
|
||||
|
||||
<el-tag v-if="item.status.code == 0" size="small" type="info">未开始</el-tag>
|
||||
<el-tag v-else-if="item.status.code == 1" size="small" type="info">进行中</el-tag>
|
||||
<el-tag v-else-if="item.status.code == 2" size="small" type="success">已结束</el-tag>
|
||||
<el-tag v-else-if="item.status.code == 3" size="small" type="warning">视频失败</el-tag>
|
||||
<el-tag v-else-if="item.status.code == 4" size="small" type="warning">已取消</el-tag>
|
||||
<el-tag v-else size="small" type="warning">已过期</el-tag>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="flex-row align-items-center" v-if="$util.getTimeContrast(item.bookingEndTime) && queryCondition.type == 0">
|
||||
<!-- 进房 -->
|
||||
<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)"
|
||||
@ -132,6 +146,7 @@ export default {
|
||||
},
|
||||
selectType(typeValue) {
|
||||
this.queryCondition.type = typeValue;
|
||||
this.videoTableData = []
|
||||
this.getList()
|
||||
},
|
||||
// 列表数据
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
handleBy 操作人
|
||||
handleTime 操作时间 -->
|
||||
<a class="color-86909C f12 pt-6 pb-6">{{item.handleBy}} {{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}}</a>
|
||||
<div class="flex-row align-items-center color-86909C" v-if="(item.signList.length > 0 || item.unsignList.length > 0)&&(item.signStatus != null && item.signStatus.code == 1)">
|
||||
<div class="flex-row align-items-center color-86909C" v-if="(item.signList.length > 0 || item.unsignList.length > 0)&&(item.signStatus != null && (item.signStatus.code != 1))">
|
||||
<div>签字</div>
|
||||
<div class="flex-row" v-for="(item1, index1) in item.unsignList" :key="index1">
|
||||
<el-tag v-if="item1.signStatus.code == 2" class="ml-4" size="small" type="success" effect="plain">{{item1.signName}}</el-tag>
|
||||
|
||||
@ -20,9 +20,10 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="与债务人关系:" prop="type">
|
||||
<el-select v-model="respondentObj.type" placeholder="请选择" class="width100">
|
||||
<el-select v-model="respondentObj.type" placeholder="请选择" class="width100" :disabled="respondentObj.type == '本人'">
|
||||
<el-option
|
||||
v-for="(item,index) in relationOptions"
|
||||
:disabled="item.disabled"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
@ -156,15 +157,15 @@ export default {
|
||||
return {
|
||||
diglogType: '',
|
||||
relationOptions: [
|
||||
{label: '本人', value: '本人'},
|
||||
{label: '父母', value: '父母'},
|
||||
{label: '配偶', value: '配偶'},
|
||||
{label: '子女', value: '子女'},
|
||||
{label: '其他', value: '其他'},
|
||||
{label: '朋友', value: '朋友'},
|
||||
{label: '兄弟', value: '兄弟'},
|
||||
{label: '同事', value: '同事'},
|
||||
{label: '同学', value: '同学'}
|
||||
{label: '本人', value: '本人',disabled:true},
|
||||
{label: '父母', value: '父母',disabled:false},
|
||||
{label: '配偶', value: '配偶',disabled:false},
|
||||
{label: '子女', value: '子女',disabled:false},
|
||||
{label: '其他', value: '其他',disabled:false},
|
||||
{label: '朋友', value: '朋友',disabled:false},
|
||||
{label: '兄弟', value: '兄弟',disabled:false},
|
||||
{label: '同事', value: '同事',disabled:false},
|
||||
{label: '同学', value: '同学',disabled:false}
|
||||
],
|
||||
respondentObj: {
|
||||
caseId: '',
|
||||
|
||||
@ -613,7 +613,7 @@
|
||||
}
|
||||
.case-pro3
|
||||
{
|
||||
background-image: linear-gradient(to right,#ffd900,#ff0000cb)
|
||||
background-image: linear-gradient(to right,#ffd900,#f09d9d80)
|
||||
}
|
||||
.case-pro4
|
||||
{
|
||||
@ -625,7 +625,7 @@
|
||||
}
|
||||
.case-pro6
|
||||
{
|
||||
background-image: linear-gradient(to right,#b0d65e,#dbf41e)
|
||||
background-image: linear-gradient(to right,#b0d65e,#9aad09)
|
||||
}
|
||||
.case-pro7
|
||||
{
|
||||
|
||||
@ -687,7 +687,7 @@
|
||||
}
|
||||
.case-pro3
|
||||
{
|
||||
background-image: linear-gradient(to right,#ffd900,#ff0000cb)
|
||||
background-image: linear-gradient(to right,#ffd900,#f09d9d80)
|
||||
}
|
||||
.case-pro4
|
||||
{
|
||||
@ -699,7 +699,7 @@
|
||||
}
|
||||
.case-pro6
|
||||
{
|
||||
background-image: linear-gradient(to right,#b0d65e,#dbf41e)
|
||||
background-image: linear-gradient(to right,#b0d65e,#9aad09)
|
||||
}
|
||||
.case-pro7
|
||||
{
|
||||
|
||||
@ -434,7 +434,8 @@ const util = {
|
||||
*/
|
||||
getMediationType() {
|
||||
return [{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2},
|
||||
{label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}]
|
||||
{label:'已签署协议',value:3},{label:'协议已签章',value:4},{label:'调解成功',value:5},
|
||||
{label:'调解失败',value:6}]
|
||||
},
|
||||
/**
|
||||
* 根据不同的类型返回不同的调解状态 this.$util.getMediationprogressData
|
||||
@ -449,9 +450,10 @@ const util = {
|
||||
case 0:
|
||||
// 预警
|
||||
return {key:2,label:this.getMediationType().find(item => item.value == value).label};
|
||||
case 4:
|
||||
case 6:
|
||||
// 高预警
|
||||
return {key:1,label:this.getMediationType().find(item => item.value == value).label};
|
||||
case 4:
|
||||
case 5:
|
||||
// 成功
|
||||
return {key:3,label:this.getMediationType().find(item => item.value == value).label};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user