diff --git a/src/filters/index.js b/src/filters/index.js index 1a79b94..3bca97a 100644 --- a/src/filters/index.js +++ b/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 }; \ No newline at end of file diff --git a/src/pages/mediation-page/components/LayoutContentNew.vue b/src/pages/mediation-page/components/LayoutContentNew.vue index 8f44b1c..6f32b3d 100644 --- a/src/pages/mediation-page/components/LayoutContentNew.vue +++ b/src/pages/mediation-page/components/LayoutContentNew.vue @@ -297,8 +297,8 @@
-
通话{{itemrecord.linkedDuration}}秒
-
视频{{itemrecord.linkedDuration}}秒
+
通话{{itemrecord.linkedDuration | secondsToMinutes}}
+
视频{{itemrecord.linkedDuration | secondsToMinutes}}
diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index d4e31bd..6144cf7 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -231,7 +231,7 @@ v-model="singlejointlyvisible" title="案件协办" trigger="click"> - + 协办 diff --git a/src/pages/mediation-page/components/VideoInvitation.vue b/src/pages/mediation-page/components/VideoInvitation.vue index e1b7e09..a8119ab 100644 --- a/src/pages/mediation-page/components/VideoInvitation.vue +++ b/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"> @@ -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("邀请成功"); diff --git a/src/pages/mediation-page/components/cassWrit.vue b/src/pages/mediation-page/components/cassWrit.vue index e168078..77092ea 100644 --- a/src/pages/mediation-page/components/cassWrit.vue +++ b/src/pages/mediation-page/components/cassWrit.vue @@ -43,7 +43,8 @@ 生成中 生成失败 - 已生成 + 已生成 + 待签字 签字中 已签字 签字失败 diff --git a/src/pages/mediation-page/components/singleJointlyPopover.vue b/src/pages/mediation-page/components/singleJointlyPopover.vue index a28afd5..a883c31 100644 --- a/src/pages/mediation-page/components/singleJointlyPopover.vue +++ b/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"> @@ -45,6 +45,10 @@ import smapi from "@/services/systemManage"; type: String, default: () => {}, }, + baseInfo: { + type: Object, + default: () => {}, + }, }, data() { return {