From d1060cc6129cbdfd1cd8ea7bc76da18086ba8eee Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Thu, 13 Feb 2025 15:34:30 +0800 Subject: [PATCH 1/3] =?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/main.js | 4 ++-- .../event-tracing/components/repaymentDialog.vue | 1 + src/pages/layout/components/SideMenu.vue | 4 ++-- src/pages/login/index.vue | 11 +++-------- src/pages/mediation-management/index.vue | 1 + .../components/addOrEditDeptDialog.vue | 2 +- src/pages/system-management/area-management/index.vue | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main.js b/src/main.js index 3fa1249..a561872 100644 --- a/src/main.js +++ b/src/main.js @@ -87,8 +87,8 @@ new Vue({ if(!interviewFlag) { // 判断当前登录人角色，如果是普通调解员，则默认展示区域且不可选择 - let identifier = this.$store.state.userinfo.roleIdentifier - if(identifier.includes('manager')) + let identifier = this.$store.state.userinfo.roleIdentifierList + if(identifier.includes('manager') || identifier.includes('admin')) { router.push('/workbench') } diff --git a/src/pages/event-tracing/components/repaymentDialog.vue b/src/pages/event-tracing/components/repaymentDialog.vue index 870c105..dbd7243 100644 --- a/src/pages/event-tracing/components/repaymentDialog.vue +++ b/src/pages/event-tracing/components/repaymentDialog.vue @@ -188,6 +188,7 @@ import caseapi from "@/services/caseManagement"; getProofList(val){ this.queryParam.startTime = this.queryParam.beginTime this.queryParam.current = val + this.queryParam.isDebatorUpload = 1 api.posttrace_proof(this.queryParam).then(res => { if (!res.code) { this.tableData = res.records; diff --git a/src/pages/layout/components/SideMenu.vue b/src/pages/layout/components/SideMenu.vue index bc3a227..b4b68d4 100644 --- a/src/pages/layout/components/SideMenu.vue +++ b/src/pages/layout/components/SideMenu.vue @@ -47,8 +47,8 @@ if(this.menuTree.length>0) { // 判断当前登录人角色，如果是普通调解员，则默认展示区域且不可选择 - let identifier = this.$store.state.userinfo.roleIdentifier - if(identifier.includes('manager')) + let identifier = this.$store.state.userinfo.roleIdentifierList + if(identifier.includes('manager') || identifier.includes('admin')) { // 案件管理员 this.menuTree.unshift({children:[],id:0,menuIcon:"menu-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbench"}) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 9af68c0..71550eb 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -183,17 +183,12 @@ export default { if (res.user.resources.length > 0) { let url = "/workbenchcm"; - let identifier = res.user.roleIdentifier - if(identifier.includes('manager')) + let identifier = res.user.roleIdentifierList + if(identifier.includes('manager') || identifier.includes('admin')) { url = '/workbench' } - // let data= res.user.resources[0].children[0] - // if(data.children.length>0){ - // url = data.children[0].url - // }else{ - // url = data.url - // } + this.$store.commit('setRoutes', url) this.$router.push(url) } else { diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue index d6da406..11cbd5b 100644 --- a/src/pages/mediation-management/index.vue +++ b/src/pages/mediation-management/index.vue @@ -664,6 +664,7 @@ import { values } from "lodash"; this.checkedCheckAll = false this.queryParam.current = val + this.queryParam.dispatch = true //默认已分案 api.getCaseInfoList(this.queryParam).then(res => { if (!res.code) { this.tableData = res.records; diff --git a/src/pages/system-management/area-management/components/addOrEditDeptDialog.vue b/src/pages/system-management/area-management/components/addOrEditDeptDialog.vue index ce6f8a3..cabd1e2 100644 --- a/src/pages/system-management/area-management/components/addOrEditDeptDialog.vue +++ b/src/pages/system-management/area-management/components/addOrEditDeptDialog.vue @@ -40,7 +40,7 @@ - +
Date: Thu, 13 Feb 2025 16:21:07 +0800 Subject: [PATCH 2/3] =?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/case-management/components/CalllogDialog.vue | 2 +- src/pages/case-management/components/CaseTraceDialog.vue | 5 +---- src/pages/event-tracing/components/officeWriteDialog.vue | 3 +++ src/pages/event-tracing/components/voideDialog.vue | 3 +++ .../dtraceDetail/officeDeliveryDialogDetail.vue | 4 ++++ src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue | 3 +++ src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue | 3 +++ src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue | 4 ++++ .../user-management/components/addOrEditUserDialog.vue | 2 +- 9 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/pages/case-management/components/CalllogDialog.vue b/src/pages/case-management/components/CalllogDialog.vue index e24e12f..3098a43 100644 --- a/src/pages/case-management/components/CalllogDialog.vue +++ b/src/pages/case-management/components/CalllogDialog.vue @@ -83,7 +83,7 @@ import api from "@/services/caseManagement"; }; }, mounted () { - console.log(this.eventTraDialog,'this.eventTraDialog') + // console.log(this.eventTraDialog,'this.eventTraDialog') this.queryParam.caseId = this.eventTraDialog.caseId this.getmediate_record() }, diff --git a/src/pages/case-management/components/CaseTraceDialog.vue b/src/pages/case-management/components/CaseTraceDialog.vue index 0121a02..6e1c085 100644 --- a/src/pages/case-management/components/CaseTraceDialog.vue +++ b/src/pages/case-management/components/CaseTraceDialog.vue @@ -66,7 +66,7 @@ import api from "@/services/caseManagement"; export default { components: { - eventTracingDialog: () => import('../../event-tracing/index.vue'),//事项追踪 + // eventTracingDialog: () => import('../../event-tracing/index.vue'),//事项追踪 RepaymentSchedule: () => import('../../mediation-page/components/RepaymentSchedule.vue'),//还款计划 RepaymentRecordDialog: () => import('./RepaymentRecordDialog.vue'),//还款凭证 @@ -75,9 +75,6 @@ import api from "@/services/caseManagement"; CalllogDialog: () => import('./CalllogDialog.vue'),//呼叫记录 voideDialog: () => import('../../event-tracing/components/voideDialog.vue'),//视频调解追踪 - - smsDialogDetail: () => import('../../event-tracing/dtraceDetail/smsDialogDetail.vue'),//短信发送追踪明细 - officeDeliveryDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue'),//文书送达追踪明细 officeDialogDetail: () => import('../../event-tracing/dtraceDetail/officeDialogDetail.vue'),//文书生成追踪明细 officeWDialogDetail: () => import('../../event-tracing/dtraceDetail/officeWDialogDetail.vue'),//文书签字追踪明细 diff --git a/src/pages/event-tracing/components/officeWriteDialog.vue b/src/pages/event-tracing/components/officeWriteDialog.vue index c0c27aa..ec74f5e 100644 --- a/src/pages/event-tracing/components/officeWriteDialog.vue +++ b/src/pages/event-tracing/components/officeWriteDialog.vue @@ -148,6 +148,9 @@ import api from "@/services/eventTracingApi"; }, mounted () { this.queryParam.caseNo = this.eventTraDialog.caseNo + if (this.eventTraDialog.caseId != undefined && this.eventTraDialog.caseId != '') { + this.queryParam.caseId = this.eventTraDialog.caseId + } this.getList(1) }, methods: { diff --git a/src/pages/event-tracing/components/voideDialog.vue b/src/pages/event-tracing/components/voideDialog.vue index eaecfee..73e8551 100644 --- a/src/pages/event-tracing/components/voideDialog.vue +++ b/src/pages/event-tracing/components/voideDialog.vue @@ -149,6 +149,9 @@ export default { }, mounted() { this.queryParam.caseNo = this.eventTraDialog.caseNo + if (this.eventTraDialog.caseId != undefined && this.eventTraDialog.caseId != '') { + this.queryParam.caseId = this.eventTraDialog.caseId + } this.getList(1) }, methods: { diff --git a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue index 802f887..4c73391 100644 --- a/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeDeliveryDialogDetail.vue @@ -127,6 +127,10 @@ import api from "@/services/eventTracingApi"; }, mounted () { this.queryParam.caseNo = this.DialogDetail.caseNo + if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') { + this.queryParam.caseId = this.DialogDetail.caseId + } + this.queryParam.traceId = this.DialogDetail.id this.getList(1) }, diff --git a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue index 5c4e335..c60b746 100644 --- a/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeDialogDetail.vue @@ -112,6 +112,9 @@ import api from "@/services/eventTracingApi"; mounted () { this.queryParam.traceId = this.DialogDetail.id this.queryParam.caseNo = this.DialogDetail.caseNo + if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') { + this.queryParam.caseId = this.DialogDetail.caseId + } this.getList(1) }, methods: { diff --git a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue index dbd6993..f201c3d 100644 --- a/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue @@ -108,6 +108,9 @@ import api from "@/services/eventTracingApi"; }, mounted () { this.queryParam.caseNo = this.DialogDetail.caseNo + if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') { + this.queryParam.caseId = this.DialogDetail.caseId + } this.queryParam.traceId = this.DialogDetail.id this.getList(1) }, diff --git a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue index 1871011..e6e64e2 100644 --- a/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue +++ b/src/pages/event-tracing/dtraceDetail/smsDialogDetail.vue @@ -140,6 +140,10 @@ export default { if (this.DialogDetail.caseNo != undefined && this.DialogDetail.caseNo != '') { this.queryParam.caseNo = this.DialogDetail.caseNo } + if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') { + this.queryParam.caseId = this.DialogDetail.caseId + } + this.queryParam.traceId = this.DialogDetail.id this.getList(1) }, diff --git a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue index b47bf38..27a4748 100644 --- a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue +++ b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue @@ -109,7 +109,7 @@ - + Date: Thu, 13 Feb 2025 16:42:04 +0800 Subject: [PATCH 3/3] =?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/case-management/index.vue | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/pages/case-management/index.vue b/src/pages/case-management/index.vue index 3208300..2ee501c 100644 --- a/src/pages/case-management/index.vue +++ b/src/pages/case-management/index.vue @@ -388,6 +388,7 @@ import { values } from "lodash"; queryParam: { mediateRecordStatus:[], pkgId:'', + pkgName:'', financialOrgName:'',//金融机构名称 caseNo: '',//案件编号 productTypeId: '',//产品类型id @@ -483,12 +484,11 @@ import { values } from "lodash"; // this.selectionData = value ? this.enabledDataList.map(el=>el.id) : []; // this.indeterminate = false; let chooseData = this.enabledDataList.filter(el=>(el.caseStatus == 0 || el.caseStatus == 1)) - console.log(chooseData,'chooseData') + // console.log(chooseData,'chooseData') this.selectionData = value ? chooseData.map(el=>el.id) : []; this.indeterminate = false; }, - // 导入 handleImport(){ this.importCaseDialog={ @@ -535,12 +535,6 @@ import { values } from "lodash"; }); }).catch(() => {}); }, - // 新增 - // handleAddForm(){ - // this.addCaseDialog={ - // title:'新增案件', - // } - // }, handleConclude() { // 批量办结 if (this.selectionData.length == 0) { @@ -590,6 +584,7 @@ import { values } from "lodash"; this.checkedCheckAll = false this.queryParam.current = val + this.queryParam.allCase = true//查询所有案件 api.getCaseInfoList(this.queryParam).then(res => { if (!res.code) { this.tableData = res.records;