diff --git a/src/components/uploadFile.vue b/src/components/uploadFile.vue index 6bc8ebf..d4b0b16 100644 --- a/src/components/uploadFile.vue +++ b/src/components/uploadFile.vue @@ -260,7 +260,13 @@ this.$message({message: `请上传大小需在${this.fileSize}MB以内的文件`, type: 'warning'}); return } - + // 文件名称不能包含特殊字符 + let filename = param.file.name + let name = filename.substring(0, filename.lastIndexOf(".")) + if (this.$verify.specialCharNew(name)) { + this.$message.error('文件名称包含非法字符,请重新上传!') + return + } try { // let formData = new FormData() // formData.append('file', param.file) diff --git a/src/pages/case-management/components/RepaymentRecordDialog.vue b/src/pages/case-management/components/RepaymentRecordDialog.vue index 0f84489..98f8c16 100644 --- a/src/pages/case-management/components/RepaymentRecordDialog.vue +++ b/src/pages/case-management/components/RepaymentRecordDialog.vue @@ -13,7 +13,8 @@ diff --git a/src/pages/case-management/components/caseAllocationDialog.vue b/src/pages/case-management/components/caseAllocationDialog.vue index fd9dc47..7ca7c1a 100644 --- a/src/pages/case-management/components/caseAllocationDialog.vue +++ b/src/pages/case-management/components/caseAllocationDialog.vue @@ -159,10 +159,33 @@ import apipack from "@/services/casePackageManagement"; }, // 根据区域id列表查看用户列表 getByDeptList(){ + + // 当前区域自身 + let deptList = [] + let userlistmy = [] + api.getUserByDeptList({ids:[this.deptId]}).then(res => { + res.forEach(item =>{ + userlistmy.push({ + id:item.id, + realName:item.realName, + checked:false + }) + }) + }) + + deptList.push({ + deptId:this.deptId, + name:this.departmentOptions.find(item=>{ return item.id == this.deptId}).name, + count:this.departmentOptions.find(item=>{ return item.id == this.deptId}).count, + checked:false, + values:userlistmy + }) + + // 下属区域或团队 api.getDeptList({companyId:this.$store.state.userinfo.companyId,current:1,size:500,pid:this.deptId}).then(res => { if (!res.code) { - let deptList = [] + // let deptList = [] res.records.forEach(item =>{ let userlist = [] api.getUserByDeptList({ids:[item.id]}).then(res => { @@ -172,7 +195,7 @@ import apipack from "@/services/casePackageManagement"; id:item.id, realName:item.realName, checked:false - }) + }) }) }) @@ -185,7 +208,6 @@ import apipack from "@/services/casePackageManagement"; }) }) this.peopleList = deptList - } }) }, @@ -390,6 +412,6 @@ import apipack from "@/services/casePackageManagement"; margin-bottom:0; } } -.min-height350{min-height: 350px;} +.min-height350{height: 350px;} .department-dept ::v-deep .el-checkbox__label {color: $color-000000} \ No newline at end of file diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue index 7ddfb2d..fccdb4f 100644 --- a/src/pages/case-management/detail/index.vue +++ b/src/pages/case-management/detail/index.vue @@ -519,7 +519,7 @@ export default { if (filelist == undefined) { //还款凭证相关 this.$fetchApi.viewFullFile({path: scope.row.proofUrl}).then((res) => { - this.fileDialog = {showfile: {url: res}, filelist: []} + this.fileDialog = {showfile: {url: scope.row.proofUrl,fullUrl: res}, filelist: []} }); } else { diff --git a/src/pages/case-management/index.vue b/src/pages/case-management/index.vue index 2ee501c..e0aa7b7 100644 --- a/src/pages/case-management/index.vue +++ b/src/pages/case-management/index.vue @@ -233,7 +233,9 @@ - + + + 被申请人: @@ -273,7 +275,7 @@ 查看详情 - 删除 + 删除
@@ -420,7 +422,8 @@ import { values } from "lodash"; addCaseDialog:null,//新增 editCaseDrawer:null,//编辑 caseStatusData:[], - MediateUserList:[] + MediateUserList:[], + CreateuserId:'' } }, @@ -439,6 +442,10 @@ import { values } from "lodash"; }, created() { + if(JSON.parse(sessionStorage.getItem('userInfo'))){ + this.CreateuserId = JSON.parse(sessionStorage.getItem('userInfo')).id + } + if (this.$route.query.pkgName != undefined) { this.queryParam.pkgName = this.$route.query.pkgName; } @@ -483,7 +490,8 @@ import { values } from "lodash"; handleCheckAllChange(value){ // this.selectionData = value ? this.enabledDataList.map(el=>el.id) : []; // this.indeterminate = false; - let chooseData = this.enabledDataList.filter(el=>(el.caseStatus == 0 || el.caseStatus == 1)) + // (CreateuserId == scope.row.createBy*1) && (scope.row.caseStatus == 0 || scope.row.caseStatus == 1) + let chooseData = this.enabledDataList.filter(el=>((this.CreateuserId == el.createBy*1)&&(el.caseStatus == 0 || el.caseStatus == 1))) // console.log(chooseData,'chooseData') this.selectionData = value ? chooseData.map(el=>el.id) : []; this.indeterminate = false; diff --git a/src/pages/case-package/index.vue b/src/pages/case-package/index.vue index a29b204..74aeec6 100644 --- a/src/pages/case-package/index.vue +++ b/src/pages/case-package/index.vue @@ -287,7 +287,7 @@ import api from "@/services/casePackageManagement"; }).then(() => { if(!this.$clickThrottle()) { return }//防止重复点击 api.postpkgquash({id:scope.row.id}).then((res) => { - this.$message.success("撤回分案成功"); + this.$message.success("未触达案件撤回分案成功!"); this.getCaseInfoList(1) }); diff --git a/src/pages/event-tracing/components/repaymentDialog.vue b/src/pages/event-tracing/components/repaymentDialog.vue index dbd7243..852a774 100644 --- a/src/pages/event-tracing/components/repaymentDialog.vue +++ b/src/pages/event-tracing/components/repaymentDialog.vue @@ -51,7 +51,7 @@
-
还款登记列表
+
还款凭证登记列表
@@ -72,8 +72,12 @@ - - + + +