diff --git a/src/pages/event-tracing/components/CallDialog.vue b/src/pages/event-tracing/components/CallDialog.vue index b23ecdd..e65f6c4 100644 --- a/src/pages/event-tracing/components/CallDialog.vue +++ b/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}}) } } }; 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 @@ @@ -86,7 +87,7 @@ @@ -83,6 +83,9 @@ export default { this.handleTab('被申请人') }, methods: { + updateCaseInfoById(){ + this.$emit('updateCaseInfoById'); + }, handleTab(item) { this.personnelTypeActive = item; this.getList(); diff --git a/src/pages/mediation-page/components/contactPersonDialog.vue b/src/pages/mediation-page/components/contactPersonDialog.vue index fcdf07b..f64d09e 100644 --- a/src/pages/mediation-page/components/contactPersonDialog.vue +++ b/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(); + }); } }); diff --git a/src/pages/mediation-page/components/portraitPerson.vue b/src/pages/mediation-page/components/portraitPerson.vue index 9d07316..fe943f9 100644 --- a/src/pages/mediation-page/components/portraitPerson.vue +++ b/src/pages/mediation-page/components/portraitPerson.vue @@ -87,7 +87,7 @@
人物画像
-
+
基本信息
@@ -97,7 +97,7 @@
性别
-
{{portraitInfo.gender == 'Male' ?'男':'女'}}
+
{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ?'男':'女'}}
电话
@@ -217,7 +217,7 @@
身份信息
姓名:{{portraitInfo.name}} - 性别:{{portraitInfo.gender == 'Male' ? '男':'女'}} + 性别:{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ? '男':'女'}} 年龄:{{portraitInfo.age}} 手机号码:{{portraitInfo.phoneNumber}} 身份证号:{{portraitInfo.idCardNumber}} diff --git a/src/pages/mediation-page/components/singleJointlyPopover.vue b/src/pages/mediation-page/components/singleJointlyPopover.vue index f622f6f..6f02d7d 100644 --- a/src/pages/mediation-page/components/singleJointlyPopover.vue +++ b/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: { diff --git a/src/utils/util.js b/src/utils/util.js index c236f7a..d0065ee 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() },