Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!27

src/pages/event-tracing/components/CallDialog.vue

@@ -188,7 +188,7 @@ import { size } from "lodash";
             },
             // 进入队列
             handleEnterqueue(row){
-                this.$router.push({path: '/mediation-page', query: {sourcePage: 'home'}})
+                this.$router.push({path: '/mediation-page', query: {sourcePage: 'home', queue: true}})
             }
         }
     };

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>

src/pages/mediation-page/components/LayoutContentNew.vue

@@ -186,7 +186,7 @@
 
           <!-- 联系人信息 -->
           <div v-if="leftActive == 2" class="case-contact-person">
-            <contactPerson :caseId="caseId" @startOutboundCall="startOutboundCall" />
+            <contactPerson :caseId="caseId" @startOutboundCall="startOutboundCall" @updateCaseInfoById="updateCaseInfoById" />
             
           </div>
 
@@ -448,6 +448,9 @@ export default {
     // }
   },
   methods: {
+    updateCaseInfoById(){
+      this.$emit('updateCaseInfoById');
+    },
     handlerMouseenter(val) {
       this.leftActive = val
       if (val !== 1) this.singlesmsvisible = false

src/pages/mediation-page/components/MediationRoom.vue

@@ -113,7 +113,7 @@
       </div>
       
       <!-- 中间数据 -->
-      <LayoutContentNew ref="layoutContent" :caseId="caseId" @startOutboundCall="startOutboundCall" />
+      <LayoutContentNew ref="layoutContent" :caseId="caseId" @startOutboundCall="startOutboundCall" @updateCaseInfoById="getCaseInfoById" />
 
     </div>
 
@@ -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>
@@ -487,6 +487,7 @@ export default {
     // 获取详情
     async getCaseInfoById() {
       // this.$loading(true)
+      this.sendPhones = []
       await api.getCaseInfoById(this.caseId).then(res => {
         if (!res.code) {
           this.baseInfo = res
@@ -510,9 +511,11 @@ export default {
           }
           
         }
-        // this.$loading.close()
+        this.$loading().close();
         this.eventDialog.caseId = this.caseId
         // this.getmediate_record()
+      }).catch(err => {
+        this.$loading().close();
       })
     },
     // 获取上一件案件
@@ -523,6 +526,11 @@ export default {
       if(this.queue || this.index === 0) return
       this.index--
       this.caseId = String(this.queueList[this.index].caseId)
+      this.$loading({
+          lock: true,
+          text: '加载中...',
+          target: 'body'
+      });
       this.getCaseInfoById()
       // api.getFrontCaseById({id: this.caseId}).then(res => {
       //   if (!res.code) {
@@ -533,7 +541,7 @@ export default {
     },
     // 获取下一件案件
     getNextCaseById() {
-      if (!this.$clickThrottle()) {
+      if (!this.$clickThrottle(1000)) {
         return
       }//防止重复点击
       if(this.queue || this.index >= this.queueList.length - 1) return
@@ -541,6 +549,11 @@ export default {
       this.caseId = String(this.queueList[this.index].caseId)
       console.log('下一个案件id: ' + this.caseId, this.index, this.queueList)
 
+      this.$loading({
+          lock: true,
+          text: '加载中...',
+          target: 'body'
+      });
       this.getCaseInfoById()
 
       // api.getNextCaseById({id: this.caseId}).then(res => {

src/pages/mediation-page/components/RepaymentCertificate.vue

@@ -75,11 +75,12 @@
                             <span class="color-86909C mt-8 pt12-pb10">备注说明：<a>{{ proofitem.remark }}</a></span>
                         </div>
                         <div class="mt-8">
-                            <el-popover  v-if="proofitem.status.code == 1"
+                            <el-popover v-if="proofitem.status.code == 1"
                                 placement="left"
                                 width="400"
                                 title="凭证效验"
-                                trigger="click">
+                                trigger="click"
+                                v-model="proofitem.visible">
                                 <el-form class="mt-8" :ref="`ruleFormEffect${index}`"
                                     :model="proofitem" 
                                     :rules="rulesClientRepayment" 
@@ -110,7 +111,8 @@
                                         </el-input>
                                     </el-form-item>
                                     <el-form-item label="">
-                                        <el-button type="primary" @click="handleSubmitEffect(proofitem,('ruleFormEffect'+index))" size="small">保存</el-button>
+                                        <el-button type="primary" @click="handleSubmitEffect(proofitem,('ruleFormEffect'+index),index)" size="small">保存</el-button>
+                                        <el-button type="primary" @click="proofitem.visible = false" size="small">取消</el-button>
                                     </el-form-item>
                                 </el-form>
                                 <span slot="reference" class="color-86909C cursor-pointer"><i class="el-icon-medal"></i>&nbsp;效验</span>
@@ -235,12 +237,7 @@ import api from "@/services/caseManagement";
             getProofList(){
                 api.gettraceProof_list({caseId:this.eventDialog.caseId}).then(async res => {
                      if(!res.code){
-                        // this.ProofList = res
-                        // this.ProofList.forEach(item =>{
-                        //     item.mediaPath = [item.proofUrl]
-                        // })
                         await this.getpreviewfull(res)
-                        console.log(this.ProofList,'this.ProofList')
                      }
                 })
             },
@@ -250,6 +247,7 @@ import api from "@/services/caseManagement";
                     try {
                         item.previewUrl = await this.$fetchApi.viewFullFile({path: item.proofUrl})
                         item.mediaPath = [item.proofUrl]
+                        item.visible = false
                         this.ProofList.push(item);
                     } catch (error) {
                     console.error(`调用接口失败，错误:`, error);
@@ -270,14 +268,14 @@ import api from "@/services/caseManagement";
                 this.fileList = [{url: proofitem.proofUrl,fileName:'上传'}]
             },
             // 效验
-            handleSubmitEffect(proofitem,formName){
+            handleSubmitEffect(proofitem,formName,indexnum){
                 this.$refs[formName][0].validate((valid) => {
                     if (valid){
                         proofitem.createAt =undefined
                         proofitem.createBy =undefined
                         proofitem.delFlag =undefined
                         proofitem.planId =undefined
-                        proofitem.status =undefined
+                        // proofitem.status =undefined
                         proofitem.updateAt =undefined
                         proofitem.updateBy =undefined
                         proofitem.uploaderName =undefined
@@ -285,6 +283,10 @@ import api from "@/services/caseManagement";
                         proofitem.proofUrl =undefined
                         api.gettraceProof_valid(proofitem).then(res => {
                             if(!res.code){
+
+                                this.ProofList.forEach((item,index) =>{
+                                    if(index == indexnum){item.visible = false}
+                                })
                                 this.getProofList()
                             }
                         })

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)"
+                <div v-if="$util.getTimeContrast(item.bookingEndTime)" >
-                     @click="handleVideoCall(item)">
+                  <div class="f16 mr-8 cursor-pointer"
-                  <i class="el-icon-video-camera"></i>
+                      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}">

src/pages/mediation-page/components/contactPerson.vue

@@ -50,7 +50,7 @@
       </div>
     </el-card>
 
-    <contactPersonDialog v-if="contactAddObj" :eventDialog.sync="contactAddObj" />
+    <contactPersonDialog v-if="contactAddObj" :eventDialog.sync="contactAddObj" @updateCaseInfoById="updateCaseInfoById"/>
   </div>
 </template>
 
@@ -83,6 +83,9 @@ export default {
     this.handleTab('被申请人')
   },
   methods: {
+    updateCaseInfoById(){
+      this.$emit('updateCaseInfoById');
+    },
     handleTab(item) {
       this.personnelTypeActive = item;
       this.getList();

src/pages/mediation-page/components/contactPersonDialog.vue

@@ -255,6 +255,9 @@ export default {
               this.$parent.getList();
               this.handleClose();
               this.$message.success("操作成功");
+              this.$emit('updateCaseInfoById');
+              this.$parent.getCaseInfoById();
+              
             });
           }
         });

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>

src/pages/mediation-page/components/singleJointlyPopover.vue

@@ -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: {

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()
     },