diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index fb930ad..d14c7ee 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -759,9 +759,9 @@ html{
 
 //=================== start::提示框置顶 ===============================
 .el-message.el-message--warning{z-index: 9999 !important;}
-.el-message.el-message--error.is-closable{z-index: 9999 !important;}
-.el-message.el-message--warning.is-closable{z-index: 9999 !important;}
-.el-message.el-message--success.is-closable{z-index: 9999 !important;}
+.el-message.el-message--error,.el-message.el-message--error.is-closable{z-index: 9999 !important;}
+.el-message.el-message--warning,.is-closable{z-index: 9999 !important;}
+.el-message.el-message--success,.el-message.el-message--success.is-closable{z-index: 9999 !important;}
 .el-loading-mask.is-fullscreen{z-index: 9999 !important;}
 .el-loading-mask{z-index: 3000 !important;}
 //=================== end::提示框置顶 ===============================
diff --git a/src/pages/case-management/components/RepaymentEffectDialog.vue b/src/pages/case-management/components/RepaymentEffectDialog.vue
index a072879..a58d2fe 100644
--- a/src/pages/case-management/components/RepaymentEffectDialog.vue
+++ b/src/pages/case-management/components/RepaymentEffectDialog.vue
@@ -104,6 +104,7 @@ import api from "@/services/caseManagement";
                         this.Effectobj.proofUrl =undefined
                         api.gettraceProof_valid(this.Effectobj).then(res => {
                             if(!res.code){
+                                this.handleClose()
                                 this.$parent.getProofList(1)
                             }
                         })
diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue
index b68fee0..2de256f 100644
--- a/src/pages/case-management/detail/index.vue
+++ b/src/pages/case-management/detail/index.vue
@@ -57,6 +57,33 @@
               <span><a>联系人手机：</a><a>{{item.phone}}</a></span>
             </div>
           </div>
+
+          <div v-if="baseInfo.jointDebt == 1" class="case-detail-label f-weight500 f16">
+            共债信息
+            <span style="font-weight:400;font-size: 14px;">
+              (当前债务人名下共有{{coobligationInfo.caseNum}}笔债务，
+              逾期总金额：<a class="color-F53F3F" style="margin-left: 0px;">{{coobligationInfo.totalAmount}}</a>元，
+              最低还款总金额：<a class="color-F53F3F" style="margin-left: 0px;">{{coobligationInfo.minTotalAmount}}</a>元)
+            </span>
+          </div>
+          
+          <div>
+            <div class="case-detail-des flex-column" v-for="(item,index) in coobligationInfo.caseList" :key="index">
+                <span><a>案件包名称：</a><a>{{item.casePkg}}</a></span>
+                <span><a>金融产品名称：</a><a>{{item.productTypeId}}</a></span>
+                <span><a>金融机构名称：</a><a>{{item.financialOrgName}}</a></span>
+                <span><a>案件编号：</a><a>{{item.caseNo}}</a></span>
+                <span><a>合同名称：</a><a>{{item.fields.find(item => item.fieldKey == 'contactName').fieldValue}}</a></span>
+                <span><a>当前逾期金额：</a><a>{{item.fields.find(item => item.fieldKey == 'moneyAmount').fieldValue}}</a></span>
+                <span><a>最低还款金额：</a><a>{{item.fields.find(item => item.fieldKey == 'limitLine').fieldValue}}</a></span>
+            </div>
+            <!-- <div class="case-detail-des flex-column">
+                <span><a>姓名：</a><a></a></span>
+                <span><a>与债务人关系：</a><a></a></span>
+                <span><a>联系人手机：</a><a></a></span>
+            </div> -->
+          </div>
+
           <div class="case-detail-label f-weight500 f16">案件办理信息</div>
           <div>
             <el-tabs type="border-card">
@@ -218,9 +245,9 @@
 
               </el-tab-pane>
               <el-tab-pane>
-                <span slot="label"><i v-if="ProofList.length > 0" class="el-icon-s-flag"></i> 回款凭证</span>
+                <span slot="label"><i v-if="ProofList.length > 0" class="el-icon-s-flag"></i> 还款凭证</span>
                 <span
-                    class="f16">总计待还金额：{{ ProofStatistics.total || 0 }}元，总计已还金额：{{ ProofStatistics.payback || 0 }}元</span>
+                    class="f16">计划还款金额：{{ ProofStatistics.total || 0 }}元，已还金额：{{ ProofStatistics.payback || 0 }}元</span>
                 <el-table :data="ProofList" :height="300">
                   <el-table-column type="index" label="序号" width="55"></el-table-column>
                   <el-table-column label="凭证时间" show-overflow-tooltip>
@@ -471,7 +498,8 @@ export default {
       // 文书列表
       OfficeList:[],
       communicationRecord: [],
-      communicationLogRecord:[]
+      communicationLogRecord:[],
+      coobligationInfo:{},
     }
   },
   computed: {
@@ -556,18 +584,36 @@ export default {
     // 获取详情
     getCaseInfoById() {
       api.getCaseInfoById(this.caseId).then(res => {
-        console.log(res, 'res')
         if (!res.code) {
           this.baseInfo = res
+
+          if(res.jointDebt == 1){
+            // 有共债 mainCaseId
+            this.caseId = res.mainCaseId.toString()
+          } else {
+            this.caseId = res.id.toString()
+          }
         }
 
       })
+      this.getCoobligation()
       this.getFileCaseList()
       this.getLitigantByCaseId()
       this.getplanlist()
       this.getProofList()
       this.getWritCaseList()
+      
     },
+
+    // 共债数据
+    getCoobligation() {
+      api.mediate_coobligation_list({id:this.caseId}).then(res => {
+        if (!res.code) {
+          this.coobligationInfo = res
+        }
+      })
+    },
+
     // 获取证据材料
     getFileCaseList() {
       cmapi.getCaseFileList({caseId:this.caseId}).then(res => {
diff --git a/src/pages/event-tracing/components/officeDialog.vue b/src/pages/event-tracing/components/officeDialog.vue
index ee305ae..0430527 100644
--- a/src/pages/event-tracing/components/officeDialog.vue
+++ b/src/pages/event-tracing/components/officeDialog.vue
@@ -88,8 +88,8 @@
                             <template slot-scope="scope">
                                 <div class="flex-row align-items-center">
                                     <el-button size="mini" @click="handleDetail(scope)">明细</el-button>
-                                    <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope)">重试</el-button>
-                                    <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope)">取消</el-button>
+                                    <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope.row)">重试</el-button>
+                                    <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope.row)">取消</el-button>
                                 </div>
                             </template>
                         </el-table-column>
diff --git a/src/pages/event-tracing/components/voideDialog.vue b/src/pages/event-tracing/components/voideDialog.vue
index c4e9e6b..62b4d71 100644
--- a/src/pages/event-tracing/components/voideDialog.vue
+++ b/src/pages/event-tracing/components/voideDialog.vue
@@ -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>
diff --git a/src/pages/mediation-page/components/MediationRecordDialog.vue b/src/pages/mediation-page/components/MediationRecordDialog.vue
index b462f08..9b3e645 100644
--- a/src/pages/mediation-page/components/MediationRecordDialog.vue
+++ b/src/pages/mediation-page/components/MediationRecordDialog.vue
@@ -38,10 +38,10 @@
                 <el-radio :label="1">未接</el-radio>
                 <el-radio :label="2">拒接</el-radio>
                 <el-radio :label="3">关机</el-radio>
-                <el-radio :label="8">空号</el-radio>
+                <el-radio :label="7">空号</el-radio>
                 <el-radio :label="4">停机</el-radio>
-                <el-radio :label="9">设置</el-radio>
-                <el-radio :label="10">正在通话中</el-radio>
+                <el-radio :label="8">设置</el-radio>
+                <el-radio :label="9">正在通话中</el-radio>
                 <el-radio :label="5">暂时无法接通</el-radio>
               </el-radio-group>
             </div>
diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 479136e..fb67cdd 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -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>
diff --git a/src/pages/mediation-page/components/caseVideoReservationDialog.vue b/src/pages/mediation-page/components/caseVideoReservationDialog.vue
index f6e6ac1..5acd65b 100644
--- a/src/pages/mediation-page/components/caseVideoReservationDialog.vue
+++ b/src/pages/mediation-page/components/caseVideoReservationDialog.vue
@@ -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}">
diff --git a/src/pages/mediation-page/components/cassWrit.vue b/src/pages/mediation-page/components/cassWrit.vue
index 93bddef..486b3c3 100644
--- a/src/pages/mediation-page/components/cassWrit.vue
+++ b/src/pages/mediation-page/components/cassWrit.vue
@@ -197,7 +197,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        let data = {caseId: this.caseId}
+        let data = {id: this.caseId}
         caseManagement.traceSignBatchCancel(data).then((res) => {
           this.$message.success("撤销签字成功");
           this.getWritCaseList()
diff --git a/src/pages/mediation-page/components/portraitPerson.vue b/src/pages/mediation-page/components/portraitPerson.vue
index 9d07316..51d7740 100644
--- a/src/pages/mediation-page/components/portraitPerson.vue
+++ b/src/pages/mediation-page/components/portraitPerson.vue
@@ -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>
diff --git a/src/pages/mediation-page/components/singleJointlyPopover.vue b/src/pages/mediation-page/components/singleJointlyPopover.vue
index f622f6f..a28afd5 100644
--- a/src/pages/mediation-page/components/singleJointlyPopover.vue
+++ b/src/pages/mediation-page/components/singleJointlyPopover.vue
@@ -32,6 +32,7 @@
 </template>
 <script>
 import api from "@/services/caseManagement";
+import smapi from "@/services/systemManage";
     export default {
         components: {
         },
@@ -40,6 +41,10 @@ import api from "@/services/caseManagement";
                 type: String,
                 default: () => {},
             },
+            assistMediatorId: {
+                type: String,
+                default: () => {},
+            },
         },
         data() {
             return {
@@ -57,14 +62,20 @@ import api from "@/services/caseManagement";
             };
         },
         mounted () {
+            this.ObjectInfo.assistMediatorId = this.assistMediatorId
             this.getuserList()
         },
         methods: {
             // 列表数据
             getuserList() {
-                api.getCurrGroupUserList().then(res => {
+                // api.getCurrGroupUserList().then(res => {
+                //     if (!res.code) {
+                //         this.operateMethodOptions = res
+                //     }
+                // })
+                smapi.getUserList({current:1,size:500,type:2}).then(res => {
                     if (!res.code) {
-                        this.operateMethodOptions = res
+                        this.operateMethodOptions = res.records
                     }
                 })
             },
diff --git a/src/pages/payment-receipt/index.vue b/src/pages/payment-receipt/index.vue
index 9485f91..0bf90aa 100644
--- a/src/pages/payment-receipt/index.vue
+++ b/src/pages/payment-receipt/index.vue
@@ -3,7 +3,7 @@
         <div class="navigation-bar flex-row mb-16">
             <img src="../../assets/image/Link.png"  height="22" alt="">
             <a>/</a>
-            <a>回款凭证</a>
+            <a>还款凭证</a>
         </div>
         <div class="layout-tabs-content-box  background-color-fff border-radius-4">
             <div class="pt-8 border-b-solid-lighter-1">
@@ -141,7 +141,7 @@
                                 <span >{{ scope.row.actualPayDate | formaDate("yyyy-MM-dd") }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="createAt" label="上传回款凭证时间"  show-overflow-tooltip ></el-table-column>
+                        <el-table-column prop="createAt" label="上传还款凭证时间"  show-overflow-tooltip ></el-table-column>
                         <el-table-column prop="mediatorName" label="所属调解员"  show-overflow-tooltip ></el-table-column>
                         <el-table-column label="操作" width="200" >
                             <template slot-scope="scope">
diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue
index 6e9def3..e449993 100644
--- a/src/pages/workbench/index.vue
+++ b/src/pages/workbench/index.vue
@@ -761,7 +761,8 @@
     }
    
     .item-trace{
-        padding: 18px;
+        padding: 14px 18px;
+        height:575px ;
         background-color: #fff;
         border-radius: 8px;
         .case-pk-title{
diff --git a/src/router/index.js b/src/router/index.js
index 861d49f..593be7b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -136,7 +136,7 @@ const routes = [
         path: "/payment-receipt",
         name: "/payment-receipt",
         component: () => import("@/pages/payment-receipt"),
-        meta: { title: "回款凭证", icon: 'menu-mediat-management' },
+        meta: { title: "还款凭证", icon: 'menu-mediat-management' },
       },
 
       
diff --git a/src/utils/util.js b/src/utils/util.js
index c236f7a..e17e7c7 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -374,6 +374,7 @@ const util = {
     // 和当前时间对比，判断是否大于当前时间
     getTimeContrast(timeString) {
         const timedate = moment(timeString);
+        console.log(timedate > new Date(),'timedate > new Date()')
         return timedate > new Date()
     },
 
@@ -390,7 +391,7 @@ const util = {
     getTelephoneType() {
         return [{label:'已接',value:0},{label:'未接',value:1},{label:'拒接',value:2},
             {label:'关机',value:3},{label:'停机',value:4},{label:'暂时无法接通',value:5},
-            {label:'空号',value:8},{label:'设置',value:9},{label:'正在通话中',value:10}]
+            {label:'空号',value:7},{label:'设置',value:8},{label:'正在通话中',value:9}]
     },
     /**
      * 根据不同的类型返回不同的电话情况 this.$util.getTelephoneTypeData