调完新增功能,暂时没看到问题

master
e 3 years ago
parent e91c7f28f0
commit d9ec20d0ad
  1. 3
      src/components/common/Sidebar.vue
  2. 6
      src/components/common/flowPathMoudle.vue
  3. 1
      src/components/common/left-sidebar.vue
  4. 2
      src/components/page/Login.vue
  5. 80
      src/components/page/afterLoan/afterInsurance.vue
  6. 5
      src/components/page/afterLoan/collection.vue
  7. 70
      src/components/page/afterLoan/complete.vue
  8. 12
      src/components/page/afterLoan/progress.vue
  9. 1
      src/main.js

@ -160,7 +160,6 @@ export default {
handleCommand(command) {
if(command == 'loginout'){
// sessionStorage.removeItem('ms_username')
console.log('触发用户名下拉菜单')
this.$router.push('/login');
this.$store.getters.clear
resetRouter()//
@ -182,7 +181,6 @@ export default {
let homeMenu = this.$store.state.homeMenu,
len = homeMenu.length,
items = []
console.log(homeMenu,'homeMenu')
for(let i=0;i<len;i++){
let obj ={},index
switch (homeMenu[i]) {
@ -204,7 +202,6 @@ export default {
items.splice(0,0,{title:'首页',index:'homePage'})
items.splice(1,0,{title:'工作台',index:'workbench'})
}
console.log(items,'items')
return items
},
filterHandler(value, row, column) {

@ -462,14 +462,14 @@ export default {
// table
//
this.tableData = JSON.parse(JSON.stringify(this.cloneTable))
console.log(this.tableData,'当前列表总值',this.search,'搜索值');
// console.log(this.tableData,'',this.search,'');
this.tableData = this.tableData.filter(data=>{
return data.clientName.toLowerCase().includes(this.search.toLowerCase()) || data.applicant.toLowerCase().includes(this.search.toLowerCase())
})
this.TotalPage = this.tableData.length
this.handleCurrentChange(1)
// this.$forceUpdate();
console.log(this.tableData,'筛选后的值');
// console.log(this.tableData,'');
}
},
//
@ -956,7 +956,6 @@ export default {
},
copymeCurrentChange(val){ // -
this.copyPage = val
console.log(this.copyPage,val,'当前val',);
if (val != 1) val =(val-1) * 10 // size
this.copyData = this.copyClient.slice(val-1, val+9)// size10
},
@ -985,7 +984,6 @@ export default {
}
if(this.copyParam.clientName==='客户'){
this.searchClient = true
console.log('查询客户');
let obj = JSON.parse(JSON.stringify(this.copyParam))
obj.size = 99999
obj.page = 1

@ -53,7 +53,6 @@ export default {
return {};
},
created(){
console.log(this.menus,'this.menus',this.title);
},
methods:{

@ -149,7 +149,6 @@ export default {
password: this.param.password,
tenDayEffective: this.tenDayEffective
}).then(res => {
console.log('登录接口完成')
sessionStorage.setItem("token",res.data.token);
sessionStorage.setItem("userID",res.data.id);
this.$store.commit("userNameData", { userName: res.data.account, userPhone: this.param.username,headerImg:res.data.headPortaritUrl });
@ -169,7 +168,6 @@ export default {
},
getNowRole(){
return getNowRole().then(res=>{
console.log('进行权限请求')
if(res.success){
sessionStorage.setItem("now-roleBtn",res.data);
this.$nextTick(()=>{

@ -283,11 +283,10 @@
<el-input v-model="repaymentForm.otherExpenses" placeholder="请输入其他费用" type="text" maxlength="8" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="实际还款日" class="date">
<el-form-item label="实际还款日" class="date" >
<el-date-picker
v-model="repaymentForm.actualRepaymentDate"
type="date" style="width: 100%;"
@ -358,7 +357,7 @@
<div>
<el-form label-width="100px" class="flex-start-around">
<el-col :span="8">
<el-form-item label="还款期数:">
<el-form-item label="还款期数:">
<span>{{StatisticsData.repaymentSum}}</span>
</el-form-item>
@ -372,7 +371,7 @@
<span>{{StatisticsData.overdueSum}}</span>
</el-form-item>
<el-form-item label="还款额度(元):">
<el-form-item label="还款额度(元):">
<span>{{StatisticsData.alreadyPaymentSum}}</span>
</el-form-item>
</el-col>
@ -723,6 +722,7 @@ import core from '../../../utils/core';
},
totalRepayment(){
if(isNaN(parseFloat(this.repaymentForm.otherExpenses)) || this.repaymentForm.otherExpenses == ''){
// NaN
if (isNaN(parseFloat(this.repaymentForm.currentRepayment) + parseFloat(this.repaymentForm.interest))) {
return ''
} else {
@ -781,6 +781,7 @@ import core from '../../../utils/core';
this.comp = {}
this.liquidate ={}
this.$store.commit('discernEdit',false)
this.$forceUpdate();
this.getData()
}
if(val == 2){
@ -794,7 +795,6 @@ import core from '../../../utils/core';
otherExpenses: '',
overdueDays: 0
}
console.log(this.guaranteeForm,'kanxia gura')
//
if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
@ -817,12 +817,10 @@ import core from '../../../utils/core';
})
},
status:function (params) {
console.log(params,'status');
}
},
created(){
console.log(this.btn,'mate',this.$router.currentRoute.meta.btn)
this.liquidateList()
if(this.bankSelect.length===0){
allBankName().then(res=>{
@ -918,7 +916,6 @@ import core from '../../../utils/core';
edit(row,val){
this.$store.commit('disabledAll',false)
if(!row){//
console.log('进入新增业务');
this.loanStatus = 2
this.$store.commit("loanStatusData", { loanStatus: 2 });
this.$store.commit('setNewOrOld','newLoans')
@ -927,14 +924,9 @@ import core from '../../../utils/core';
this.$store.commit('entering',true)
this.id = val.id
this.$store.commit("idData", { id: val.id });// id
console.log(this.entering,'ent')
}
val?this.$store.commit('discernEdit',true):this.$store.commit('discernEdit',false)
console.log('新建',this.discernEdit);
}else{// ,
console.log(row.id,'当前业务ID')
console.log('进入录入或者编辑业务')
this.$store.commit('entering',false) //
this.$store.commit('discernEdit',true)//
this.$store.commit('setNewOrOld','oldLoans')//
@ -982,7 +974,6 @@ import core from '../../../utils/core';
id: this.id
});
this.guaranteeLoading = false
console.log(res.data,'此处guar被赋值');
this.guaranteeForm = res.data.insuranceList
this.starEndDate = [this.guaranteeForm.loanStartTime,this.guaranteeForm.loanEndTime]
//
@ -1039,7 +1030,7 @@ import core from '../../../utils/core';
},
//
saveAdd(repaymentForm){
//
//
if(this.status==='newLoans'){
this.saveInsurance()
}else{// /
@ -1053,8 +1044,6 @@ import core from '../../../utils/core';
})
})
Promise.all([this.saveInsurance(),form2]).then(()=>{
console.log(this.RepaymentId,'id有无')
console.log(this.discernEdit,'是否为编辑')
if(this.RepaymentId == ''){
this.repaymentForm.insuranceId = this.id
this.repaymentForm.totalRepayment = this.totalRepayment
@ -1106,9 +1095,8 @@ import core from '../../../utils/core';
async statistics(){
let res = await repaymentStatistics({
insuranceId: this.hisidId,
guaranteeAmount: this.guaranteeAmount
// guaranteeAmount: this.guaranteeAmount
});
console.log(res,'当前的res--11');
this.StatisticsData = res.data
},
//
@ -1123,7 +1111,6 @@ import core from '../../../utils/core';
res.data.list.map(e =>{
e.repaymentStatus = this.core.stcStatus(e.repaymentStatus)
})
console.log(res,'记录列表信息')
this.repaymentData = res.data.list
this.histotals = res.data.totalCount
},
@ -1257,18 +1244,15 @@ import core from '../../../utils/core';
})
},
principalNode(val){//
console.log(val,'组织架构选人');
this.$set(this.liquidate,'personLiable',val[0].name)
this.liquidate.personLiableId = val[0].id
},
principalSeleted(){//
console.log('确定选择');
this.principal = false
},
searchClientChange(val,state){//
companyInfoBySth({name:val}).then(res=>{
// console.log(res,',');
let data = res.data
this.$set(this.guaranteeForm,'phone',data.legalPhone)
this.$set(this.guaranteeForm,'legalName',data.legalName)
@ -1326,7 +1310,6 @@ import core from '../../../utils/core';
},
blurOrganization(item,index){//
item.edit = true
console.log(index,item,'当前的值');
this.liquidateEdit('',item)
},
starEndTimeFn(val){//
@ -1344,7 +1327,6 @@ import core from '../../../utils/core';
})
},
liquidateEdit(val,item){//
console.log(item,'传进来的值');
let param = {
groupName:item.groupName,//
}
@ -1352,7 +1334,6 @@ import core from '../../../utils/core';
param.id = item.id
}
liquidateEdit(param).then(res=>{
console.log(res);
this.liquidateList()
})
},
@ -1380,8 +1361,38 @@ import core from '../../../utils/core';
})
//
return Promise.all([form1,form3]).then(()=>{
this.$confirm('确定保存该记录?', '提示', {type:"info"}).then(()=>{
return Promise.all([form1,form3]).then(()=>{
if(this.status==='newLoans'){//
this.$confirm('确定保存该记录?', '提示', {type:"info"}).then(()=>{
let obj ={}
//
if(this.discernEdit) obj.insuranceId = this.id
Object.assign(obj,this.comp,this.liquidate)
let param = {
alInsuranceList:this.guaranteeForm,//
alReimbursement:obj//
}
if(this.discernEdit){//
editInsurance(param).then(res=>{
if(this.entering){
this.$message.success('编辑业务成功!')
this.$store.commit("loanStatusData", { loanStatus: 1 });
}
})
}else{//
param.source = 1
saveInsurance(param).then(res=>{
//
if(this.status==='newLoans'){
this.$message.success('新增业务成功!')
this.$store.commit("loanStatusData", { loanStatus: 1 });
}
}).catch(err=>{
})
}
}).catch(e=>{
})
}else{//
let obj ={}
//
if(this.discernEdit) obj.insuranceId = this.id
@ -1392,31 +1403,25 @@ import core from '../../../utils/core';
}
if(this.discernEdit){//
editInsurance(param).then(res=>{
console.log(res,'编辑业务');
if(this.entering){
this.$message.success('编辑业务成功!')
this.$store.commit("loanStatusData", { loanStatus: 1 });
}
})
}else{//
param.source = 1
saveInsurance(param).then(res=>{
//
if(this.status==='newLoans'){
this.$message.success('新增业务成功!')
this.$store.commit("loanStatusData", { loanStatus: 1 });
}
}).catch(err=>{
})
}
}).catch(e=>{
console.log(e,'取消保存记录')
})
}
}).catch(()=>{
// alert('')
console.log(err,'err')
return false
})
},
@ -1427,7 +1432,6 @@ import core from '../../../utils/core';
}).then(() => {
deleteInsurance(row.id).then(res=>{
this.getData()
console.log(res,'res');
})
})
},

@ -780,7 +780,7 @@
async statistics(){
let res = await repaymentStatistics({
insuranceId: this.hisidId,
guaranteeAmount: this.guaranteeAmount
// guaranteeAmount: this.guaranteeAmount
});
this.StatisticsData = res.data
},
@ -862,7 +862,6 @@
);
},
uploadSuccess(response, file, fileList) {
console.log(response,file,'file')
if(response.code==99999){
fileList.splice(0,1)
return this.$message.error(`上传失败,请重新上传!错误码${response.code}`)
@ -913,7 +912,6 @@
if(this.collectionHandle.collectionMethod!=='3') this.$set(this.collectionHandle,"other",'')
this.$refs[collectionHandle].validate((valid) => {
if (valid) {
console.log(this.collectionHandle,'this.uploadList')
if(this.collectionHandle.collectionMethod=='3'&&!this.collectionHandle.other) return this.$message.error("请输入其他催收方式说明!");
// if(this.uploadList.length == 0) return this.$message.error("");
this.collectionHandle.enclosureFiles = this.uploadList.map(e => e.url)
@ -1003,7 +1001,6 @@
enclosureFiles: res.data.enclosureFiles
}
this.uploadList = []
console.log(res.data.enclosureFiles,'res.data.enclosureFiles')
if(res.data.enclosureFiles.length>0&&res.data.enclosureFiles[0]){
const newArr = res.data.enclosureFiles.map(item => ({name: item,url:item}))
newArr.map(item => {

@ -11,7 +11,7 @@
</div>
</div>
<div class="shadow radius10 pdt20">
<el-table :data="data" stripe header-align="center" class="mat20">
<el-table v-loading='loading' :data="data" stripe header-align="center" class="mat20">
<el-table-column type="index" width="200" label="序号" align="center"></el-table-column>
<el-table-column label="年度" align="center">
<template slot-scope="scope">
@ -107,6 +107,7 @@
-->
<div class="dataList" ref="table" @scroll="handleScroll">
<el-table
:data="statisticsData"
stripe
header-align="center"
@ -187,7 +188,7 @@
</el-table-column>
</el-table>
</div>
<el-button class="more-btn" v-show="moreBtn" type="primary" round>向下滑动查看更多</el-button>
<el-button class="more-btn" v-show="moreBtn" type="primary" @click="clickMore" round>{{moreText}}</el-button>
</div>
</div>
</div>
@ -198,6 +199,7 @@
<div class="top">
<div class="left-border fz-16"><p class="c-black mgl10">年份</p></div>
<el-date-picker
:disabled="changeStaffDisabled"
class="mgt10 mgl80"
v-model="chooisYear"
value-format="yyyy"
@ -291,7 +293,8 @@ export default {
moreBtn:false,
moreText:'向下滚动查看更多',
recordArr:[],// ,
changeStaffYear:'',
changeStaffDisabled:false,
};
},
watch: {
@ -334,33 +337,38 @@ export default {
this.moreBtn = false
}
if(box.scrollTop+box.clientHeight+50>=box.scrollHeight){
let st = box.scrollTop
this.moreBtn = false
//
this.statisticsData.push(...this.recordArr.slice(0,10))
this.recordArr.splice(0,10)
if(this.recordArr.length===0){
this.moreText = "没有更多数据了!"
}else{
this.moreText = "向下滚动查看更多"
box.scrollTop = st
this.statisticsLoading = true
setTimeout(() => {
this.statisticsLoading = false
}, 1000);
}
}
},20),
},10),
async clickMore(){//
this.statisticsLoading = true
await setTimeout(() => {
this.statisticsLoading = false
}, 500+Math.floor(Math.random(500)));
this.statisticsData.push(...this.recordArr.slice(0,10))
this.recordArr.splice(0,10)
let box = this.$refs.table
let st = box.scrollTop
if(this.recordArr.length===0){
this.moreText = "没有更多数据了!"
}else{
this.moreText = "点击加载更多数据"
box.scrollTop = st
}
},
annualList(){
this.loading = true
annualList().then(res=>{
this.loading = false
this.data = res.data.list
}).catch(()=>{
this.loading = false
})
},
annualStatisticsList(){
if(this.searchStr.proportionSymbol&&!this.searchStr.proportion) return this.$message('请输入完成比例整数!')
if(this.searchStr.allAoumntSymbol&&!this.searchStr.allAoumnt) return this.$message('请输入已清收总额!')
this.moreText = "向下滑动查看更多"
this.moreText = "点击加载更多数据"
let param = {
year:this.searchStr.year,
groupId:this.searchStr.groupId,
@ -434,9 +442,6 @@ export default {
default:
break;
}
while (this.statisticsData.length<20) {
this.statisticsData.push({})
}
// 10,
if (this.statisticsData.length>10) {
this.recordArr = JSON.parse(JSON.stringify(this.statisticsData))
@ -470,8 +475,11 @@ export default {
this.showRank = true;
if(val==='new'){//
this.treeIds = []
this.changeStaffDisabled = false
}else{
await this.personnelSelection(val)
this.changeStaffDisabled = true
this.chooisYear = val
}
this.treeStatus = val
},
@ -491,7 +499,23 @@ export default {
this.$message.success('操作成功!')
this.annualList()
}).catch(err=>{
})
}else{//
let arr = []
this.treeIds.forEach((e,index)=>{
if(typeof(e)=='number'){
arr.push(e)
}
})
generateAnnualStatistics({personLiableIds:arr,year:this.chooisYear}).then(res=>{
this.showRank = false
this.$message.success('操作成功!')
this.annualList()
}).catch(err=>{
})
}
},
currentChange(val) {

@ -187,9 +187,6 @@ export default{
}
},
created() {
console.clear()
console.log('初始化')
console.log(this.bankData)
this.quryCollectionProgress()
},
computed: {
@ -205,7 +202,6 @@ export default{
return this.$message.warning('选择符号后请输入金额!')
}
this.loading = true
console.log('触发')
queryCollectionProgress(this.searchStr).then(res=>{
this.loading = false
this.totals
@ -216,21 +212,16 @@ export default{
})
this.statisticsData = res.data.list
this.totals = res.data.total
console.log(res,'列表数据')
console.log(this.totals,'yo')
}).catch(err=>{
console.log(err,'报错-列表')
this.loading = false
})
}),
collectionProgressExport(){//
if(this.ids.length===0) return this.$message.warning('请先勾选数据后再导出')
console.log(collectionProgressExport(this.ids),'url')
// if(this.ids.length===0) return this.$message.warning('')
core.exportFile(collectionProgressExport(this.ids),'清收工作进度表')
},
getDates(val){//
console.log(val,'val')
if(val.length===2){
this.searchStr.compensatoryStartTime = val[0]
this.searchStr.compensatoryEndTime = val[1]
@ -240,7 +231,6 @@ export default{
}
},
statisticsSelection(val){//
console.log(val,'勾选')
this.ids = val.map(e=>e.id)
},
clearOption(){//

@ -43,7 +43,6 @@ Vue.use(Icon);
// `v-focus`使input出现时自动聚焦
Vue.directive('focus', {
inserted: function (el, binding) {
console.log(el.disabled,'当前的input');
if (el.disabled === false) {
el.focus()
}

Loading…
Cancel
Save