Merge branch 'main' into 'stg'

修改bug

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

src/filters/index.js

@@ -137,6 +137,20 @@ let formaDate = (value, fmt)  => {
     return fmt;
 }
 
+let secondsToMinutes = (value)  => {
+
+    if(value == 0 || value == ''|| value == null){return ''}
+    const minutes = Math.floor(value / 60);
+    const seconds = value % 60;
+    if(minutes > 0)
+    {
+        return `${minutes} 分钟 ${seconds} 秒`;
+    }
+    else{
+        return `${seconds} 秒`;
+    }
+}
+
 export default {
     sexIdcardFilter,
     IDcardHide,
@@ -146,5 +160,6 @@ export default {
     numToFixed,
     trim,
     upDigit,
-    formaDate
+    formaDate,
+    secondsToMinutes
 };

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

@@ -297,8 +297,8 @@
                       </div>
                       <!-- 电话 --><!-- 微信 --> <!-- 视频 -->
                       <div class="flex-row align-items-center pt-6">
-                        <div v-if="itemrecord.linkedType == 1&&itemrecord.linkedWay == 1">通话{{itemrecord.linkedDuration}}秒</div>
-                        <div v-if="itemrecord.linkedType == 1&&itemrecord.linkedWay == 2">视频{{itemrecord.linkedDuration}}秒</div>
+                        <div v-if="itemrecord.linkedType == 1&&itemrecord.linkedWay == 1">通话{{itemrecord.linkedDuration | secondsToMinutes}}</div>
+                        <div v-if="itemrecord.linkedType == 1&&itemrecord.linkedWay == 2">视频{{itemrecord.linkedDuration | secondsToMinutes}}</div>
                         <el-divider v-if="itemrecord.linkedType == 1 && (itemrecord.linkedWay == 1 || itemrecord.linkedWay == 2)" direction="vertical"></el-divider>
                         <div class="text-center cursor-pointer mr-8" v-for="(item,index) in itemrecord.files" :key="index" @click="handleCaseShowFile(item)">
                           <i v-if="$util.getFileType(item) != 'image' " class="f14 el-icon-video-play"></i> 

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

@@ -231,7 +231,7 @@
             v-model="singlejointlyvisible"
             title="案件协办"
             trigger="click">
-            <singleJointlyPopover :caseId="caseId" :assistMediatorId="baseInfo.assistMediatorId" :singlejointlyvisible.sync="singlejointlyvisible" @handleSubmit="getCaseInfoById()"/>
+            <singleJointlyPopover :caseId="caseId" :assistMediatorId="baseInfo.assistMediatorId" :baseInfo="baseInfo" :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>

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

@@ -17,7 +17,7 @@
                         v-for="(item,index) in litigantsOptions"
                         :key="index"
                         :label="item.name+ ' ' +'('+ item.phone +')'"
-                        :value="item.identity">
+                        :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -170,10 +170,10 @@ export default {
       if(!this.$clickThrottle()) { return }//防止重复点击
       this.$refs.ruleFormRepayment.validate((valid) => {
         if (valid) {
+          // identity ,name ,phone 
           const resultArr = this.litigantsOptions
-              .filter(item => this.repaymentObj.litigants.includes(item.identity))
+              .filter(item => this.repaymentObj.litigants.includes(item.id))
               .map(({name, phone, identity}) => ({name, phone, identity}));
-          this.repaymentObj.id = this.eventDialog.id;
           videoTelephone.videoInvite({...this.repaymentObj, litigants: resultArr}).then(res => {
             this.handleClose()
             this.$message.success("邀请成功");

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

@@ -43,7 +43,8 @@
               <!-- signStatus  0 未发起  1签字中 2签字完成  3签字失败  -->
                 <a class="case-status0" v-if="item.documentStaus.code == 1">生成中</a>
                 <a class="result-status0" v-if="item.documentStaus.code == 3">生成失败</a>
-                <a class="case-status3" v-if="item.documentStaus.code == 2 && (item.signStatus == null || item.signStatus.code == 0)">已生成</a>
+                <a class="case-status3" v-if="item.documentStaus.code == 2 && item.signStatus == null">已生成</a>
+                <a class="case-status3" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 0">待签字</a>
                 <a class="case-status0" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 2">签字中</a>
                 <a class="case-status3" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 3">已签字</a>
                 <a class="result-status0" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 1">签字失败</a>

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

@@ -16,7 +16,7 @@
                                             :key="item.id"
                                             :label="item.realName"
                                             :value="item.id"
-                                            :disabled="userInfo.id == item.id ? true : false">
+                                            :disabled="(userInfo.id == item.id || baseInfo.mediatorId == item.id) ? true : false">
                                     </el-option>
                                 </el-select>
                             </el-form-item>
@@ -45,6 +45,10 @@ import smapi from "@/services/systemManage";
                 type: String,
                 default: () => {},
             },
+            baseInfo: {
+                type: Object,
+                default: () => {},
+            },
         },
         data() {
             return {