Merge branch 'main' into 'stg'

修改bug

See merge request cloud-mediate/mediate-manage-web!116
This commit is contained in:
刘翕 2025-02-28 23:02:10 +00:00
commit 78d66347b6
7 changed files with 26 additions and 11 deletions

View File

@ -11,6 +11,8 @@
<img v-if="fileType == 'image'" :src="`${fileObj.fullUrl}`" />
<video v-else-if="fileType == 'video'" width="100%" height="100%" :src="`${fileObj.fullUrl}`" preload="auto" autoplay="autoplay"
controls="" controlsList="nodownload noremote footbar"></video>
<video v-else-if="fileType == 'audio'" width="100%" :src="`${fileObj.fullUrl}`" preload="auto" autoplay="autoplay"
controls="" controlsList="nodownload noremote footbar"></video>
<iframe v-else :src="`${fileObj.fullUrl}`" frameborder="0" width="100%" height="100%"></iframe>
</div>

View File

@ -14,7 +14,11 @@
<el-table-column type="index" label="序号" width="55"></el-table-column>
<el-table-column label="外呼/呼入类型" show-overflow-tooltip >
<template slot-scope="scope">
<span >{{ scope.row.callWay == 1 ? '呼出':'呼入' }}</span>
<span >{{ scope.row.callWay == 1 ? '呼入':'呼出' }}</span>
<!-- incoming(1, "来电"),
outgoing(2, "去电"),
video(3, "视频"); -->
</template>
</el-table-column>
<el-table-column label="呼叫对象" width="300" show-overflow-tooltip >

View File

@ -46,7 +46,9 @@
<officeWriteDialog v-if="activeName == '5'" :eventTraDialog="eventTraDialog" />
<!-- 文书送达追踪明细 -->
<officeDeliveryDialogDetail v-if="activeName == '6'" :DialogDetail="eventTraDialog" />
<!-- <officeDeliveryDialogDetail v-if="activeName == '6'" :DialogDetail="eventTraDialog" /> -->
<officeDeliveryDialog v-if="activeName == '6'" :eventTraDialog="eventTraDialog" />
<!-- 还款计划 -->
<!-- <RepaymentDialog v-if="activeName == '7'" :eventTraDialog.sync="repaymentDialog" /> -->
<!-- eventDialog:{caseId:this.$route.query.caseId}, -->
@ -75,7 +77,9 @@ import api from "@/services/caseManagement";
CalllogDialog: () => import('./CalllogDialog.vue'),//
voideDialog: () => import('../../event-tracing/components/voideDialog.vue'),//
officeDeliveryDialog: () => import('../../event-tracing/components/officeDeliveryDialog.vue'),//
officeDeliveryDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue'),//
officeDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDialogDetail.vue'),//
officeWDialogDetail: () => import('../../event-tracing/dtraceDetail/officeWDialogDetail.vue'),//
officeWriteDialog: () => import('../../event-tracing/components/officeWriteDialog.vue'),//

View File

@ -368,14 +368,16 @@
<el-table-column label="是否签章" show-overflow-tooltip>
<template slot-scope="scope">
<div class="flex-row align-items-center">
<span>{{ scope.row.sealStatus == null ? '否':'是' }}</span>
<span v-if="scope.row.sealStatus == null "></span>
<span v-else class="color-48b928"></span>
</div>
</template>
</el-table-column>
<el-table-column label="是否完成签字" show-overflow-tooltip>
<template slot-scope="scope">
<div class="flex-row align-items-center">
<span>{{ (scope.row.signStatus != null && scope.row.signStatus.code == 3) ? '是':'否' }}</span>
<span v-if="scope.row.signStatus != null && scope.row.signStatus.code == 3" class="color-48b928"></span>
<span v-else></span>
</div>
</template>
</el-table-column>

View File

@ -19,7 +19,7 @@
<el-col :span="5">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>
@ -152,6 +152,9 @@ import api from "@/services/eventTracingApi";
methods: {
initializeQuery(){
this.queryParam.caseNo = this.eventTraDialog.caseNo
if (this.eventTraDialog.caseId != undefined && this.eventTraDialog.caseId != '') {
this.queryParam.caseId = this.eventTraDialog.caseId
}
},
handleChangeDate() {
this.activeUsage = ''

View File

@ -261,9 +261,9 @@
</div>
<!-- 电话 -->
<div class="text-center icon-bg icon-phone" v-if="itemrecord.linkedWay == 1">
<i v-if="itemrecord.callWay == 1 || itemrecord.callWay == null" class="callphone-icon"></i>
<i v-if="itemrecord.callWay == 0 && itemrecord.linkedSituation != 1" class="callbackphone-icon"></i>
<i v-if="itemrecord.callWay == 0 && itemrecord.linkedSituation == 1" class="nocallphone-icon"></i>
<i v-if="itemrecord.callWay == 2 || itemrecord.callWay == null" class="callphone-icon"></i>
<i v-if="itemrecord.callWay == 1 && itemrecord.linkedSituation != 1" class="callbackphone-icon"></i>
<i v-if="itemrecord.callWay == 1 && itemrecord.linkedSituation == 1" class="nocallphone-icon"></i>
</div>
<span v-if="itemrecord.linkedWay == 1 && itemrecord.linkedSituation != null" class="case-lable">
<a :class="'case-status'+ $util.getTelephoneTypeData(itemrecord.linkedSituation).key">{{$util.getTelephoneTypeData(itemrecord.linkedSituation).label}}</a>

View File

@ -30,9 +30,9 @@
</div>
<!-- 电话 -->
<div class="text-center icon-bg icon-phone" v-if="itemrecord.linkedWay == 1">
<i v-if="itemrecord.callWay == 1 || itemrecord.callWay == null" class="callphone-icon"></i>
<i v-if="itemrecord.callWay == 0 && itemrecord.linkedSituation != 1" class="callbackphone-icon"></i>
<i v-if="itemrecord.callWay == 0 && itemrecord.linkedSituation == 1" class="nocallphone-icon"></i>
<i v-if="itemrecord.callWay == 2 || itemrecord.callWay == null" class="callphone-icon"></i>
<i v-if="itemrecord.callWay == 1 && itemrecord.linkedSituation != 1" class="callbackphone-icon"></i>
<i v-if="itemrecord.callWay == 1 && itemrecord.linkedSituation == 1" class="nocallphone-icon"></i>
</div>
</div>
<!-- <span class="cursor-pointer"><i class="ml-8 f14 el-icon-edit"></i></span> -->