diff --git a/src/assets/img/defaultHead.png b/src/assets/img/defaultHead.png
new file mode 100644
index 0000000..df841ce
Binary files /dev/null and b/src/assets/img/defaultHead.png differ
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 98469b0..2837262 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -32,7 +32,7 @@
-
+
diff --git a/src/components/page/Workbench-Manpower.vue b/src/components/page/Workbench-Manpower.vue
index 6281181..9e60dd2 100644
--- a/src/components/page/Workbench-Manpower.vue
+++ b/src/components/page/Workbench-Manpower.vue
@@ -355,9 +355,9 @@ export default {
return {
// 头像图片动态地址
// imgdata: require('../../assets/img/login-bg-1.jpg'),
- imgdata: 'https://www.huorantech.cn/enclosureFile/e55b4a71e37747d1login-bg-1.jpg',
+ imgdata: require('../../assets/img/defaultHead.png'),
// 头像变更应该需要有个老变量记录,取消的是会变回原本
- oldImg: 'https://www.huorantech.cn/enclosureFile/e55b4a71e37747d1login-bg-1.jpg',
+ oldImg: require('../../assets/img/defaultHead.png'),
//显示改变头像和蒙版,切换按钮
change: true,
// 上传文件
diff --git a/src/components/page/afterLoan/afterInsurance.vue b/src/components/page/afterLoan/afterInsurance.vue
index dc54b36..bd431cc 100644
--- a/src/components/page/afterLoan/afterInsurance.vue
+++ b/src/components/page/afterLoan/afterInsurance.vue
@@ -291,11 +291,15 @@
-
+
+ {{ChinaCost(repaymentForm.currentRepayment)}}
+
-
+
+ {{ChinaCost(repaymentForm.otherExpenses)}}
+
@@ -314,34 +318,46 @@
-
+
+ {{ChinaCost(totalRepayment)}}
+
-
+
+ {{ChinaCost(repaymentForm.interest)}}
+
-
+
+ {{ChinaCost(repaymentForm.deductionAmount)}}
+
(1)现金
-
+
+ {{ChinaCost(repaymentForm.repaymentCash)}}
+
元
(2)资产
-
+
+ {{ChinaCost(repaymentForm.repaymentAssetsAmount)}}
+
元
(3)其他
-
+
+ {{ChinaCost(repaymentForm.repaymentOtherAmount)}}
+
元
@@ -763,17 +779,17 @@ export default {
computedCompensatoryBalance(){// 代偿余额计算
/* 转为后端计算 */
// if(this.status){} // 如果是处于录入状态才减去count
- // console.log(this.repaymentForm,'this.repaymentForm')
+ console.log(this.repaymentForm,'this.repaymentForm')
// if(!this.repaymentForm.currentRepayment)this.repaymentForm.currentRepayment = 0
// if(!this.repaymentForm.otherExpenses)this.repaymentForm.otherExpenses = 0
// if(!this.repaymentForm.interest)this.repaymentForm.interest = 0
- // console.log(this.repaymentForm,'this.repaymentForm')
+ console.log(this.repaymentForm,'this.repaymentForm')
// let a = this.repaymentForm.currentRepayment , b = this.repaymentForm.otherExpenses , c = this.repaymentForm.interest
// let count = math.format(math.chain(math.bignumber(a)).add(math.bignumber(b)).add(math.bignumber(c)).done())
// 减去当前的已还款金额之类的
// let count = a+b+c
- // console.log(count,'当前的计算')
+ console.log(count,'当前的计算')
// 余额 = 代偿总额 - 代偿日后还款总额
this.comp.compensatoryBalance = (this.comp.compensationAmount - this.cash )||0
// 当前代偿余额 = 额外减去 本次还款,利息,其他费用
@@ -875,13 +891,13 @@ export default {
}
if(val == 2){// 进入录入页面
- console.log(this.RepaymentId,this.id,'RepaymentId,进入2页面')
+ // console.log(this.RepaymentId,this.id,'RepaymentId,进入2页面')
// 进入详情,默认调一次取得代偿时间后的金额接口
if(this.comp.compensationAmount&&this.comp.compensatoryTime){
this.compensatoryTimeChange(this.comp.compensatoryTime)
}
// 此处存疑,未知为何如此赋值
- console.log(this.hisId,'hisid,loanid,repayid',this.$store.state.loan.id,this.$store.state.loan.RepaymentId)
+ // console.log(this.hisId,'hisid,loanid,repayid',this.$store.state.loan.id,this.$store.state.loan.RepaymentId)
this.id = this.$store.state.loan.id || this.$store.state.loan.RepaymentId
this.RepaymentId = this.$store.state.loan.RepaymentId
this.loanbackStatus = this.$store.state.loan.loanbackStatus
@@ -892,16 +908,19 @@ export default {
otherExpenses: '',
overdueDays: 0
}
- console.log(this.loanbackStatus,'什么状态')
+ // console.log(this.loanbackStatus,'什么状态')
// 处于编辑状态,额外添加一个编辑中的状态判断
- if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
+ if(this.status!=='newLoans'||this.discernEdit) await this.getDetail()
if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
await this.getRepaymentDetail()
}
- console.log(this.souce,'判断是否系统流转--0')
+ // console.log(this.guaranteeForm.loanStartTime,'this.guaranteeForm.loanStartTime')
/* TODO 未测试该判断 */
- if(this.source === 0&&this.status==="oldLoans"&&!this.guaranteeForm.loanStartTime){// 判断系统流转,且是否进行过编辑,判断贷款时间以及当前的编辑状态
- return this.$confirm('业务数据需补充完善,请先在编辑处完善必填项后再进行还款录入。','提示', {
+
+ if(this.source === 0&&this.status==="oldLoans"&&!this.guaranteeForm.loanStartTime){ // 判断系统流转,且是否进行过编辑,判断贷款时间以及当前的编辑状态
+ // console.log(this.repaymentForm , this.souce,this.guaranteeForm.loanStartTime,this.guaranteeForm.loanStartTime,'判断是否系统流转--2')
+
+ this.$confirm('业务数据需补充完善,请先在编辑处完善必填项后再进行还款录入。','提示', {
confirmButtonText: '确定',
showCancelButton:false,
type: 'warning'
@@ -911,6 +930,7 @@ export default {
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
}).catch(()=>{
+ // console.log('进入错误')
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
@@ -949,6 +969,7 @@ export default {
this.liquidateList()
}else{
this.organizationArrs = []
+ this.liquidateList()
}
}
},
@@ -957,10 +978,10 @@ export default {
let c = a.concat(b).filter((cur, i, arr) => {
return arr.indexOf(cur) === arr.lastIndexOf(cur);
});
- console.log(c,'比不同',a,b)
+ // console.log(c,'比不同',a,b)
- console.log(this.loanbackStatus,'this.loanbackStatus')
+ // console.log(this.loanbackStatus,'this.loanbackStatus')
this.liquidateList()
if(this.bankSelect.length===0){// 请求银行数据
allBankName().then(res=>{
@@ -988,8 +1009,8 @@ export default {
overdueDays: 0
}
// 处于编辑状态
- console.log(this.status,'处于什么状态')
- if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
+ // console.log(this.status,'处于什么状态')
+ if(this.status!=='newLoans'||this.discernEdit) await this.getDetail()
if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
await this.getRepaymentDetail()
}
@@ -1064,7 +1085,7 @@ export default {
// if(this.insMultipleSelection.length != ''){
let exportIds = this.insMultipleSelection.map(e => e.id).join()
let url = `${excelInsurance}?ids=${exportIds}`
- console.log(url,'导出的URL')
+ // console.log(url,'导出的URL')
window.location.href = url
// }else{
// this.$message.error('请先选择担保列表数据 !');
@@ -1075,7 +1096,7 @@ export default {
edit(row,val){
this.$store.commit('disabledAll',false)// 取消禁用全部,
if(!row){// 没有row传值,进入新建业务界面--录入无关
- console.log('进入新建业务',val)
+ // console.log('进入新建业务',val)
this.loanStatus = 2
this.$store.commit("loanbackStatusData", { loanbackStatus: '' });// 判断按钮状态
this.$store.commit("loanStatusData", { loanStatus: 2 });
@@ -1101,7 +1122,7 @@ export default {
this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });
this.$store.commit('fromOne',false)// 从保后进入还款录入,用于后退判断
}else{
- console.log('进入录入界面')
+ // console.log('进入录入界面')
// 进入还款录入,添加个额外判断进入编辑界面
this.$store.commit('wanderEdit',true)
this.$store.commit('entering',false) // 不可编辑-业务编辑区域
@@ -1231,13 +1252,13 @@ export default {
// if(!this.isReimbursement()){
// return this.$message.warning('清偿总额需等于本次还款!')
// }
- console.log(this.status,'newL为新增业务')
+ // console.log(this.status,'newL为新增业务')
// 判断是否新增业务
if(this.status==='newLoans'||this.status=="oldLoansEdit"){
- console.log('进入新增业务')
+ // console.log('进入新增业务')
this.saveInsurance()
}else{
- console.log('进入录入环节')
+ // console.log('进入录入环节')
// 处于编辑/新增录入,需要判断该业务是否新增的,或是流转的,有不同处理方式
// 担保信息
const form1 = new Promise((resolve,reject)=>{
@@ -1251,7 +1272,7 @@ export default {
}
})
})
- console.log(this.$refs["repaymentForm"],'值')
+ // console.log(this.$refs["repaymentForm"],'值')
// 清收信息
const form3 = new Promise((resolve,reject)=>{
this.$refs['liquidate'].validate((valid) => {
@@ -1275,10 +1296,10 @@ export default {
let that = this
function fn (){
if(that.RepaymentId == ''){// 新增录入
- console.log('新增录入')
+ // console.log('新增录入')
that.repaymentForm.insuranceId = that.id
that.$store.commit('hisId',that.id)
- console.log(that.id,'id')
+ // console.log(that.id,'id')
that.repaymentForm.totalRepayment = that.totalRepayment
that.repaymentForm.overdueDays = that.overdueDays
let obj ={}
@@ -1318,7 +1339,7 @@ export default {
// })
}
}
- console.log('正在执行录入')
+ // console.log('正在执行录入')
if(this.repaymentForm.repaymentCash!==0&&!this.repaymentForm.repaymentCash&&this.repaymentForm.repaymentAssetsAmount!==0&&!this.repaymentForm.repaymentAssetsAmount&&this.repaymentForm.repaymentOtherAmount!==0&&!this.repaymentForm.repaymentOtherAmount){
return this.$message.error('至少输入一种清偿方式!')
}
@@ -1335,14 +1356,14 @@ export default {
}).then(()=>{
fn()
}).catch(err=>{
- console.log('此处报错')
+ // console.log('此处报错')
return '我是错误信息'
})
} else{
fn()
}
}).catch(err=>{
- console.log(err,'err')
+ // console.log(err,'err')
this.$message.error('请输入必填信息!')
})
}
@@ -1383,7 +1404,7 @@ export default {
},
// 还款记录列表
async repaymentList(){
- console.log(this.hisidId,'当前传的id值')
+ // console.log(this.hisidId,'当前传的id值')
let res = await repaymentList({
page: this.hisPage,
size: this.pageNumber,
@@ -1446,7 +1467,7 @@ export default {
addRepayment(){
this.loanStatus = 2 // 切页面,保存
this.$store.commit("loanStatusData", { loanStatus: 2 });
- console.log(this.$store.state.loan.hisidId)
+ // console.log(this.$store.state.loan.hisidId)
// 新增判断
this.RepaymentId = ''
this.$store.commit("RepaymentIdData", { RepaymentId: this.RepaymentId });
@@ -1456,19 +1477,19 @@ export default {
this.$store.commit('setNewOrOld','newRecord') // 判断新增还款记录
- console.log(this.status,'是否是新增数据')
+ // console.log(this.status,'是否是新增数据')
this.$store.commit('disabledAll',false)
},
// 还款记录:查看/编辑
goRepaymentDetail(row,type){
- console.log(row,type,'点击查看业务,')
+ // console.log(row,type,'点击查看业务,')
this.loanStatus = 2
this.$store.commit("loanStatusData", { loanStatus: 2 });// 跳查看
this.RepaymentId = row.id
this.$store.commit("RepaymentIdData", { RepaymentId: row.id });// 业务ID
this.id = row.insuranceId
this.$store.commit("idData", { id: row.insuranceId });// 这是loan.id用于记录业务id的 */
- console.log(this.id,'rowid',row,'新增还款记录错误')
+ // console.log(this.id,'rowid',row,'新增还款记录错误')
this.loanbackStatus = type
@@ -1486,7 +1507,7 @@ export default {
},
// 取得录入页面数据详情
async getRepaymentDetail(){
- console.log(this.RepaymentId,'调用详情接口使用的id')
+ // console.log(this.RepaymentId,'调用详情接口使用的id')
let res = await repaymentDetail({
id: this.RepaymentId
});
@@ -1706,7 +1727,7 @@ export default {
alInsuranceList:this.guaranteeForm,// 担保信息
alReimbursement:obj// 代偿清收相关
}
- console.log(param,'编辑传值')
+ // console.log(param,'编辑传值')
if(this.discernEdit){// 处于编辑状态下,且
editInsurance(param).then(res=>{
if(this.entering){
@@ -1744,7 +1765,7 @@ export default {
compensatoryTimeChange(val){// 代偿时间处理,取得已偿还金额
compensationSituation({data:val,insuranceId:this.id}).then(res=>{
this.cash = res.data.amount
- console.log('取得当前的cash',this.cash)
+ // console.log('取得当前的cash',this.cash)
})
},
@@ -1777,17 +1798,17 @@ export default {
}
},
modifyReimbursement(){// 查清收组
- console.log('触发查询原本')
- console.log(this.liquidate.personLiableId,this.liquidate.collectionGroupId,this.qszId,'三个值')
+ // console.log('触发查询原本')
+ // console.log(this.liquidate.personLiableId,this.liquidate.collectionGroupId,this.qszId,'三个值')
if(this.liquidate.personLiableId&&this.liquidate.collectionGroupId&&this.qszId){
- console.log('进入接口')
+ // console.log('进入接口')
let params = {
id:this.qszId,// reimbursement的id
collectionGroupId:this.liquidate.collectionGroupId,// 组id
personLiableId:this.liquidate.personLiableId,// 人id
}
modifyReimbursement(params).then(res=>{
- console.log(res,'chashou123')
+ // console.log(res,'chashou123')
if(res.message!="成功"){
return this.$message.warning(res.message)
}
@@ -1795,6 +1816,7 @@ export default {
}
},
ChinaCost(numberValue){
+ if(!numberValue) return "零元"
var numberValue=new String(Math.round(numberValue*100)); // 数字金额
var chineseValue=""; // 转换后的汉字金额
var String1 = "零壹贰叁肆伍陆柒捌玖"; // 汉字数字