姓名:{{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()
},
From 57fc4f987e70317859b38a8ee17181c5c3c7f387 Mon Sep 17 00:00:00 2001
From: liuxi <357439530@qq.com>
Date: Tue, 18 Feb 2025 10:42:31 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/event-tracing/components/officeDialog.vue | 4 ++--
src/pages/mediation-page/components/portraitPerson.vue | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
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 @@
明细
- 重试
- 取消
+ 重试
+ 取消
diff --git a/src/pages/mediation-page/components/portraitPerson.vue b/src/pages/mediation-page/components/portraitPerson.vue
index fe943f9..51d7740 100644
--- a/src/pages/mediation-page/components/portraitPerson.vue
+++ b/src/pages/mediation-page/components/portraitPerson.vue
@@ -87,7 +87,7 @@
人物画像
-
+
性别
-
{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ?'男':'女'}}
+
{{(portraitInfo.gender == 'male' || portraitInfo.gender == '') ?'男':'女'}}
电话
@@ -217,7 +217,7 @@
姓名:{{portraitInfo.name}}
-
性别:{{(portraitInfo.gender == 'Male' || portraitInfo.gender == '') ? '男':'女'}}
+
性别:{{(portraitInfo.gender == 'male' || portraitInfo.gender == '') ? '男':'女'}}
年龄:{{portraitInfo.age}}
手机号码:{{portraitInfo.phoneNumber}}
身份证号:{{portraitInfo.idCardNumber}}
From 4ccd093c4cf88c91868ed0239367d50c925eb33e Mon Sep 17 00:00:00 2001
From: liuxi <357439530@qq.com>
Date: Tue, 18 Feb 2025 14:15:22 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/style/common.scss | 6 +--
.../components/RepaymentEffectDialog.vue | 1 +
src/pages/case-management/detail/index.vue | 52 +++++++++++++++++--
.../components/singleJointlyPopover.vue | 10 +++-
src/pages/workbench/index.vue | 3 +-
5 files changed, 63 insertions(+), 9 deletions(-)
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..814c2d9 100644
--- a/src/pages/case-management/detail/index.vue
+++ b/src/pages/case-management/detail/index.vue
@@ -57,6 +57,33 @@
联系人手机:{{item.phone}}
+
+
+
+
+
案件办理信息
@@ -220,7 +247,7 @@
回款凭证
总计待还金额:{{ ProofStatistics.total || 0 }}元,总计已还金额:{{ ProofStatistics.payback || 0 }}元
+ class="f16">计划还款金额:{{ ProofStatistics.total || 0 }}元,已还金额:{{ ProofStatistics.payback || 0 }}元
@@ -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/mediation-page/components/singleJointlyPopover.vue b/src/pages/mediation-page/components/singleJointlyPopover.vue
index 6f02d7d..a28afd5 100644
--- a/src/pages/mediation-page/components/singleJointlyPopover.vue
+++ b/src/pages/mediation-page/components/singleJointlyPopover.vue
@@ -32,6 +32,7 @@