Merge branch 'main' into 'stg'
Main See merge request cloud-mediate/mediate-manage-web!22
This commit is contained in:
刘翕
commit
2e4a326aae
@ -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)
|
||||
|
||||
@ -13,7 +13,8 @@
|
||||
<el-table :data="tableData" height="390" >
|
||||
<el-table-column prop="amount" label="凭证金额" show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
<span >{{ scope.row.amount }}（元）</span>
|
||||
<span v-if="scope.row.amount > 0">{{ scope.row.amount }}（元）</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="paybackTime" label="还款日期" show-overflow-tooltip ></el-table-column>
|
||||
|
||||
@ -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}
|
||||
</style>
|
||||
@ -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 {
|
||||
|
||||
@ -233,7 +233,9 @@
|
||||
<el-checkbox-group v-model="selectionData">
|
||||
<!-- 此处的label是复选框右边显示的值，也是选中后的值。如果要一行的数据，直接使用row即可 -->
|
||||
<!-- label的内容会显示在页面上，需要配合css把label的内容隐藏掉 -->
|
||||
<el-checkbox :disabled="scope.row.caseStatus == 0 || scope.row.caseStatus == 1 ? false :true" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
|
||||
<!-- 非自己创建的案件不能删除、分配、结案 -->
|
||||
<!-- <el-checkbox :disabled="(scope.row.caseStatus == 0 || scope.row.caseStatus == 1) ? false :true" :key="scope.row.id" :label="scope.row.id"></el-checkbox> -->
|
||||
<el-checkbox :disabled="(CreateuserId == scope.row.createBy*1) && (scope.row.caseStatus == 0 || scope.row.caseStatus == 1) ? false :true" :key="scope.row.id" :label="scope.row.id"></el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</span>
|
||||
<span class="f-weight500 color-000 f16">被申请人：
|
||||
@ -273,7 +275,7 @@
|
||||
</span>
|
||||
<span style=" text-align: right;">
|
||||
<el-button size="mini" class="case-btn" @click="jumpUrl(`/case-detail?dataKey=casepack&caseId=${scope.row.id}`)">查看详情</el-button>
|
||||
<el-button size="mini" class="case-btn" @click="handleDelete(scope)">删除</el-button>
|
||||
<el-button size="mini" v-if="CreateuserId == scope.row.createBy*1" class="case-btn" @click="handleDelete(scope)">删除</el-button>
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-row justify-content-between case-bg">
|
||||
@ -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;
|
||||
|
||||
@ -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)
|
||||
|
||||
});
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
<!-- table -->
|
||||
<div class="pt-8">
|
||||
<div class="height-56 flex-row align-items-center justify-content-between">
|
||||
<div class="f18 color-text-primary">还款登记列表</div>
|
||||
<div class="f18 color-text-primary">还款凭证登记列表</div>
|
||||
<div class="flex-row">
|
||||
|
||||
</div>
|
||||
@ -72,8 +72,12 @@
|
||||
<!-- <el-table-column prop="deadline" label="还款截止日期" show-overflow-tooltip ></el-table-column>
|
||||
<el-table-column prop="payableAmount" label="应还金额" show-overflow-tooltip ></el-table-column> -->
|
||||
<el-table-column prop="actualPayDate" label="实际还款日期" show-overflow-tooltip ></el-table-column>
|
||||
<el-table-column prop="amount" label="实际还款金额" show-overflow-tooltip ></el-table-column>
|
||||
|
||||
<el-table-column prop="amount" label="实际还款金额" show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.amount > 0">{{ scope.row.amount }}（元）</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
<span >
|
||||
@ -120,6 +124,8 @@
|
||||
<RepaymentEffectDialog v-if="EffectDialog" :EffectDialog.sync="EffectDialog" />
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import api from "@/services/eventTracingApi";
|
||||
@ -217,13 +223,10 @@ import caseapi from "@/services/caseManagement";
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleCaseShow(scope){
|
||||
|
||||
//还款凭证相关
|
||||
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: []}
|
||||
});
|
||||
|
||||
// this.fileDialog = {showfile:{url:scope.row.proofUrl},filelist:[]}
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
<span class="color-86909C mt-8">上传时间：<a>{{ proofitem.createAt }}</a></span>
|
||||
</div>
|
||||
</div>
|
||||
<span class="color-86909C mt-8 pt12-pb10">凭证金额：<a>{{ proofitem.amount }}</a>{{ proofitem.amount != null ? '元' : '' }}</span>
|
||||
<span class="color-86909C mt-8 pt12-pb10">凭证金额：<a>{{ (proofitem.amount == 0 ?'' : proofitem.amount) }}</a>{{ (proofitem.amount != null&&proofitem.amount != 0) ? '元' : '' }}</span>
|
||||
<span class="color-86909C mt-8 pt12-pb10 bgColor-F7F8FA">还款日期：<a>{{ proofitem.paybackTime | formaDate('yyyy-MM-dd hh:mm:ss') }}</a></span>
|
||||
<span class="color-86909C mt-8 pt12-pb10">备注说明：<a>{{ proofitem.remark }}</a></span>
|
||||
</div>
|
||||
@ -194,7 +194,7 @@ import api from "@/services/caseManagement";
|
||||
rulesClientRepayment:{
|
||||
amount: [
|
||||
{ required: true, message: '请输入还款金额', trigger: 'change',},
|
||||
{ pattern: /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0.\d{1,2}$/, message: '请输入2位小数金额', trigger: ['blur', 'change']}
|
||||
{ pattern: /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0.\d{1,2}$/, message: '请输入大于0且最多2位小数金额', trigger: ['blur', 'change']}
|
||||
],
|
||||
paybackTime: [
|
||||
{ required: true, message: '请选择还款日期', trigger: 'change',},
|
||||
|
||||
@ -109,13 +109,7 @@ export default {
|
||||
}
|
||||
})
|
||||
this.repaymentObj.name = this.fileList.length?this.fileList[0].objectName : '';
|
||||
if (!this.$verify.specialChar(this.repaymentObj.name)) {
|
||||
this.$message.error('文件名称包含非法字符，请重新上传！')
|
||||
return false
|
||||
}
|
||||
this.repaymentObj.url = this.fileList.length?this.fileList[0].fileName : '';
|
||||
|
||||
console.log(this.repaymentObj, '---this.repaymentObj', this.fileList)
|
||||
},
|
||||
handleClose() {
|
||||
this.$emit('update:eventDialog', null)
|
||||
|
||||
@ -35,7 +35,13 @@ function specialChar(value) {
|
||||
return /^[^~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]+$/
|
||||
.test(value)
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证特殊字符格式
|
||||
*/
|
||||
function specialCharNew(value) {
|
||||
return /[ \n\t&V:?"#*|&<>%'+]/
|
||||
.test(value)
|
||||
}
|
||||
/**
|
||||
* 替换特殊字符格式
|
||||
*/
|
||||
@ -222,5 +228,6 @@ export default {
|
||||
specialCharRep,
|
||||
postalCode,
|
||||
specialChar,
|
||||
specialCharNew,
|
||||
judgeCard
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user