huoran
/
dq_webcode
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

保后和遗留bug全部修复

Browse Source
master
e 3 years ago
parent b2019eca67
commit 837289ce22
23 changed files with 1067 additions and 228 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      package-lock.json
  2. 3
      src/assets/css/main.css
  3. 24
      src/components/common/Letter.vue
  4. 15
      src/components/common/Notice.vue
  5. 16
      src/components/common/Payment.vue
  6. 9
      src/components/common/Sidebar.vue
  7. 2
      src/components/common/businessApplyDepartment.vue
  8. 9
      src/components/common/complianceDepartment.vue
  9. 9
      src/components/common/flowPathMoudle.vue
  10. 2
      src/components/common/messageDepartment.vue
  11. 7
      src/components/common/processTemp.vue
  12. 2
      src/components/common/propertyDepartment.vue
  13. 97
      src/components/page/Workbench.vue
  14. 321
      src/components/page/afterLoan/afterInsurance.vue
  15. 8
      src/components/page/afterLoan/afterLoan.vue
  16. 116
      src/components/page/afterLoan/collection.vue
  17. 497
      src/components/page/afterLoan/complete.vue
  18. 39
      src/components/page/afterLoan/progress.vue
  19. 4
      src/store/modules/guarantee.js
  20. 13
      src/store/modules/loan.js
  21. 4
      src/utils/api.js
  22. 81
      src/utils/core.js
  23. 4
      src/utils/http.js

13
package-lock.json generated
Unescape View File

@ -4900,6 +4900,11 @@
"integrity": "sha1-P7rwIL/XlIhAcuomsel5HUWmKfA=", "integrity": "sha1-P7rwIL/XlIhAcuomsel5HUWmKfA=",
"dev": true "dev": true
}, },
"downloadjs": {
"version": "1.4.7",
"resolved": "https://registry.npm.taobao.org/downloadjs/download/downloadjs-1.4.7.tgz",
"integrity": "sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw="
},
"duplexer": { "duplexer": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz", "resolved": "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz",
@ -14202,6 +14207,14 @@
"resolved": "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.22.0.tgz?cache=0&sync_timestamp=1602001179053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.22.0.tgz", "resolved": "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.22.0.tgz?cache=0&sync_timestamp=1602001179053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.22.0.tgz",
"integrity": "sha1-ZAM4Gm6rHSKeUVpirdspsv86v+0=" "integrity": "sha1-ZAM4Gm6rHSKeUVpirdspsv86v+0="
}, },
"vue-json-excel": {
"version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/vue-json-excel/download/vue-json-excel-0.3.0.tgz",
"integrity": "sha1-csvkoARyAlntxlVVo/ByGYz3kUY=",
"requires": {
"downloadjs": "^1.4.7"
}
},
"vue-loader": { "vue-loader": {
"version": "15.9.3", "version": "15.9.3",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.3.tgz?cache=0&sync_timestamp=1600850354305&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.3.tgz", "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.3.tgz?cache=0&sync_timestamp=1600850354305&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.3.tgz",

3
src/assets/css/main.css
Unescape View File

@ -426,3 +426,6 @@ input[type="number"]{
color: #00B9FF; color: #00B9FF;
text-decoration: underline; text-decoration: underline;
} }
.el-tooltip__popper{
max-width: 700px;
}

24
src/components/common/Letter.vue
Unescape View File

@ -152,12 +152,9 @@
</div> </div>
</div> </div>
<!-- 查看时的按钮 --> <!-- 查看时的按钮 -->
<div class="fj-center"> <!-- <div class="fj-center">
<!-- <el-button @click="toImage($refs.imageTofile)">点击上传base64到服务器测试</el-button> -->
<!-- <el-button v-if="sendShow" class="mgr20" @click="toImage($refs.imageTofile)">抄送</el-button> -->
<el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button> <el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button>
</div> </div> -->
<!-- 确认按钮 --> <!-- 确认按钮 -->
<div v-show="operationType === 1 || operationType === 3" class="df fj-end mgt30 mgb30"> <div v-show="operationType === 1 || operationType === 3" class="df fj-end mgt30 mgb30">
<div class="df"> <div class="df">
@ -299,6 +296,14 @@ export default {
// 判断是否由待处理哪里跳转过来的，每次触发后删除 // 判断是否由待处理哪里跳转过来的，每次触发后删除
if(sessionStorage.getItem('decideJump')){ if(sessionStorage.getItem('decideJump')){
let data = JSON.parse(sessionStorage.getItem('decideJump')) let data = JSON.parse(sessionStorage.getItem('decideJump'))
this.letterValue = {
businessId: data.businessId,//业务id
id:data.id,//rowID
auditStatus:data.auditStatus,//审批状态
handleStatus:data.operationStatus,//操作状态
roleId:data.roleId,//角色id
}
this.$store.commit("letterData", { letterValue: this.letterValue });
data.id = data.detailId data.id = data.detailId
data.status = data.approveStatus data.status = data.approveStatus
data.handleStatus = data.operatingStatus data.handleStatus = data.operatingStatus
@ -428,6 +433,7 @@ export default {
}, },
//列表操作-详情 //列表操作-详情
letterData(row,operationType){ letterData(row,operationType){
console.log(row,'当前的确定行内值')
this.loans = false //判断详情显示 this.loans = false //判断详情显示
this.operationType = operationType //列表操作状态 this.operationType = operationType //列表操作状态
//担保函数据 //担保函数据
@ -443,6 +449,7 @@ export default {
auditOpinion: row.auditOpinion,//审核意见 auditOpinion: row.auditOpinion,//审核意见
roleId: row.roleId //角色id roleId: row.roleId //角色id
} }
console.log(this.letterValue,'存起来的值')
this.fileList = row.file.split(",") this.fileList = row.file.split(",")
this.$store.commit("fileData", { fileList: this.fileList }); this.$store.commit("fileData", { fileList: this.fileList });
this.$store.commit("loansData", { loans: this.loans }); this.$store.commit("loansData", { loans: this.loans });
@ -485,17 +492,22 @@ export default {
}, },
// 提交审核意见 // 提交审核意见
sumbitOpinion(text,type){ sumbitOpinion(text,type){
const values = this.$store.state.guarantee.letterValue
console.log(text,type,'当前跳转的值',values,'this.$store.state.guarantee.letterValue.businessId')
this.$confirm(`确定要${text}该审核意见吗？`, '提示', { this.$confirm(`确定要${text}该审核意见吗？`, '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
if(type == 4 && this.letterValue.auditOpinion == ''){ if(type == 4 && this.letterValue.auditOpinion == ''){
return this.$message.error("请先填写审核意见！") return this.$message.error("请先填写审核意见！")
} }
let params = { let params = {
auditOpinion: this.letterValue.auditOpinion, auditOpinion: this.letterValue.auditOpinion,
businessId: this.letterValue.businessId, // businessId: values.businessId,
businessId: this.letterValue.businessId||this.$store.state.guarantee.businessId,
status: type status: type
} }
console.log(params,'提交的值')
updateStatus(params).then(res => { updateStatus(params).then(res => {
this.$message.success(`${text}成功`); this.$message.success(`${text}成功`);
let btnPermissionsStr = sessionStorage.getItem("now-roleBtn").split(','); let btnPermissionsStr = sessionStorage.getItem("now-roleBtn").split(',');

15
src/components/common/Notice.vue
Unescape View File

@ -140,9 +140,9 @@
</div> </div>
</div> </div>
<!-- 查看时的按钮 --> <!-- 查看时的按钮 -->
<div class="fj-center"> <!-- <div class="fj-center">
<el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button> <el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button>
</div> </div> -->
<!-- 确认按钮 --> <!-- 确认按钮 -->
<div class="df fj-end mgt30 mgb30"> <div class="df fj-end mgt30 mgb30">
<!-- <el-button v-if="sendShow" class="mgr20" @click="toImage($refs.imageTofile)">抄送</el-button> --> <!-- <el-button v-if="sendShow" class="mgr20" @click="toImage($refs.imageTofile)">抄送</el-button> -->
@ -236,8 +236,15 @@ export default {
if(data.btn==='确认'){ if(data.btn==='确认'){
this.operationType = 3 this.operationType = 3
this.loanNoticeDetail(data)// 取得详情 this.loanNoticeDetail(data)// 取得详情
this.operationType = operationType //列表操作状态 this.operationType = this.operationType //列表操作状态
this.$store.commit("loansData", { loans: this.loans }); this.$store.commit("loansData", { loans: this.loans });
this.letterValue = {
businessId: data.businessId,//业务id
id:data.id,//rowID
auditStatus:data.auditStatus,//审批状态
handleStatus:data.operationStatus,//操作状态
roleId:data.roleId,//角色id
}
this.$store.commit("letterData", { operationType: this.operationType, letterValue: this.letterValue }); this.$store.commit("letterData", { operationType: this.operationType, letterValue: this.letterValue });
} }
sessionStorage.removeItem('decideJump') sessionStorage.removeItem('decideJump')
@ -409,7 +416,7 @@ export default {
} }
let params = { let params = {
auditOpinion: this.letterValue.auditOpinion, auditOpinion: this.letterValue.auditOpinion,
businessId: this.letterValue.businessId, businessId: this.letterValue.businessId||this.$store.state.guarantee.businessId,
status: type status: type
} }
updateLoanNotice(params).then(res => { updateLoanNotice(params).then(res => {

16
src/components/common/Payment.vue
Unescape View File

@ -125,9 +125,9 @@
</div> </div>
</div> </div>
<!-- 查看时的按钮 --> <!-- 查看时的按钮 -->
<div class="fj-center"> <!-- <div class="fj-center">
<el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button> <el-button v-show="operationType === 2" type="primary bd0" class="mgt20" round @click="downloadLetter">导出</el-button>
</div> </div> -->
<div> <div>
<div class="mgt20 left-border fz-16"><p class="c-black mgl10">附件</p></div> <div class="mgt20 left-border fz-16"><p class="c-black mgl10">附件</p></div>
<div class="shadow radius10 mgt20 pdr20 flex-center"> <div class="shadow radius10 mgt20 pdr20 flex-center">
@ -305,11 +305,19 @@ export default {
if(data.btn==='确认'){ if(data.btn==='确认'){
this.operationType = 3 this.operationType = 3
this.paymentDetail(data)// 取得详情 this.paymentDetail(data)// 取得详情
this.operationType = operationType //列表操作状态 this.operationType = this.operationType //列表操作状态
this.isFgJl = data.isFgJl //是否是法规部经理 this.isFgJl = data.isFgJl //是否是法规部经理
this.$store.commit("isFgJlData", { isFgJl: data.isFgJl }); this.$store.commit("isFgJlData", { isFgJl: data.isFgJl });
this.$store.commit("loansData", { loans: this.loans }); this.$store.commit("loansData", { loans: this.loans });
this.letterValue = {
businessId: data.businessId,//业务id
id:data.id,//rowID
auditStatus:data.auditStatus,//审批状态
handleStatus:data.operationStatus,//操作状态
roleId:data.roleId,//角色id
}
this.$store.commit("letterData", { operationType: this.operationType, letterValue: this.letterValue }); this.$store.commit("letterData", { operationType: this.operationType, letterValue: this.letterValue });
} }
sessionStorage.removeItem('decideJump') sessionStorage.removeItem('decideJump')
@ -544,7 +552,7 @@ export default {
let imgFile = this.imgListT.map(e =>e.url).join() let imgFile = this.imgListT.map(e =>e.url).join()
let params = { let params = {
auditOpinion: this.letterValue.auditOpinion, auditOpinion: this.letterValue.auditOpinion,
businessId: this.letterValue.businessId, businessId: this.letterValue.businessId||this.$store.state.guarantee.businessId,
status: type, status: type,
imgFile: imgFile imgFile: imgFile
} }

9
src/components/common/Sidebar.vue
Unescape View File

@ -117,7 +117,7 @@ export default {
watch:{ watch:{
$route(to,from){ $route(to,from){
this.notice() this.notice()
this.handleSelect(this.activeIndex)// 触发高亮的值 if(to!=this.activeIndex) this.handleSelect(this.activeIndex)// 触发高亮的值
}, },
pop(now,before){ pop(now,before){
// this // this
@ -135,7 +135,6 @@ export default {
// if( this.$store.state.login.headerImg){ // if( this.$store.state.login.headerImg){
// this.headerImg = this.$store.state.login.headerImg // this.headerImg = this.$store.state.login.headerImg
// } // }
// 通过 Event Bus 进行组件间通信，来折叠侧边栏
bus.$on('collapse', msg => { bus.$on('collapse', msg => {
this.collapse = msg; this.collapse = msg;
bus.$emit('collapse-content', msg); bus.$emit('collapse-content', msg);
@ -151,7 +150,11 @@ export default {
this.activeIndex = index this.activeIndex = index
sessionStorage.setItem('sideBar',index) sessionStorage.setItem('sideBar',index)
if(val!=='start') sessionStorage.removeItem('fromCopyTo') // 删除抄送的值，没有把流程拆成路由没法在beforeeach判断 if(val!=='start') sessionStorage.removeItem('fromCopyTo') // 删除抄送的值，没有把流程拆成路由没法在beforeeach判断
if(index=='workbench'){// 删除工作台的记录
console.log('触发删除')
this.$store.commit("leftSidebarData", { leftStatus: '0' });
this.$store.commit("loanStatusData", { loanStatus: 1 });// 切换页面状态
}
}, },
goto(path) { goto(path) {
this.$router.push('/' + path); this.$router.push('/' + path);

2
src/components/common/businessApplyDepartment.vue
Unescape View File

@ -1738,7 +1738,7 @@ methods:{
}) })
}else{ }else{
// this.$message('丢失customerId！') // this.$message('丢失customerId！')
this.$message('请先输入企业编号或名称后，再进行关联人操作！') if(this.businessApply.isExistRelated==1) return this.$message('请先输入企业编号或名称后，再进行关联人操作！')
} }
}, },
// 关联人checkbox // 关联人checkbox

9
src/components/common/complianceDepartment.vue
Unescape View File

@ -1041,13 +1041,17 @@ mounted(){
// 判断是否由待处理哪里跳转过来的，每次触发后删除 // 判断是否由待处理哪里跳转过来的，每次触发后删除
if(sessionStorage.getItem('decideJump')){ if(sessionStorage.getItem('decideJump')){
let data = JSON.parse(sessionStorage.getItem('decideJump')) let data = JSON.parse(sessionStorage.getItem('decideJump'))
console.log(data,'取得item的值')
data.iid = data.detailId data.iid = data.detailId
data.status = data.approveStatus data.status = data.approveStatus
data.handleStatus = data.operatingStatus data.handleStatus = data.operatingStatus
// 判断操作 // 判断操作
if(data.btn==='指派'){ if(data.btn==='指派'){
data.row = {} data.row = {}
data.row.iid = data.id data.row.iid = data.iid
data.row.businessId = data.businessId data.row.businessId = data.businessId
data.row.companyId = data.companyId data.row.companyId = data.companyId
this.gotoSurvey(data,'compliance') this.gotoSurvey(data,'compliance')
@ -1208,6 +1212,7 @@ methods:{
return this.$message.error('请先选取角色！') return this.$message.error('请先选取角色！')
} }
obj.userId = this.assetDesignateC obj.userId = this.assetDesignateC
console.log(obj,'当前的obj')
complianceAssign(obj).then(res=>{ complianceAssign(obj).then(res=>{
if(res.success){ if(res.success){
this.$message.success('操作成功') this.$message.success('操作成功')
@ -1505,7 +1510,7 @@ methods:{
this.linkManLoading = false this.linkManLoading = false
}) })
}else{ }else{
this.$message('请先输入企业编号或名称后，再进行关联人操作！') if(this.businessApply.isExistRelated==1) return this.$message('请先输入企业编号或名称后，再进行关联人操作！')
} }
}, },
// 关联人checkbox // 关联人checkbox

9
src/components/common/flowPathMoudle.vue
Unescape View File

@ -477,6 +477,13 @@ export default {
decide(item){ decide(item){
if(item.operatingStatus===1){// 二次验证是否为处理 if(item.operatingStatus===1){// 二次验证是否为处理
sessionStorage.setItem('decideJump',JSON.stringify(item)) sessionStorage.setItem('decideJump',JSON.stringify(item))
console.log(item.taskNode,'当前的task',item)
/* 后三个步骤处理不同，非得从列表取得数据导致的问题，处理逻辑异常 */
// if(item.taskNode=='担保函'||item.taskNode=='财务确认'||item.taskNode=='放款通知'){
// console.log(item.businessId,'zhi')
// console.log(this.$store.state.guarantee.letterValue,'this.$store.state.guarantee.businessId')
this.$store.commit("businessId",item.businessId);
// }
this.jumpToFrom(item.taskNode) this.jumpToFrom(item.taskNode)
// switch (item.taskNode) { // switch (item.taskNode) {
// // 拥有十套不同的按钮判断逻辑，按钮根据取得的状态进行判断操作 // // 拥有十套不同的按钮判断逻辑，按钮根据取得的状态进行判断操作
@ -1041,11 +1048,9 @@ export default {
break; break;
case '财务确认': case '财务确认':
nodeCode = 9 nodeCode = 9
// 最后三部都记录对应的消息应用
break; break;
case '放款通知': case '放款通知':
nodeCode = 10 nodeCode = 10
// 最后三部都记录对应的消息应用
break; break;
default: default:
break; break;

2
src/components/common/messageDepartment.vue
Unescape View File

@ -1484,7 +1484,7 @@ methods:{
this.linkManLoading = false this.linkManLoading = false
}) })
}else{ }else{
this.$message('请先输入企业编号或名称后，再进行关联人操作！') if(this.businessApply.isExistRelated==1) return this.$message('请先输入企业编号或名称后，再进行关联人操作！')
} }
}, },
// 关联人checkbox // 关联人checkbox

7
src/components/common/processTemp.vue
Unescape View File

@ -116,15 +116,18 @@ export default {
}; };
}, },
mounted(){ mounted(){
console.log(this.$store.state.guarantee.businessId,'this.$store.state.guarantee.businessId')
this.getAuditProcess() this.getAuditProcess()
this.getAuditProcess2() this.getAuditProcess2()
this.queryCopySendUser()// 抄送人 this.queryCopySendUser()// 抄送人
}, },
methods: { methods: {
async getAuditProcess(){ async getAuditProcess(){
let params = { let params = {
// 从vuex取值 // 从vuex取值
businessId: this.$store.state.guarantee.letterValue.businessId, businessId: this.$store.state.guarantee.letterValue.businessId||this.$store.state.guarantee.businessId,
processId: this.$store.state.guarantee.topSidebarVal processId: this.$store.state.guarantee.topSidebarVal
} }
let res = await auditProcessList(params) let res = await auditProcessList(params)
@ -132,7 +135,7 @@ export default {
}, },
async getAuditProcess2(){ async getAuditProcess2(){
let params = { let params = {
businessId: this.$store.state.guarantee.letterValue.businessId, businessId: this.$store.state.guarantee.letterValue.businessId||this.$store.state.guarantee.businessId,
processId: '' processId: ''
} }
let res = await auditProcessList(params) let res = await auditProcessList(params)

2
src/components/common/propertyDepartment.vue
Unescape View File

@ -1099,7 +1099,7 @@ methods:{
this.linkManLoading = false this.linkManLoading = false
}) })
}else{ }else{
this.$message('请先输入企业编号或名称后，再进行关联人操作！') if(this.businessApply.isExistRelated==1) return this.$message('请先输入企业编号或名称后，再进行关联人操作！')
} }
}, },
// 关联人checkbox // 关联人checkbox

97
src/components/page/Workbench.vue
Unescape View File

@ -5,7 +5,14 @@
<div class="flex-center pdt40 border-b pdb30" > <div class="flex-center pdt40 border-b pdb30" >
<img src="../../assets/img/Basics-icon.png" alt class="mgr10 icon-size" /> <img src="../../assets/img/Basics-icon.png" alt class="mgr10 icon-size" />
<p class="fz-16">基础应用</p> <p class="fz-16">基础应用</p>
</div> </div>
<!-- <br/>
10.22的输出
<el-input v-model="test"></el-input>
<br/>
{{fMoney4(test/10000)}}
{{ChinaCost(test)}} -->
<div class="flex-center"> <div class="flex-center">
<!-- v-if="$router.currentRoute.meta.btn.includes('人力资源管理系统')" --> <!-- v-if="$router.currentRoute.meta.btn.includes('人力资源管理系统')" -->
<div class="card mgr40 manpower" @click="goto('workbench-manpower')"> <div class="card mgr40 manpower" @click="goto('workbench-manpower')">
@ -32,7 +39,7 @@ export default {
data(){ data(){
return{ return{
url:false, url:false,
test:10.22,
} }
}, },
watch:{ watch:{
@ -54,6 +61,94 @@ export default {
if(this.$route.fullPath!=='/workbench')this.url = true if(this.$route.fullPath!=='/workbench')this.url = true
}, },
methods:{ methods:{
fMoney4(money) {
if(!money) return ''
console.clear()
//汉字的数字
let cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
let cnIntRadice = new Array('', '拾', '佰', '仟'); //基本单位
let cnIntUnits = new Array('', '万', '亿', '兆'); //对应整数部分扩展单位
let cnDecUnits = new Array('仟', '佰', '拾', '元', '角' , '分'); //对应小数部分单位
let cnInteger = '元'; //整数金额时后面跟的字符
let cnIntLast = '万'; //整数无小数点的单位
let zero = "零"
let int; //金额整数部分
let dot; //金额小数部分
let chineseStr = ''; //输出的中文金额字符串
let parts; //分离金额后用的数组，预定义
if (money == '') {
return '';
}
//转换为字符串，获取小数点后的值与整数分离
money = money.toString();
console.log(money,money.indexOf('.'),'判断小数点')
if (money.indexOf('.') == -1) {// 取得小树点后面的值
int = money;
dot = '';
} else {
parts = money.split('.'); //整数小数分离
int = parts[0];
dot = parts[1].substr(0, 6); //最多六位小数，计算到 角，分
}
console.log(parseInt(int, 10),'parseInt(int, 10)')
//十进制转换，处理整数部分单位
if (parseInt(int, 10) > 0) {
console.log('进入十进制转换')
let zeroCount = 0;
let IntLen = int.length;
for (let i = 0; i < IntLen; i++) {
//循环整数部分，给每个位赋值，且判断是否整除4，添加额外赋值
let n = int.substr(i, 1);
let p = IntLen - i - 1; // 长度 -i -1 取得
let q = p / 4;
let m = p % 4;
console.log(n,p,q,m,"q,m")
if (n == '0') {
zeroCount++;
} else {
if (zeroCount > 0) {
chineseStr += cnNums[0];
}
//归零
zeroCount = 0;
chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
}
//
if (m == 0 && zeroCount < 4) {
chineseStr += cnIntUnits[q];
}
}
chineseStr += cnIntLast;
}
//小数部分
console.log(dot,'dot')
if (dot != '') {
console.log('进入小数处理部分')
let decLen = dot.length;// 循环小数后面的位数
for (let i = 0; i < decLen; i++) {
let n = dot.substr(i, 1);
if (n != '0') {
chineseStr += cnNums[Number(n)] + cnDecUnits[i];
}
console.log(i,'i',n,'n',dot)
/*
如果 indexof 第一个非0数字，后面带有连续的0，或者间隔的0
*/
if(i==3 && n=='0' ){ // 如果i处于千百十的时候，加个元
chineseStr += cnInteger
}
}
}
// if (chineseStr == '') {// 为0时，
// chineseStr += cnNums[0] + cnIntLast + cnInteger;
// }
// else if (dot == '') {//小数点为空值时
// chineseStr += cnInteger; // 加上元
// }
return chineseStr;
},
// 跳转方法,传一个字符串地址 // 跳转方法,传一个字符串地址
goto(path) { goto(path) {
this.$router.push('/' + path); this.$router.push('/' + path);

321
src/components/page/afterLoan/afterInsurance.vue
Unescape View File

@ -150,7 +150,9 @@
<el-form-item label="担保额度/贷款金额(元):" prop="guaranteeAmount"> <el-form-item label="担保额度/贷款金额(元):" prop="guaranteeAmount">
<div class="cashChinese"> <div class="cashChinese">
<el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="!wanderEdit||status=='newRecord'" v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度"></el-input> <el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="!wanderEdit||status=='newRecord'" v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度">
<i slot="suffix" style="margin-right:10px" class="el-input__icon">{{ChinaCost(guaranteeForm.guaranteeAmount)}}</i>
</el-input>
</div> </div>
</el-form-item> </el-form-item>
@ -184,13 +186,13 @@
<el-form label-width="160px" ref="comp" :disabled="disabledAll" :model="comp" :rules="compRule"> <el-form label-width="160px" ref="comp" :disabled="disabledAll" :model="comp" :rules="compRule">
<el-col :span="12" > <el-col :span="12" >
<el-form-item label="代偿金额（元）:"> <el-form-item label="代偿金额（元）:">
<el-input oninput="value=value.replace(/[^\d.]/g,'')" v-model="comp.compensationAmount" placeholder="请输入"></el-input> <el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" v-model="comp.compensationAmount" placeholder="请输入">
<i slot="suffix" style="margin-right:10px" class="el-input__icon">{{ChinaCost(comp.compensationAmount)}}</i>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="代偿时间 :"> <el-form-item label="代偿时间 :">
<el-date-picker <el-date-picker
v-model="comp.compensatoryTime" v-model="comp.compensatoryTime"
@change="compensatoryTimeChange"
type="date" type="date"
class="wd100" class="wd100"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -199,10 +201,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- 代偿金额 - 代偿日后 还款的金额 - 每一次的利息总额，每一笔还款，都在这里减去 --> <!-- 转为后端计算 -->
<!-- TODO 此处的代偿未计算完善，后端缺字段 -->
<el-form-item label="代偿余额（元）:"> <el-form-item label="代偿余额（元）:">
<el-input disabled v-model="computedCompensatoryBalance" placeholder="请输入"></el-input> <el-input disabled v-model="comp.compensatoryBalance" placeholder="录入后自动计算">
<i slot="suffix" style="margin-right:10px" class="el-input__icon">{{ChinaCost(comp.compensatoryBalance)}}</i>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -224,7 +227,7 @@
</el-form-item> </el-form-item>
<el-form-item label="所属清收组:" style="width:35%" prop="collectionGroupId"> <el-form-item label="所属清收组:" style="width:35%" prop="collectionGroupId">
<div class="df"> <div class="df">
<el-select :disabled="!entering&&status!=='newLoans'||status=='newRecord'" v-model="liquidate.collectionGroupId" placeholder="请选择"> <el-select :disabled="!entering&&status!=='newLoans'||status=='newRecord'" v-model="liquidate.collectionGroupId" @change="modifyReimbursement" placeholder="请选择">
<el-option v-for="(item, index) in organizationArrs" :key="index" :label="item.groupName" :value="item.id"></el-option> <el-option v-for="(item, index) in organizationArrs" :key="index" :label="item.groupName" :value="item.id"></el-option>
</el-select> </el-select>
<el-button @click="organization=true" type="text" class="mgl10">自定义</el-button> <el-button @click="organization=true" type="text" class="mgl10">自定义</el-button>
@ -237,14 +240,16 @@
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="经营情况:"> <el-form-item label="经营情况:">
<!-- 未完成 --> <!-- 未完成 :disabled="!wanderEdit"
<el-select :disabled="!wanderEdit" v-model="liquidate.operation" placeholder="请选择" prop="operation"> :disabled="!wanderEdit"
:disabled="!wanderEdit" -->
<el-select v-model="liquidate.operation" placeholder="请选择" prop="operation">
<el-option v-for="(item, index) in circumstance" :key="index" :label="item.name" :value="item.value"></el-option> <el-option v-for="(item, index) in circumstance" :key="index" :label="item.name" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="诉讼情况:" > <el-form-item label="诉讼情况:" >
<el-input <el-input
:disabled="!wanderEdit"
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="请输入1000字符以内" placeholder="请输入1000字符以内"
@ -253,7 +258,7 @@
</el-form-item> </el-form-item>
<el-form-item label="抵押情况:"> <el-form-item label="抵押情况:">
<el-input <el-input
:disabled="!wanderEdit"
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="请输入1000字符以内" placeholder="请输入1000字符以内"
@ -460,7 +465,8 @@
<el-table-column prop="actualRepaymentDate" label="实际还款日" align="center"></el-table-column> <el-table-column prop="actualRepaymentDate" label="实际还款日" align="center"></el-table-column>
<el-table-column prop="guaranteeAmount" label="担保额度(元)" align="center"></el-table-column> <el-table-column prop="guaranteeAmount" label="担保额度(元)" align="center"></el-table-column>
<el-table-column prop="currentRepayment" label="本次还款(元)" align="center"></el-table-column> <el-table-column prop="currentRepayment" label="本次还款(元)" align="center"></el-table-column>
<el-table-column prop="interest" label="本次利息(元)" align="center"></el-table-column> <el-table-column prop="interest" label="本次利息
(元)" align="center"></el-table-column>
<el-table-column prop="otherExpenses" label="其他费用(元)" align="center"></el-table-column> <el-table-column prop="otherExpenses" label="其他费用(元)" align="center"></el-table-column>
<el-table-column prop="totalRepayment" label="还款总额(元)" align="center"></el-table-column> <el-table-column prop="totalRepayment" label="还款总额(元)" align="center"></el-table-column>
<el-table-column prop="deductionAmount" label="减免金额(元)" align="center"></el-table-column> <el-table-column prop="deductionAmount" label="减免金额(元)" align="center"></el-table-column>
@ -468,7 +474,15 @@
<el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column> <el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column>
<el-table-column prop="submitterName" label="提交人" align="center"></el-table-column> <el-table-column prop="submitterName" label="提交人" align="center"></el-table-column>
<el-table-column prop="createTime" label="提交时间" align="center"></el-table-column> <el-table-column prop="createTime" label="提交时间" align="center"></el-table-column>
<el-table-column prop="repaymentNotes" label="还款备注" align="center"></el-table-column> <el-table-column label="还款备注" align="center">
<template slot-scope="scope">
<el-tooltip style="max-width:300px" class="item" effect="dark" :content="scope.row.repaymentNotes" placement="top">
<div style="max-height:45px;over-flow:auto;">
{{scope.row.repaymentNotes}}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$router.currentRoute.meta.btn.includes('保后查看')" type="text" @click="goRepaymentDetail(scope.row,'查看')">查看</el-button> <el-button v-if="$router.currentRoute.meta.btn.includes('保后查看')" type="text" @click="goRepaymentDetail(scope.row,'查看')">查看</el-button>
@ -488,7 +502,7 @@
<el-dialog title="导入" :visible.sync="upLoadPop" width="24%" center :close-on-click-modal="false"> <el-dialog title="导入" :visible.sync="upLoadPop" width="24%" center :close-on-click-modal="false">
<div class="flex-start-around"> <div class="flex-start-around">
<el-button type="primary" round <el-button type="primary" round
><a href="https://www.feifanhitech.com/enclosureFile/insuranceTemplate.xlsx" style="color:#fff">模板下载<i class="el-icon-download el-icon--right"></i></a ><a href="https://www.feifanhitech.com/template/insuranceTemplate.xlsx" style="color:#fff">模板下载<i class="el-icon-download el-icon--right"></i></a
></el-button> ></el-button>
<el-upload <el-upload
accept=".xls,.xlsx" accept=".xls,.xlsx"
@ -551,10 +565,9 @@
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { allBankName, insuranceList, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, excelHis, delRepayment, repaymentDetail, excelInsurance, updateInsurance, updateRepayment, designateEmpTrees, getAllClient ,saveInsurance,companyInfoBySth,liquidateList,liquidateEdit,liquidateDel,deleteInsurance, editInsurance, compensationSituation,importInsurance , exportFailure} from '../../../utils/api'; import { allBankName, insuranceList, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, excelHis, delRepayment, repaymentDetail, excelInsurance, updateInsurance, updateRepayment, designateEmpTrees, getAllClient ,saveInsurance,companyInfoBySth,liquidateList,liquidateEdit,liquidateDel,deleteInsurance, editInsurance, compensationSituation,importInsurance , exportFailure, modifyReimbursement} from '../../../utils/api';
import core from '../../../utils/core';// fMoney3 import core from '../../../utils/core'
// 使用轻量级的、仅限数字的函数实现 // 使用轻量级的、仅限数字的函数实现 import { create, all } from 'mathjs/number'
// import { create, all } from 'mathjs/number'
// const math = create(all) // const math = create(all)
let math = require('mathjs'); let math = require('mathjs');
export default { export default {
@ -656,12 +669,12 @@ export default {
value1:'', value1:'',
area:[// 区域 area:[// 区域
{name:'萨尔图区',id:0}, {name:'萨尔图区',id:'0'},
{name:'高新区',id:1}, {name:'高新区',id:'1'},
{name:'龙凤区',id:2}, {name:'龙凤区',id:'2'},
{name:'让胡同路区',id:3}, {name:'让胡同路区',id:'3'},
{name:'大同区',id:4}, {name:'大同区',id:'4'},
{name:'肇县区',id:5}, {name:'肇县区',id:'5'},
], ],
circumstance:[// 经营情况 circumstance:[// 经营情况
{name:'停产',value:'停产'}, {name:'停产',value:'停产'},
@ -740,11 +753,15 @@ export default {
btns:{}, btns:{},
ids:[], ids:[],
interest:'',// 代偿后的利息 interest:'',// 代偿后的利息
selectObj:{
personLiable:'',
personLiableId:''
},
}; };
}, },
computed:{ computed:{
computedCompensatoryBalance(){// 代偿余额计算 computedCompensatoryBalance(){// 代偿余额计算
/* TODO 未完成状态判断 */ /* 转为后端计算 */
// if(this.status){} // 如果是处于录入状态才减去count // 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.currentRepayment)this.repaymentForm.currentRepayment = 0
@ -825,13 +842,16 @@ export default {
} }
} }
}, },
fromOne(){// 判断来自保后
return this.$store.state.loan.fromOne
},
// 计算本次还款的清偿方式总额 // 计算本次还款的清偿方式总额
reimbursement(){ reimbursement(){
return this.repaymentForm.repaymentCash||0+this.repaymentForm.repaymentAssetsAmount||0+this.repaymentForm.repaymentOtherAmount||0 return this.repaymentForm.repaymentCash||0+this.repaymentForm.repaymentAssetsAmount||0+this.repaymentForm.repaymentOtherAmount||0
} }
}, },
watch: { watch: {
"$store.state.loan.loanStatus":function(val){ "$store.state.loan.loanStatus":async function(val){
if(val!=2){ if(val!=2){
this.comp.compensatoryBalance = 0 this.comp.compensatoryBalance = 0
this.cash = 0 this.cash = 0
@ -846,14 +866,22 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
this.getData() this.getData()
this.loanbackStatus = '' this.loanbackStatus = ''
this.repaymentForm = {
currentRepayment:0,
interest: 0,
otherExpenses:0,
overdueDays: 0
}
} }
if(val == 2){ if(val == 2){// 进入录入页面
console.log(this.souce,'判断是否系统流转--0')
/* TODO 未完成 */
// if(this.source === 0&&this.status==="oldLoans"){// 判断系统流转是否进行过编辑
// }
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)
this.id = 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.RepaymentId = this.$store.state.loan.RepaymentId
this.loanbackStatus = this.$store.state.loan.loanbackStatus this.loanbackStatus = this.$store.state.loan.loanbackStatus
@ -864,12 +892,29 @@ export default {
otherExpenses: '', otherExpenses: '',
overdueDays: 0 overdueDays: 0
} }
console.log(this.loanbackStatus,'什么状态')
// 处于编辑状态，额外添加一个编辑中的状态判断 // 处于编辑状态，额外添加一个编辑中的状态判断
if(this.status!=='newLoans'||this.discernEdit) this.getDetail() if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){ if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
console.log(this.loanbackStatus,'什么状态') await this.getRepaymentDetail()
this.getRepaymentDetail()
} }
console.log(this.souce,'判断是否系统流转--0')
/* TODO 未测试该判断 */
if(this.source === 0&&this.status==="oldLoans"&&!this.guaranteeForm.loanStartTime){// 判断系统流转,且是否进行过编辑，判断贷款时间以及当前的编辑状态
return this.$confirm('业务数据需补充完善，请先在编辑处完善必填项后再进行还款录入。','提示', {
confirmButtonText: '确定',
showCancelButton:false,
type: 'warning'
}).then(()=>{
// 手动切换状态进入到编辑业务状态（问题：进入的判断需要从新走一遍）
// this.edit('',this.row)
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
}).catch(()=>{
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
})}
} }
if(val == 3){ if(val == 3){
this.hisidId = this.$store.state.loan.hisidId this.hisidId = this.$store.state.loan.hisidId
@ -881,6 +926,7 @@ export default {
}, },
principal:function(val){// 处理组织架构选人是否清空 principal:function(val){// 处理组织架构选人是否清空
this.$forceUpdate();
this.designateEmpTrees() this.designateEmpTrees()
this.clearNodeArr = true this.clearNodeArr = true
this.$nextTick(()=>{ this.$nextTick(()=>{
@ -895,11 +941,25 @@ export default {
this.starEndDate = [] this.starEndDate = []
this.guaranteeForm = {} this.guaranteeForm = {}
this.mainbank = '' this.mainbank = ''
this.elsebank = ''
}
},
organization(val){
if(val){// 掉接口
this.liquidateList()
}else{
this.organizationArrs = []
} }
} }
}, },
created(){ async created(){
console.log(math.format(math.chain(math.bignumber(0.1)).add(math.bignumber(0.2)).done()),'计算数据') let a = [1,2,3,4],b = [1,2,3,4,5,6]
let c = a.concat(b).filter((cur, i, arr) => {
return arr.indexOf(cur) === arr.lastIndexOf(cur);
});
console.log(c,'比不同',a,b)
console.log(this.loanbackStatus,'this.loanbackStatus') console.log(this.loanbackStatus,'this.loanbackStatus')
this.liquidateList() this.liquidateList()
if(this.bankSelect.length===0){// 请求银行数据 if(this.bankSelect.length===0){// 请求银行数据
@ -931,8 +991,21 @@ export default {
console.log(this.status,'处于什么状态') console.log(this.status,'处于什么状态')
if(this.status!=='newLoans'||this.discernEdit) this.getDetail() if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){ if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
this.getRepaymentDetail() await this.getRepaymentDetail()
} }
if(this.source === 0&&this.status==="oldLoans"&&!this.guaranteeForm.loanStartTime){// 判断系统流转,且是否进行过编辑，判断贷款时间以及当前的编辑状态
return this.$confirm('业务数据需补充完善，请先在编辑处完善必填项后再进行还款录入。','提示', {
type: 'warning'
}).then(()=>{
// 手动切换状态进入到编辑业务状态（问题：进入的判断需要从新走一遍）
// this.edit('',this.row)
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
}).catch(()=>{
this.loanStatus = 1 // 切页面到保后页面
this.$store.commit("loanStatusData", { loanStatus: 1 });
})}
} }
if(this.loanStatus == 3){ if(this.loanStatus == 3){
@ -991,6 +1064,7 @@ export default {
// if(this.insMultipleSelection.length != ''){ // if(this.insMultipleSelection.length != ''){
let exportIds = this.insMultipleSelection.map(e => e.id).join() let exportIds = this.insMultipleSelection.map(e => e.id).join()
let url = `${excelInsurance}?ids=${exportIds}` let url = `${excelInsurance}?ids=${exportIds}`
console.log(url,'导出的URL')
window.location.href = url window.location.href = url
// }else{ // }else{
// this.$message.error('请先选择担保列表数据 ！'); // this.$message.error('请先选择担保列表数据 ！');
@ -1001,13 +1075,14 @@ export default {
edit(row,val){ edit(row,val){
this.$store.commit('disabledAll',false)// 取消禁用全部， this.$store.commit('disabledAll',false)// 取消禁用全部，
if(!row){// 没有row传值，进入新建业务界面--录入无关 if(!row){// 没有row传值，进入新建业务界面--录入无关
console.log('进入新建业务') console.log('进入新建业务',val)
this.loanStatus = 2 this.loanStatus = 2
this.$store.commit("loanbackStatusData", { loanbackStatus: '' });// 判断按钮状态 this.$store.commit("loanbackStatusData", { loanbackStatus: '' });// 判断按钮状态
this.$store.commit("loanStatusData", { loanStatus: 2 }); this.$store.commit("loanStatusData", { loanStatus: 2 });
this.$store.commit('setNewOrOld','newLoans') this.$store.commit('setNewOrOld','newLoans')
this.$store.commit('entering',false) this.$store.commit('entering',false)
this.$store.commit('wanderEdit',true) this.$store.commit('wanderEdit',true)
if(val) this.$store.commit("source",val.source);// 存来源，用于判断是否编辑过系统流转的业务
if(val){// --编辑业务阶段 if(val){// --编辑业务阶段
this.$store.commit('setNewOrOld','oldLoansEdit')// 进入业务编辑 this.$store.commit('setNewOrOld','oldLoansEdit')// 进入业务编辑
// 编辑手动添加的业务 // 编辑手动添加的业务
@ -1024,32 +1099,37 @@ export default {
this.loanbackStatus = '录入' // 新增判断，用于后退 this.loanbackStatus = '录入' // 新增判断，用于后退
this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' }); this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });
this.$store.commit('fromOne',false)// 从保后进入还款录入，用于后退判断
}else{ }else{
console.log('进入录入界面') console.log('进入录入界面')
// 进入还款录入,添加个额外判断进入编辑界面 // 进入还款录入,添加个额外判断进入编辑界面
this.$store.commit('wanderEdit',true) this.$store.commit('wanderEdit',true)
this.$store.commit('entering',false) // 不可编辑-业务编辑区域 this.$store.commit('entering',false) // 不可编辑-业务编辑区域
this.$store.commit('discernEdit',true)// 区分是否可编辑业务 this.$store.commit('discernEdit',true)// 区分是否可编辑业务
this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建 this.$store.commit('setNewOrOld','oldLoans')// 进入还款录入标识
this.loanStatus = 2 this.loanStatus = 2
this.$store.commit("loanStatusData", { loanStatus: 2 });// 切换页面状态 this.$store.commit("loanStatusData", { loanStatus: 2 });// 切换页面状态
this.id = row.id this.id = row.id
this.$store.commit("idData", { id: row.id });// 存业务id用于刷新复现 this.$store.commit("idData", { id: row.id });// 存业务id用于刷新复现
this.$store.commit("source",this.row.source);// 存来源，用于判断是否编辑过系统流转的业务 this.$store.commit("source",row.source);// 存来源，用于判断是否编辑过系统流转的业务
this.RepaymentId = '' this.RepaymentId = ''
this.$store.commit("RepaymentIdData", { RepaymentId: '' });// 查还款记录详情用 this.$store.commit("RepaymentIdData", { RepaymentId: '' });// 查还款记录详情用
this.loanbackStatus = '录入' this.loanbackStatus = '录入'
this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });// 判断按钮状态 this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });// 判断按钮状态
this.$store.commit('fromOne',true)// 从保后进入还款录入，用于后退判断
} }
}, },
//记录 //新增保后记录
history(row){ history(row){
this.loanStatus = 3 this.loanStatus = 3
this.$store.commit("loanStatusData", { loanStatus: 3 }); this.$store.commit("loanStatusData", { loanStatus: 3 });
this.hisId = row.id this.hisId = row.id
this.$store.commit("hisidIdData", { hisidId: row.id, guaranteeAmount: row.guaranteeAmount }); this.$store.commit("hisidIdData", { hisidId: row.id, guaranteeAmount: row.guaranteeAmount });
this.id = row.id
this.$store.commit("idData", { id: row.id });// 这是loan.id用于记录业务id的 */
this.hispaymentStatus = row.paymentStatus this.hispaymentStatus = row.paymentStatus
this.$store.commit("hispaymentStatusData", { hispaymentStatus: row.paymentStatus }); this.$store.commit("hispaymentStatusData", { hispaymentStatus: row.paymentStatus });
this.$store.commit('fromOne',false)// 从保后进入还款录入，用于后退判断
}, },
//办理结项 //办理结项
conclusion(row){ conclusion(row){
@ -1071,7 +1151,7 @@ export default {
async getDetail(){ async getDetail(){
this.guaranteeLoading = true this.guaranteeLoading = true
try { try {
let res = await insuranceDetail({ let res = await insuranceDetail({// 调业务详情
id: this.id id: this.id
}); });
this.guaranteeLoading = false this.guaranteeLoading = false
@ -1102,13 +1182,14 @@ export default {
// 清收 // 清收
this.liquidate = { this.liquidate = {
personLiable:reimbursement.personLiable, personLiable:reimbursement.personLiable,
personLiableId:reimbursement.personLiableId,
collectionGroupId:reimbursement.collectionGroupId, collectionGroupId:reimbursement.collectionGroupId,
area:+reimbursement.area, area:reimbursement.area,
operation:reimbursement.operation, operation:reimbursement.operation,
litigation:reimbursement.litigation, litigation:reimbursement.litigation,
mortgage:reimbursement.mortgage, mortgage:reimbursement.mortgage,
} }
this.qszId = reimbursement.id
} catch (error) { } catch (error) {
this.guaranteeLoading = false this.guaranteeLoading = false
} }
@ -1196,6 +1277,7 @@ export default {
if(that.RepaymentId == ''){// 新增录入 if(that.RepaymentId == ''){// 新增录入
console.log('新增录入') console.log('新增录入')
that.repaymentForm.insuranceId = that.id 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.totalRepayment = that.totalRepayment
that.repaymentForm.overdueDays = that.overdueDays that.repaymentForm.overdueDays = that.overdueDays
@ -1237,7 +1319,16 @@ 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('至少输入一种清偿方式！')
}
if(this.comp.compensationAmount||this.comp.compensatoryTime){// 判断代偿金额和时间
if(!(this.comp.compensationAmount&&this.comp.compensatoryTime)){
return this.$message.warning('若有代偿金额，请同时输入代偿金额和选择代偿时间！')
}
}
Promise.all([form1,form3,form2]).then(()=>{ Promise.all([form1,form3,form2]).then(()=>{
if(!this.totalSame()){ if(!this.totalSame()){
return this.$confirm('清偿方式的金额之和与本次还款总额不符，可能会导致数据统计错误，是否继续？', '提示', { return this.$confirm('清偿方式的金额之和与本次还款总额不符，可能会导致数据统计错误，是否继续？', '提示', {
type: 'warning' type: 'warning'
@ -1258,9 +1349,8 @@ export default {
}, },
//取消录入 //取消录入
cancel(){ cancel(){
// 判断处于哪个状态中，后退到对应页面
if(this.status=="newLoans"||this.status=="oldLoansEdit"||this.fromOne){
if(this.status=="newLoans"||this.status=="oldLoansEdit"){
this.loanStatus = 1 this.loanStatus = 1
this.$store.commit("loanStatusData", { loanStatus: 1 }); this.$store.commit("loanStatusData", { loanStatus: 1 });
}else{ }else{
@ -1293,6 +1383,7 @@ export default {
}, },
// 还款记录列表 // 还款记录列表
async repaymentList(){ async repaymentList(){
console.log(this.hisidId,'当前传的id值')
let res = await repaymentList({ let res = await repaymentList({
page: this.hisPage, page: this.hisPage,
size: this.pageNumber, size: this.pageNumber,
@ -1370,12 +1461,14 @@ export default {
}, },
// 还款记录：查看/编辑 // 还款记录：查看/编辑
goRepaymentDetail(row,type){ goRepaymentDetail(row,type){
console.log(row,type,'点击查看业务，')
this.loanStatus = 2 this.loanStatus = 2
this.$store.commit("loanStatusData", { loanStatus: 2 }); this.$store.commit("loanStatusData", { loanStatus: 2 });// 跳查看
this.RepaymentId = row.id this.RepaymentId = row.id
this.$store.commit("RepaymentIdData", { RepaymentId: row.id }); this.$store.commit("RepaymentIdData", { RepaymentId: row.id });// 业务ID
this.id = row.insuranceId this.id = row.insuranceId
this.$store.commit("idData", { id: row.insuranceId }); this.$store.commit("idData", { id: row.insuranceId });// 这是loan.id用于记录业务id的 */
console.log(this.id,'rowid',row,'新增还款记录错误')
this.loanbackStatus = type this.loanbackStatus = type
@ -1393,7 +1486,7 @@ export default {
}, },
// 取得录入页面数据详情 // 取得录入页面数据详情
async getRepaymentDetail(){ async getRepaymentDetail(){
console.log(this.RepaymentId,'调用详情接口') console.log(this.RepaymentId,'调用详情接口使用的id')
let res = await repaymentDetail({ let res = await repaymentDetail({
id: this.RepaymentId id: this.RepaymentId
}); });
@ -1448,12 +1541,16 @@ export default {
}) })
}, },
principalNode(val){// 组织架构选择人员 principalNode(val){// 组织架构选择人员
this.$set(this.liquidate,'personLiable',val[0].name) this.selectObj = {
this.liquidate.personLiableId = val[0].id personLiable:val[0].name,
personLiableId:val[0].id
}
}, },
principalSeleted(){// 选择清收负责人 principalSeleted(){// 选择清收负责人
this.principal = false this.principal = false
this.$set(this.liquidate,'personLiable',this.selectObj.personLiable)
this.liquidate.personLiableId = this.selectObj.personLiableId
this.modifyReimbursement()
}, },
searchClientChange(val,state){// 实时搜索客户详细信息 searchClientChange(val,state){// 实时搜索客户详细信息
companyInfoBySth({name:val}).then(res=>{ companyInfoBySth({name:val}).then(res=>{
@ -1542,7 +1639,6 @@ export default {
}) })
}, },
saveInsurance(){// 新增保后业务 或编辑业务 saveInsurance(){// 新增保后业务 或编辑业务
/* TODO 需要处理没有还款信息的编辑 */
let has = false let has = false
// 担保信息 // 担保信息
const form1 = new Promise((resolve,reject)=>{ const form1 = new Promise((resolve,reject)=>{
@ -1575,6 +1671,7 @@ export default {
// 如果处于编辑业务状态 或者是还款录入状态 // 如果处于编辑业务状态 或者是还款录入状态
if(this.discernEdit) obj.insuranceId = this.id if(this.discernEdit) obj.insuranceId = this.id
Object.assign(obj,this.comp,this.liquidate) Object.assign(obj,this.comp,this.liquidate)
this.guaranteeForm.paymentStatus = 1
let param = { let param = {
alInsuranceList:this.guaranteeForm,// 担保信息 alInsuranceList:this.guaranteeForm,// 担保信息
alReimbursement:obj// 代偿清收相关 alReimbursement:obj// 代偿清收相关
@ -1588,6 +1685,7 @@ export default {
}) })
}else{// 处于新增状态下 }else{// 处于新增状态下
// param.source = 1 // param.source = 1
saveInsurance(param).then(res=>{ saveInsurance(param).then(res=>{
// 新增业务，返回上一页 // 新增业务，返回上一页
if(this.status==='newLoans'){ if(this.status==='newLoans'){
@ -1635,7 +1733,7 @@ export default {
}, },
deleteInsurance(row){// 删除保后业务--仅新建可删 deleteInsurance(row){// 删除保后业务--仅新建可删
this.$confirm('此操作无法还原，确定要删除该业务？', '提示', { this.$confirm('确认删除？删除后与该业务相关的保后信息将会一并删除且不可恢复', '提示', {
type: 'error' type: 'error'
}).then(() => { }).then(() => {
deleteInsurance(row.id).then(res=>{ deleteInsurance(row.id).then(res=>{
@ -1647,10 +1745,7 @@ export default {
compensationSituation({data:val,insuranceId:this.id}).then(res=>{ compensationSituation({data:val,insuranceId:this.id}).then(res=>{
this.cash = res.data.amount this.cash = res.data.amount
console.log('取得当前的cash',this.cash) console.log('取得当前的cash',this.cash)
/* TODO 利息，其他，本次还款*/
// 利息
// this.interest = res.data.xx
}) })
}, },
uploadSuccess(response, file, fileList) { // 上传成功 uploadSuccess(response, file, fileList) { // 上传成功
@ -1680,7 +1775,98 @@ export default {
}else{ }else{
return true return true
} }
} },
modifyReimbursement(){// 查清收组
console.log('触发查询原本')
console.log(this.liquidate.personLiableId,this.liquidate.collectionGroupId,this.qszId,'三个值')
if(this.liquidate.personLiableId&&this.liquidate.collectionGroupId&&this.qszId){
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')
if(res.message!="成功"){
return this.$message.warning(res.message)
}
})
}
},
ChinaCost(numberValue){
var numberValue=new String(Math.round(numberValue*100)); // 数字金额
var chineseValue=""; // 转换后的汉字金额
var String1 = "零壹贰叁肆伍陆柒捌玖"; // 汉字数字
var String2 = "万仟佰拾亿仟佰拾万仟佰拾元角分"; // 对应单位
var len = numberValue.length; // numberValue 的字符串长度
var Ch1; // 数字的汉语读法
var Ch2; // 数字位的汉字读法
var nZero=0; // 用来计算连续的零值的个数
var String3; // 指定位置的数值
if(len>15){
alert("超出计算范围");
return "";
}
if (numberValue==0){
chineseValue = "零元整";
return chineseValue;
}
String2 = String2.substr(String2.length-len, len); // 取出对应位数的STRING2的值
for(var i=0; i<len; i++){
String3 = parseInt(numberValue.substr(i, 1),10); // 取出需转换的某一位的值
if ( i != (len - 3) && i != (len - 7) && i != (len - 11) && i !=(len - 15) ){
if ( String3 == 0 ){
Ch1 = "";
Ch2 = "";
nZero = nZero + 1;
}
else if ( String3 != 0 && nZero != 0 ){
Ch1 = "零" + String1.substr(String3, 1);
Ch2 = String2.substr(i, 1);
nZero = 0;
}
else{
Ch1 = String1.substr(String3, 1);
Ch2 = String2.substr(i, 1);
nZero = 0;
}
}
else{ // 该位是万亿，亿，万，元位等关键位
if( String3 != 0 && nZero != 0 ){
Ch1 = "零" + String1.substr(String3, 1);
Ch2 = String2.substr(i, 1);
nZero = 0;
}
else if ( String3 != 0 && nZero == 0 ){
Ch1 = String1.substr(String3, 1);
Ch2 = String2.substr(i, 1);
nZero = 0;
}
else if( String3 == 0 && nZero >= 3 ){
Ch1 = "";
Ch2 = "";
nZero = nZero + 1;
}
else{
Ch1 = "";
Ch2 = String2.substr(i, 1);
nZero = nZero + 1;
}
if( i == (len - 11) || i == (len - 3)){ // 如果该位是亿位或元位，则必须写上
Ch2 = String2.substr(i, 1);
}
}
chineseValue = chineseValue + Ch1 + Ch2;
}
if ( String3 == 0 ){ // 最后一位（分）为0时，加上“整”
chineseValue = chineseValue + "整";
}
return chineseValue;
},
@ -1745,4 +1931,13 @@ export default {
/deep/ .el-upload-list{ /deep/ .el-upload-list{
display: none; display: none;
} }
.item{
max-width:300px;
}
.btn-custom-cancel{
display: none;
background: transparent;
color: turquoise;
}
</style> </style>

8
src/components/page/afterLoan/afterLoan.vue
Unescape View File

@ -115,6 +115,8 @@ export default {
this.$router.push('/' + path); this.$router.push('/' + path);
}, },
backTo(){// 后退 backTo(){// 后退
console.log(this.showValue,'当前后退的判断值')
console.log(this.schedule,typeof(this.schedule),'当前后退的判断值')
switch (this.showValue) { switch (this.showValue) {
case '0':// 保后 case '0':// 保后
switch (this.loanStatusHome) { switch (this.loanStatusHome) {
@ -186,7 +188,7 @@ export default {
case '1': case '1':
this.goto('workbench') this.goto('workbench')
break; break;
default: default: this.goto('workbench')
break; break;
} }
break; break;
@ -222,6 +224,10 @@ export default {
this.$store.commit("leftSidebarData", { leftStatus: this.showValue }); this.$store.commit("leftSidebarData", { leftStatus: this.showValue });
} }
}, },
destroyed() {
this.$store.commit("leftSidebarData", { leftStatus: '0' });
this.$store.commit("loanStatusData", { loanStatus: 1 });// 切换页面状态
},
}; };
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

116
src/components/page/afterLoan/collection.vue
Unescape View File

@ -247,7 +247,15 @@
<el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column> <el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column>
<el-table-column prop="submitterName" label="提交人" align="center"></el-table-column> <el-table-column prop="submitterName" label="提交人" align="center"></el-table-column>
<el-table-column prop="createTime" label="提交时间" align="center"></el-table-column> <el-table-column prop="createTime" label="提交时间" align="center"></el-table-column>
<el-table-column prop="repaymentNotes" label="还款备注" align="center"></el-table-column> <el-table-column prop="repaymentNotes" label="还款备注" align="center">
<template slot-scope="scope">
<el-tooltip v-if="scope.row.repaymentNotes&&scope.row.repaymentNotes!='-'&&scope.row.repaymentNotes!=' '" style="max-width:300px" class="item" effect="dark" :content="scope.row.repaymentNotes" placement="top">
<div style="max-height:45px;over-flow:auto;">
{{scope.row.repaymentNotes}}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$router.currentRoute.meta.btn.includes('催收查看')" type="text" @click="goRepaymentDetail(scope.row)">查看</el-button> <el-button v-if="$router.currentRoute.meta.btn.includes('催收查看')" type="text" @click="goRepaymentDetail(scope.row)">查看</el-button>
@ -337,7 +345,15 @@
<el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column> <el-table-column prop="repaymentStatus" label="状态" align="center"></el-table-column>
<el-table-column prop="submitterName" label="提交人" align="center"></el-table-column> <el-table-column prop="submitterName" label="提交人" align="center"></el-table-column>
<el-table-column prop="createTime" label="提交时间" align="center"></el-table-column> <el-table-column prop="createTime" label="提交时间" align="center"></el-table-column>
<el-table-column prop="repaymentNotes" label="还款备注" align="center"></el-table-column> <el-table-column prop="repaymentNotes" label="还款备注" align="center">
<template slot-scope="scope">
<el-tooltip style="max-width:300px" class="item" effect="dark" :content="scope.row.repaymentNotes" placement="top">
<div style="max-height:45px;over-flow:auto;">
{{scope.row.repaymentNotes}}
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -392,8 +408,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mab20 flex-start-around" v-if="logbackStatus == '提交'"> <div class="mab20 flex-start-around" v-if="logbackStatus === '提交'||logbackStatus === '编辑'">
<el-button type="primary" round class="mag" @click="collectionSave('collectionHandle')">提交</el-button> <el-button type="primary" round v-if="logbackStatus === '提交'" class="mag" @click="collectionSave('collectionHandle')">提交</el-button>
<el-button type="primary" round v-if="logbackStatus === '编辑'" class="mag" @click="updateCollection('collectionHandle')">提交</el-button>
<el-button type="primary" plain round class="mag" @click="collectionCancel">取消</el-button> <el-button type="primary" plain round class="mag" @click="collectionCancel">取消</el-button>
</div> </div>
</div> </div>
@ -453,10 +470,24 @@
<el-table-column prop="collectionTime" label="催收日期" align="center"></el-table-column> <el-table-column prop="collectionTime" label="催收日期" align="center"></el-table-column>
<el-table-column prop="collectionUserName" label="催收人" align="center"></el-table-column> <el-table-column prop="collectionUserName" label="催收人" align="center"></el-table-column>
<el-table-column prop="collectionMethod" label="催收方式" align="center"></el-table-column> <el-table-column prop="collectionMethod" label="催收方式" align="center"></el-table-column>
<el-table-column prop="collectionFeedback" label="催收反馈" align="center"></el-table-column> <el-table-column prop="collectionFeedback" label="催收反馈" align="center">
<template slot-scope="scope">
<el-tooltip v-if="scope.row.collectionFeedback" style="max-width:300px" class="item" effect="dark" :content="scope.row.collectionFeedback" placement="top">
<div style="max-height:45px;over-flow:auto;">
{{scope.row.collectionFeedback}}
</div>
</el-tooltip>
<div v-else>
-
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-if="$router.currentRoute.meta.btn.includes('催收记录查看')" @click="collectionHisSee(scope.row)">查看</el-button> <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('催收记录查看')" @click="collectionHisSee(scope.row)">查看</el-button>
<el-button type="text" v-if="$router.currentRoute.meta.btn.includes('催收记录查看')" @click="eidt(scope.row)">编辑</el-button>
<el-button type="text" v-if="$router.currentRoute.meta.btn.includes('催收记录查看')" @click="del(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -472,7 +503,7 @@
</template> </template>
<script> <script>
import { collectionList, collectionListDetail, collectionHisList, excelCollectionHis, collection, collectionHisListDetail, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, repaymentDetail, excelCollection, updateInsurance } from '../../../utils/api'; import { collectionList, collectionListDetail, collectionHisList, excelCollectionHis, collection, collectionHisListDetail, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, repaymentDetail, excelCollection, updateInsurance,updateCollection,delCollection } from '../../../utils/api';
import axios from 'axios'; import axios from 'axios';
export default { export default {
@ -596,6 +627,12 @@
endTimeOptions: {} endTimeOptions: {}
}; };
}, },
computed:{
records(){
return this.$store.state.loan.records
}
},
watch: { watch: {
"$store.state.loan.logStatus":function(val) { "$store.state.loan.logStatus":function(val) {
this.logStatus = val this.logStatus = val
@ -745,6 +782,7 @@
this.$store.commit("logbackStatusData", { logbackStatus: '提交' }); this.$store.commit("logbackStatusData", { logbackStatus: '提交' });
this.logId = row.id this.logId = row.id
this.$store.commit("logIdData", { logId: row.id }); this.$store.commit("logIdData", { logId: row.id });
this.$store.commit("records", false);
}, },
//催收记录 //催收记录
collectionHis(row){ collectionHis(row){
@ -920,8 +958,13 @@
this.collectionHandle.insuranceId = this.logId this.collectionHandle.insuranceId = this.logId
collection(this.collectionHandle).then(res=>{ collection(this.collectionHandle).then(res=>{
this.$message.success("提交成功！"); this.$message.success("提交成功！");
this.logStatus = 1 console.log(this.records,'recodes')
this.$store.commit("logStatusData", { logStatus: 1 }); if(this.records){
this.logStatus = 5
}else{
this.logStatus = 1
}
this.$store.commit("logStatusData", { logStatus: this.logStatus });
}).catch(err=>{ }).catch(err=>{
}) })
} }
@ -929,8 +972,13 @@
}, },
//取消 //取消
collectionCancel(){ collectionCancel(){
this.logStatus = 1 console.log(this.records,'recodes')
this.$store.commit("logStatusData", { logStatus: 1 }); if(this.records){
this.logStatus = 5
}else{
this.logStatus = 1
}
this.$store.commit("logStatusData", { logStatus: this.logStatus });
}, },
//催收记录列表部分***** //催收记录列表部分*****
async collectionHisList(){ async collectionHisList(){
@ -992,6 +1040,9 @@
this.$store.commit("logbackStatusData", { logbackStatus: '查看' }); this.$store.commit("logbackStatusData", { logbackStatus: '查看' });
this.logbackId = row.id this.logbackId = row.id
this.$store.commit("logbackIdData", { logbackId: row.id }); this.$store.commit("logbackIdData", { logbackId: row.id });
this.$store.commit("records", true);
}, },
// 催收记录列表点击查看 // 催收记录列表点击查看
async collectionHisListDetail(){ async collectionHisListDetail(){
@ -1023,7 +1074,47 @@
e.repaymentStatus = this.core.stcStatus(e.repaymentStatus) e.repaymentStatus = this.core.stcStatus(e.repaymentStatus)
}) })
this.collectionData = res.data.alRepaymentEntryList this.collectionData = res.data.alRepaymentEntryList
} },
eidt(row){// 催收记录列表编辑
this.logStatus = 4
this.$store.commit("logStatusData", { logStatus: 4 });
this.logbackStatus = '编辑'
this.$store.commit("logbackStatusData", { logbackStatus: '编辑' });
this.logbackId = row.id
this.$store.commit("logbackIdData", { logbackId: row.id });
this.$store.commit("records", true);
},
updateCollection(collectionHandle){// 编辑提交
if(this.collectionHandle.collectionMethod!=='3') this.$set(this.collectionHandle,"other",'')
this.$refs[collectionHandle].validate((valid) => {
if (valid) {
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)
this.collectionHandle.insuranceId = this.logId
this.collectionHandle.id = this.logbackId
updateCollection(this.collectionHandle).then(res=>{
this.$message.success("编辑成功");
this.logStatus = 1
this.$store.commit("logStatusData", { logStatus: 1 });
}).catch(err=>{
})
}
})
// updateCollection(params).then(res=>{
// console.log(res,'提交接口')
// })
},
del(row){// 催收记录列表删除
this.$confirm('此操作不可逆，是否确定删除该业务？','提示').then(()=>{
delCollection(row.id).then(()=>{
this.$message.success("删除成功");
this.collectionHisList()
})
}).catch(()=>{
})
},
} }
} }
@ -1042,5 +1133,8 @@
outline: none; outline: none;
width: 20rem; width: 20rem;
} }
/deep/ .el-tooltip__popper{
max-width: 600px;
}
</style> </style>

497
src/components/page/afterLoan/complete.vue
Unescape View File

@ -46,7 +46,7 @@
<el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option> <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
</el-select> </el-select>
<el-input <el-input
placeholder="请输入金额（元）" placeholder="请输入数值"
class="wd20 mglr10" class="wd20 mglr10"
style="min-width: 200px" style="min-width: 200px"
:disabled="!searchStr.proportionSymbol" :disabled="!searchStr.proportionSymbol"
@ -55,7 +55,7 @@
></el-input> ></el-input>
<p>%</p> <p>%</p>
<p class="fz-16 mgr10 font-blue mgl20 nowrap">已清收总额</p> <p class="fz-16 mgr10 font-blue mgl20 nowrap">已清收总额</p>
<el-select v-model="searchStr.allAoumntSymbol" placeholder="请选择" clearable @change="search"> <el-select @change="allAoumntSymbolChange" v-model="searchStr.allAoumntSymbol" placeholder="请选择" clearable>
<el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option> <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
</el-select> </el-select>
<el-input :disabled="!searchStr.allAoumntSymbol" class="wd20 mglr10" placeholder="请输入金额（元）" style="min-width: 200px" v-model="searchStr.allAoumnt" clearable></el-input> <el-input :disabled="!searchStr.allAoumntSymbol" class="wd20 mglr10" placeholder="请输入金额（元）" style="min-width: 200px" v-model="searchStr.allAoumnt" clearable></el-input>
@ -89,7 +89,7 @@
v-model="searchStr.queryCondition" v-model="searchStr.queryCondition"
placeholder="工号/清收负责人" placeholder="工号/清收负责人"
clearable clearable
></el-input> ><i slot="suffix" class="el-input__icon el-icon-search" @click="annualStatisticsList"></i></el-input>
</div> </div>
</div> </div>
<!-- <!--
@ -107,8 +107,8 @@
:key="1" :key="1"
> >
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
<el-table-column prop="companyRanks" label="公司排名" align="center" width="120px"></el-table-column> <el-table-column prop="companyRanks" label="公司排名" align="center" width="70px"></el-table-column>
<el-table-column prop="TeamRanks" label="小组排名" align="center" width="120px"></el-table-column> <el-table-column prop="TeamRanks" label="小组排名" align="center" width="70px"></el-table-column>
<el-table-column prop="groupName" label="清收组" align="center" width="150px"></el-table-column> <el-table-column prop="groupName" label="清收组" align="center" width="150px"></el-table-column>
<el-table-column prop="personLiable" label="清收负责人" align="center" width="150px"></el-table-column> <el-table-column prop="personLiable" label="清收负责人" align="center" width="150px"></el-table-column>
<el-table-column prop="jobNumber" label="工号" align="center"></el-table-column> <el-table-column prop="jobNumber" label="工号" align="center"></el-table-column>
@ -137,6 +137,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="backTime static multi-box" v-for="(item, index) in scope.row.collectionTime" :key="index"> <div class="backTime static multi-box" v-for="(item, index) in scope.row.collectionTime" :key="index">
<el-date-picker <el-date-picker
v-if="item.collectionTime"
style="width:180px" style="width:180px"
v-model="item.collectionTime" v-model="item.collectionTime"
type="date" type="date"
@ -144,6 +145,7 @@
:disabled="!scope.row.edit" :disabled="!scope.row.edit"
> >
</el-date-picker> </el-date-picker>
<div v-else>-</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -161,14 +163,19 @@
<el-input :disabled="!scope.row.edit" placeholder="输入年度金额指标" v-model="scope.row.proportion"></el-input> <el-input :disabled="!scope.row.edit" placeholder="输入年度金额指标" v-model="scope.row.proportion"></el-input>
</div> </div>
<div v-if="!scope.row.edit"> <div v-if="!scope.row.edit">
{{scope.row.percent}}% {{scope.row.percent==="未填写年度指标"?"未填写年度指标":scope.row.percent+"%"}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center" width="200px"> <el-table-column prop="remark" label="备注" align="center" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="backTime static multi-box" v-for="(item, index) in scope.row.description" :key="index"> <div class="backTime static multi-box" v-for="(item, index) in scope.row.description" :key="index">
<el-input :disabled="!scope.row.edit" v-model="item.description"></el-input> <el-tooltip v-if="item.description&&item.description!='-'&&scope.row.description!=' '" class="item" effect="dark" :content="item.description" placement="top">
<el-input :disabled="!scope.row.edit" v-model="item.description"></el-input>
</el-tooltip>
<div v-else>
-
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -206,7 +213,7 @@
<div class="tree"> <div class="tree">
<div class="left-border fz-16 mgt20"><p class="c-black mgl10">参与本年度清收排名的人员</p></div> <div class="left-border fz-16 mgt20"><p class="c-black mgl10">参与本年度清收排名的人员</p></div>
<div class="mgl80 mgt20 mgr80" style="border: 1px solid #e6e6e6; border-radius: 15px; overflow: auto; padding: 15px"> <div class="mgl80 mgt20 mgr80" style="border: 1px solid #e6e6e6; border-radius: 15px; overflow: auto; padding: 15px">
<el-checkbox @change="allCheck" v-model="checked" class="mgl20" style="margin-left:23px">全选</el-checkbox> <!-- <el-checkbox @change="allCheck" v-model="checked" class="mgl20" style="margin-left:23px">全选</el-checkbox> -->
<el-tree <el-tree
:data="tree" :data="tree"
show-checkbox show-checkbox
@ -230,11 +237,14 @@
</div> </div>
</template> </template>
<script> <script>
import { json } from 'mathjs';
import {collectionGroupList ,generateAnnualStatistics,annualList,annualStatisticsList,editAnnualStatistics,personnelSelection ,annualStatisticsDeleted,annualStatisticsListExport,liquidateList } from '../../../utils/api' import {collectionGroupList ,generateAnnualStatistics,annualList,annualStatisticsList,editAnnualStatistics,personnelSelection ,annualStatisticsDeleted,annualStatisticsListExport,liquidateList } from '../../../utils/api'
import core from '../../../utils/core' import core from '../../../utils/core'
export default { export default {
name: '', name: '',
props: {}, props: {},
components:{
},
data() { data() {
return { return {
showRank: false, // 弹框 showRank: false, // 弹框
@ -291,17 +301,21 @@ export default {
changeStaffYear:'', changeStaffYear:'',
changeStaffDisabled:false, changeStaffDisabled:false,
checked:false, checked:false,
}; };
}, },
watch: { watch: {
showRank(val){ showRank(val){
if(val){ if(val){
this.getTree() this.getTree()
}else{
this.tree = []
this.treeIds = []
} }
}, },
liquidate(val){ liquidate(val){
if(val==2){ if(val==2){
console.log('判断为2') // console.log('判断为2')
this.liquidateList() this.liquidateList()
this.annualStatisticsList() this.annualStatisticsList()
}else{ }else{
@ -327,15 +341,15 @@ export default {
},set(){} },set(){}
}, },
percent(){ percent(){
console.log(this.statisticsData,'statisticsData') // console.log(this.statisticsData,'statisticsData')
console.log(this.statisticsData.totalAmount,this.statisticsData.proportion,'计算百分比的值') // console.log(this.statisticsData.totalAmount,this.statisticsData.proportion,'计算百分比的值')
return (+this.statisticsData.totalAmount/+this.statisticsData.proportion).toFixed(2) return (+this.statisticsData.totalAmount/+this.statisticsData.proportion).toFixed(2)
} }
}, },
created() { created() {
this.searchStr = this.$store.state.loan.liquidateSearch this.searchStr = this.$store.state.loan.liquidateSearch
this.annualList() this.annualList()
console.log(this.liquidate,this.searchStr,'li') // console.log(this.liquidate,this.searchStr,'li')
if(this.liquidate=='2'){ if(this.liquidate=='2'){
this.annualStatisticsList() this.annualStatisticsList()
} }
@ -347,7 +361,7 @@ export default {
liquidateList(){// 清收组 liquidateList(){// 清收组
liquidateList().then(res=>{ liquidateList().then(res=>{
this.liquidateSelectArr = res.data.groupList this.liquidateSelectArr = res.data.groupList
console.log(this.liquidateSelectArr,'arr') // console.log(this.liquidateSelectArr,'arr')
}) })
}, },
handleScroll:core.debounce(function(){ handleScroll:core.debounce(function(){
@ -395,7 +409,6 @@ export default {
if(!this.searchStr.year) { if(!this.searchStr.year) {
this.searchStr = this.$store.state.loan.liquidateSearch this.searchStr = this.$store.state.loan.liquidateSearch
} }
this.moreText = "点击加载更多数据"
let param = { let param = {
year:this.searchStr.year, year:this.searchStr.year,
groupId:this.searchStr.groupId, groupId:this.searchStr.groupId,
@ -405,10 +418,113 @@ export default {
} }
this.statisticsLoading = true this.statisticsLoading = true
annualStatisticsList(param).then(res=>{ annualStatisticsList(param).then(res=>{
// console.clear()
// console.log('开始处理数据')
this.statisticsLoading = false this.statisticsLoading = false
let arr = new Map() let arr = new Map() // 最后处理得到的map对象
let data = res.data.list let data = res.data.list
data.forEach(e=>{ let groupArr= new Map()// 得到的组排序对象，仅取出多组和多组排名即可。
let overArr = []// 最终处理出来的组排序的数组
function compare(key){
return function(value1,value2){
let val1=value1[key];
let val2=value2[key];
return val2-val1;
}
}
// console.log(res.data.groupList.collect,'res.data.groupList.collect')
// 按组分人进行处理，取得人的组排序值，以及对应的多组的值，取得这两个数据即可
let collect = JSON.parse(JSON.stringify(res.data.groupList.collect))
if(res.data.groupList.collect){
// console.log('开始处理组的数据')
for (let key in res.data.groupList.collect) {// 循环分组
// 每次取出一个组进行处理，并且在该次处理中，把人员组和名次取出来
let group = res.data.groupList.collect[key]
// console.log(group,'每个组的数据',key,'key')
let aloneMap = new Map() // 每个组独立的map对象处理
let aloneArr = []// 取出所有的已处理数据
group.forEach(e=>{// 进行相同数据处理叠加，需要注意组和排名的处理
// 进行各项数据叠加，然后根据叠加的totalAmount字段进行排序，且，组之间需要进行一次额外排序
if(aloneMap.has(e.jobNumber)){// 如果处理过，进行叠加处理
let obj = aloneMap.get(e.jobNumber)
obj.enterprise.push({enterprise:e.enterprise,id:e.id})
obj.totalAmount += ((+e.cash||0)+(+e.assets))
obj.cash.push({cash:e.cash,id:e.id})
obj.assets.push({assets:e.assets,id:e.id})
obj.collectionTime.push({collectionTime:e.collectionTime,id:e.id})
obj.description.push({description:e.description,id:e.id})
aloneMap.set(e.jobNumber,obj)
// console.log(e.groupName,'多次处理的组数据')
}else{
e.groupName = [e.groupName]// 区别于公司人员处理，把组提取出来
// console.log(e.groupName,'e.groupName')
e.enterprise = [{enterprise:e.enterprise||'-',id:e.id}]
e.totalAmount = (+e.cash||0)+(+e.assets)
e.cash = [{cash:e.cash||'-',id:e.id}]
e.assets = [{assets:e.assets||'-',id:e.id}]
e.collectionTime = [{collectionTime:e.collectionTime,id:e.id}]
e.description = [{description:e.description||'-',id:e.id}]
// console.log(e.totalAmount,`首次加入的${e.personLiable}`)
aloneMap.set(e.jobNumber,e)// 根据工号进行标识储存
}
})
// console.log(aloneMap,'首次处理的alone')
// 处理完的map进行解构，并排序，以此取得每个组的排序对象数组
for(let [key,value] of aloneMap){
aloneArr.push(value)
}
// console.log('取得aloneArr的map对象',aloneArr)
aloneArr.sort(compare('totalAmount'))// 进行金额排序
aloneArr.forEach((e,i)=>{// 由此取得每个人在组内的排序
e.TeamRanks = [i+1]
})
groupArr.set(key,aloneArr)// 再把该数组存入组id标识的map对象中
}
}
let dispose = []
// 处理完map对象后，需要再根据人进行合并,先取出所有的组对应数组
for(let [key,value] of groupArr){
// 存在map中的是一个个组为标识的数组，先把数组解构出来，然后再需要进行一个一个对象的工号对比，若相同，则进行合并
dispose.push(...value)
}
// console.log(dispose,'取出所有的dispose值')
if(dispose.length>0){
// 建立一个新的map进行合并操作，以工号为标识
let disposeMap = new Map()
dispose.forEach(e=>{// 循环，合并相同的数据，仅需取得对应的排序和复数组
if(disposeMap.has(e.jobNumber)){// 如果处理过，进行叠加处理
let obj = disposeMap.get(e.jobNumber)
// console.log(e.groupName,e.TeamRanks,'e的组和排名')
// console.log(obj.groupName,obj.TeamRanks,'obj的组和排名')
// console.log(obj.groupName.includes(e.groupName),'obj是否包含e的判断')
if(!obj.groupName.includes(e.groupName)){// 进行初步判重
obj.groupName.push(...e.groupName)// 把多组处理出来，无需判重
obj.TeamRanks.push(...e.TeamRanks)// 再把组排名取出来
}
// console.log(obj,'处理完的obj')
// 无需处理其他类型数据
disposeMap.set(e.jobNumber,obj)// 进行覆盖
}else{
// e.groupName = [...e.groupName]// 区别于公司人员处理，把组提取出来
// e.TeamRanks =
disposeMap.set(e.jobNumber,e)// 根据工号进行标识储存
}
})
// 最后取得一个已处理完毕的数组
// console.log(disposeMap,'处理完毕的map对象')
for(let [key,value] of disposeMap){
overArr.push(value)// 取得对应数组，只需要赋值到公司排名那里即可
}
}
// console.log('取得overArr',overArr)
// 然后再把组和排名拿到公司排名那里进行拼接
data.forEach(e=>{// 数据处理为一条--需要额外取得多组和分组排名，按组排序将无法正常展示
if(arr.has(e.jobNumber)){ if(arr.has(e.jobNumber)){
let obj = arr.get(e.jobNumber) let obj = arr.get(e.jobNumber)
obj.enterprise.push({enterprise:e.enterprise,id:e.id}) obj.enterprise.push({enterprise:e.enterprise,id:e.id})
@ -421,12 +537,12 @@ export default {
// console.log(e.totalAmount,`再次处理加入的${e.personLiable}`) // console.log(e.totalAmount,`再次处理加入的${e.personLiable}`)
}else{ }else{
e.enterprise = [{enterprise:e.enterprise,id:e.id}] e.enterprise = [{enterprise:e.enterprise||'-',id:e.id}]
e.totalAmount = (+e.cash||0)+(+e.assets) e.totalAmount = (+e.cash||0)+(+e.assets)
e.cash = [{cash:e.cash,id:e.id}] e.cash = [{cash:e.cash||'-',id:e.id}]
e.assets = [{assets:e.assets,id:e.id}] e.assets = [{assets:e.assets||'-',id:e.id}]
e.collectionTime = [{collectionTime:e.collectionTime,id:e.id}] e.collectionTime = [{collectionTime:e.collectionTime,id:e.id}]
e.description = [{description:e.description,id:e.id}] e.description = [{description:e.description||'-',id:e.id}]
// console.log(e.totalAmount,`首次加入的${e.personLiable}`) // console.log(e.totalAmount,`首次加入的${e.personLiable}`)
arr.set(e.jobNumber,e) arr.set(e.jobNumber,e)
} }
@ -434,21 +550,32 @@ export default {
// 取得初次处理的数据 // 取得初次处理的数据
this.originalData = [] this.originalData = []
for(let [key,value] of arr){ for(let [key,value] of arr){
// 处理百分比展示文字
if(value.totalAmount&&value.proportion){ if(value.totalAmount&&value.proportion){
value.percent = ((value.totalAmount/value.proportion)*100).toFixed(2) value.percent = ((value.totalAmount/value.proportion)*100).toFixed(2)
}else{ }else{
value.percent = '未填写年度指标' value.percent = '未填写年度指标'
} }
// 把组和排名进行赋值,取得组排名和多组的值
overArr.forEach(e=>{
if(e.jobNumber==value.jobNumber){
value.groupName = e.groupName.join(",") // 多组处理的拼接
value.TeamRanks = e.TeamRanks.join(",") // 多组排名的拼接
}
})
this.originalData.push(value) this.originalData.push(value)
} }
console.log(this.originalData,'初始处理的数据') // console.log(this.originalData,'初始处理的数据')
// 初始数据执行两次排名，分别取得组排名和公司排名
this.radioChange('依据小组排名') // this.radioChange('依据小组排名')
this.radioChange('依据公司排名') this.radioChange('依据公司排名')
// 根据单选按钮，进行实际排序展示
if(this.radio==='依据小组排名'){ if(this.radio==='依据小组排名'){
this.radioChange('依据小组排名') // console.log('依据小组排名',collect,'chunazhi')
this.radioChange('依据小组排名',collect)
} }
console.log(this.searchStr.proportionSymbol,'this.searchStr.allAoumntSymbol') // console.log(this.searchStr.proportionSymbol,'this.searchStr.allAoumntSymbol')
switch (this.searchStr.proportionSymbol) { switch (this.searchStr.proportionSymbol) {
case '': case '':
break; break;
@ -495,7 +622,7 @@ export default {
default: default:
break; break;
} }
// 查完成比例 // 查完成比例查询
switch (this.searchStr.allAoumntSymbol) { switch (this.searchStr.allAoumntSymbol) {
case '': case '':
break; break;
@ -527,13 +654,13 @@ export default {
default: default:
break; break;
} }
/* 分页改为无限滚动，暂时保留 */
// 长度大于10，开启滚动记录数组,切割当前数组 // // 长度大于10，开启滚动记录数组,切割当前数组
if (this.statisticsData.length>10) { // if (this.statisticsData.length>10) {
this.recordArr = JSON.parse(JSON.stringify(this.statisticsData)) // this.recordArr = JSON.parse(JSON.stringify(this.statisticsData))
this.recordArr.splice(0,10) // this.recordArr.splice(0,10)
this.statisticsData.splice(10,this.statisticsData.length-1)// 首次切割 // this.statisticsData.splice(10,this.statisticsData.length-1)// 首次切割
} // }
}).catch(err=>{ }).catch(err=>{
this.statisticsLoading = false this.statisticsLoading = false
}) })
@ -548,17 +675,60 @@ export default {
e.disabled = true e.disabled = true
} }
}) })
this.tree = data let allTree = [{
id:'全选group',
name:'全选',
personnel:[...data]
}]
this.tree = allTree
// console.log("取得树数据")
}).catch(err=>{ }).catch(err=>{
this.treeLoading = false this.treeLoading = false
}) })
}, },
// 勾选 // 勾选
checkBox(data, checked, indeterminate){ checkBox(data, checked, indeterminate){
// console.log(checked,'dianjiindeterminate')
this.treeIds = this.$refs.tree.getCheckedKeys() this.treeIds = this.$refs.tree.getCheckedKeys()
// console.log(this.treeIds,'ids')
// if(checked){
// const fn = function(arr,ids,id){
// arr.forEach(el=>{
// if(el.id.includes(',')){
// if(el.id.split(',').pop()==id&&!ids.includes(el.id)){
// ids.push(el.id)
// }
// }
// if(el.personnel&&el.personnel.length>0){
// fn(el.personnel,ids,id)
// }
// })
// }
// this.treeIds.forEach(e=>{
// if(e.includes(",")){
// let id = e.split(",").pop()// 取出勾选的那个值
// fn(this.tree,this.treeIds,id)
// }
// })
// }else{
// let tid = this.treeIds
// this.treeIds.forEach(e=>{
// if(e.includes(',')){
// let id = e.split(",").pop()
// this.treeIds.forEach(el=>{
// if(el.includes(id)){
// tid.splice(tid.indexOf(el),1)
// }
// })
// }
// })
// console.log(this.treeIds,'ids')
// }
}, },
async createList(val) {// 唤起清收组弹窗 async createList(val) {// 唤起清收组弹窗
console.log(val,'val') // console.log(val,'val')
this.showRank = true; this.showRank = true;
if(val==='new'){// 新增人员 if(val==='new'){// 新增人员
this.treeIds = [] this.treeIds = []
@ -574,14 +744,21 @@ export default {
if (this.treeStatus === 'new') { if (this.treeStatus === 'new') {
// 新建生成统计表 // 新建生成统计表
if(!this.chooisYear)return this.$message.error('请先选择年份！') if(!this.chooisYear)return this.$message.error('请先选择年份！')
let arr = [] // let arr = []
this.treeIds.forEach((e,index)=>{ // this.treeIds.forEach((e,index)=>{
if(typeof(e)=='number'){ // if(e.includes(',')){
arr.push(e) // arr.push(e.split(",").pop())
// }
// })
if(this.treeIds.length===0) return this.$message.warning('请先选择人员后再生成列表！')
console.log(this.treeIds,'treeIds')
this.treeIds.forEach((e)=>{
if(e=="全选group"){
this.treeIds.splice(this.treeIds.indexOf(e),1)
return
} }
}) })
if(arr.length===0) return this.$message.warning('请先选择人员后再生成列表！') generateAnnualStatistics({personLiableIds:this.treeIds,year:this.chooisYear,flag:1}).then(res=>{
generateAnnualStatistics({personLiableIds:arr,year:this.chooisYear,flag:1}).then(res=>{
this.showRank = false this.showRank = false
this.$message.success('操作成功！') this.$message.success('操作成功！')
this.annualList() this.annualList()
@ -589,18 +766,26 @@ export default {
}) })
}else{// 编辑 }else{// 编辑
let arr = [] // let arr = []]
this.treeIds.forEach((e)=>{
if(e=="全选group"){
this.treeIds.splice(this.treeIds.indexOf(e),1)
return
}
})
console.log(this.ids,'ids的值',this.treeIds)
this.ids.forEach(e=>{// 避免重复生成 this.ids.forEach(e=>{// 避免重复生成
if(this.treeIds.includes(+e)){ if(this.treeIds.includes(e+"")){
this.treeIds.splice(this.treeIds.indexOf(+e),1) this.treeIds.splice(this.treeIds.indexOf(e+""),1)
} }
}) })
this.treeIds.forEach((e,index)=>{ this.treeIds.forEach((e)=>{
if(typeof(e)=='number'){ if(e=="全选group"){
arr.push(e) this.treeIds.splice(this.treeIds.indexOf(e,1))
return
} }
}) })
generateAnnualStatistics({personLiableIds:arr,year:this.chooisYear}).then(res=>{ generateAnnualStatistics({personLiableIds:this.treeIds,year:this.chooisYear}).then(res=>{
this.showRank = false this.showRank = false
this.$message.success('操作成功！') this.$message.success('操作成功！')
this.annualList() this.annualList()
@ -613,7 +798,7 @@ export default {
currentChange(val) { currentChange(val) {
// 列表变更 // 列表变更
}, },
radioChange(val) {// 排名 radioChange(val,groups) {// 排名
function compare(key){ function compare(key){
return function(value1,value2){ return function(value1,value2){
let val1=value1[key]; let val1=value1[key];
@ -622,46 +807,111 @@ export default {
} }
} }
if(val==='依据小组排名'){ if(val==='依据小组排名'){
let groupMap = new Map() let groupMap = new Map()// 进行组的总金额排名对象
this.originalData.forEach(e=>{ let sortGroups = []// 排序组的顺序
if(groupMap.has(e.groupName)){ // console.log('开始执行依据小组排名',groups,'groups')
let obj = groupMap.get(e.groupName) if(!groups){// 执行列表接口逻辑，从列表走
obj.totalAmount += e.totalAmount this.annualStatisticsList()
groupMap.set(e.groupName,obj)
}else{
let obj = {groupName:e.groupName,totalAmount:e.totalAmount}
groupMap.set(e.groupName,obj)
}
})
let group = []
for(let [key,value] of groupMap){
group.push(value)
} }
group.sort(compare('totalAmount')) if(groups){// 传来的后端处理的组排名
let newGroup = [] for (let key in groups) {
group.forEach(e=>{ let group = JSON.parse(JSON.stringify(groups[key]))// 取得每个数组的数据
let arr = [] if(group.length===0) return
this.originalData.forEach(el=>{ // 只需要把数组进行排序，再把组内进行排序进行展示即可，无需进行人员合并
if(e.groupName===el.groupName){ // 进行组的金额叠加
arr.push(el) let sum = group.reduce((pre,item)=>{
return pre + (item.cash||0) + (item.assets||0)
},0)
console.log(sum,'叠加的组数据')
let obj = {
sum:sum,
id:group[0].groupId
} }
console.log(group,'组group的数据')
groupMap.set(group[0].groupId,obj)// 存累加的组的数据，和组的id做为标识
console.log(groupMap,'排序的组')
}
let sortGroup = []// 组排名的数组
for (let [key,value] of groupMap) {
sortGroup.push(value)
}
console.log(sortGroup,'取得排序过的数组数据')
sortGroup.sort(compare('sum'))// 把组进行排名
// 以上的组排名根据多次检测，已无问题
// 然后根据排名的组，进行一次排序分离，push进数组中
sortGroup.forEach(e=>{
sortGroups.push(groups[e.id])// 组排序人员塞进新数组
}) })
newGroup.push(arr)
}) console.log(sortGroups,'处理好的排序组')
newGroup.forEach(e=>{ let lastData = []// 最后处理出来的数组
e.sort(compare('totalAmount'))
}) // 再把组内进行人员合并，且进行排序
let groupDown = [] sortGroups.forEach(e=>{
newGroup.forEach((e)=>{ let manMap = new Map()
e.forEach((e,index)=>{ e.forEach(e=>{
e.TeamRanks = index+1 if(manMap.has(e.jobNumber)){// 合并相同的人员数据
e.editStr = '编辑' let obj = manMap.get(e.jobNumber)
e.edit = false obj.enterprise.push({enterprise:e.enterprise,id:e.id})
groupDown.push(e) obj.totalAmount += ((+e.cash||0)+(+e.assets))
obj.cash.push({cash:e.cash,id:e.id})
obj.assets.push({assets:e.assets,id:e.id})
obj.collectionTime.push({collectionTime:e.collectionTime,id:e.id})
obj.description.push({description:e.description,id:e.id})
manMap.set(e.jobNumber,obj)
}else{// 处理首次的人员
e.enterprise = [{enterprise:e.enterprise||'-',id:e.id}]
e.totalAmount = (+e.cash||0)+(+e.assets)
e.cash = [{cash:e.cash||'-',id:e.id}]
e.assets = [{assets:e.assets||'-',id:e.id}]
e.collectionTime = [{collectionTime:e.collectionTime,id:e.id}]
e.description = [{description:e.description||'-',id:e.id}]
// console.log(e.totalAmount,`首次加入的${e.personLiable}`)
manMap.set(e.jobNumber,e)
}
// 处理完毕，取出处理好的组的数组，解构，取得初步处理完的数据
})
let handelArr = []
for(let [key,val] of manMap){
handelArr.push(val)
}
handelArr.sort(compare('totalAmount'))
console.log(handelArr,'handlarr')
// 排序完，进行一次赋值操作，把公司排名和组排名搞上去
handelArr.forEach((e,i)=>{
e.TeamRanks = i+1
this.originalData.some(el=>{
if(e.jobNumber===el.jobNumber){
e.companyRanks = el.companyRanks
// e.groupName =
}
})
if(e.totalAmount&&e.proportion){
e.percent = ((e.totalAmount/e.proportion)*100).toFixed(2)
}else{
e.percent = '未填写年度指标'
}
})
// 最后处理完成的值
lastData.push(...handelArr)
// for(let [key,val] of manMap){
// lastData.push(val)
// }
}) })
})
this.statisticsData = JSON.parse(JSON.stringify(groupDown)) // console.log(lastData,'处理完的最后的组排名，分人')/
this.statisticsData = JSON.parse(JSON.stringify(lastData))
}
}else if(val==='依据公司排名'){ }else if(val==='依据公司排名'){
// this.annualStatisticsList()
// 取得原始的数组,且进行公司排名 // 取得原始的数组,且进行公司排名
this.originalData.sort(compare('totalAmount')) this.originalData.sort(compare('totalAmount'))
this.originalData.forEach((e,i)=>{ this.originalData.forEach((e,i)=>{
@ -689,7 +939,9 @@ export default {
statisticsSelection() { statisticsSelection() {
// console.log('发',this.searchStr.year) // console.log('发',this.searchStr.year)
// console.log(this.searchStr.year+`年度清收工作完成进度表`) // console.log(this.searchStr.year+`年度清收工作完成进度表`)
core.exportFile(annualStatisticsListExport(this.searchStr.year),this.searchStr.year+"年度清收工作完成进度表") let num
this.radio == "依据公司排名"?num=1:num=0
core.exportFile(annualStatisticsListExport(this.searchStr.year)+`&flag=${num}`,this.searchStr.year+"年度清收工作完成进度表")
}, },
edit(row, val) { edit(row, val) {
// 编辑 // 编辑
@ -700,7 +952,7 @@ export default {
this.$store.commit('liquidate','2') this.$store.commit('liquidate','2')
// 判断进入查看 // 判断进入查看
this.$store.commit('liquidWatch',val) this.$store.commit('liquidWatch',val)
console.log(val,this.liquidWatch,'liquidWatch') // console.log(val,this.liquidWatch,'liquidWatch')
// this.annualStatisticsList() // this.annualStatisticsList()
}, },
yearEdit(row, val){// 编辑功能 yearEdit(row, val){// 编辑功能
@ -731,12 +983,23 @@ export default {
}, },
personnelSelection(val){// 人员选择 personnelSelection(val){// 人员选择
return personnelSelection({year:val}).then(res=>{ return personnelSelection({year:val}).then(res=>{
console.log(res.data.list,'list') this.treeIds = res.data.list
this.treeIds = res.data.list.map(e=>{ // const disabled = function(arr,ids){
return e.split(",").pop() // arr.forEach(e=>{
// if(ids.includes(e.id)){
// e.disabled = true
// }
// })
// }
// disabled(this.tree,this.treeIds)
console.log(this.treeIds,'ids的值')
this.tree[0].personnel.forEach(e=>{
if(this.treeIds.includes(+e.id)){
e.disabled = true
}
}) })
this.$forceUpdate();
console.log(this.treeIds,'treeids') // console.log('treeIds',this.treeIds)
this.ids = res.data.list this.ids = res.data.list
}) })
}, },
@ -748,29 +1011,34 @@ export default {
}) })
}) })
}, },
allCheck(val){ // allCheck(val){
console.log(this.tree,'tree') // console.log(this.tree,'tree')
if(this.tree.length==0) return // if(this.tree.length==0) return
let that = this // let that = this
function recursion(arr){ // function recursion(arr){
if(arr&&arr.length>0){ // if(arr&&arr.length>0){
arr.forEach(e=>{ // arr.forEach(e=>{
that.treeIds.push(e.id) // that.treeIds.push(e.id)
if(e.personnel&&e.personnel.length>0){ // if(e.personnel&&e.personnel.length>0){
recursion(e.personnel) // recursion(e.personnel)
} // }
}) // })
} // }
} // }
if(val){ // if(val){
recursion(this.tree) // recursion(this.tree)
// this.ids = this.treeIds // // this.ids = this.treeIds
}else{ // }else{
this.treeIds = [] // this.treeIds = []
// }
// this.$refs.tree.setCheckedKeys([this.treeIds]);
// // console.log(this.treeIds,'ids')
// // this.$forceUpdate();
// },
allAoumntSymbolChange(val){
if(!val){
this.searchStr.allAoumnt = ''
} }
this.$refs.tree.setCheckedKeys([this.treeIds]);
// console.log(this.treeIds,'ids')
// this.$forceUpdate();
} }
} }
}; };
@ -845,4 +1113,5 @@ export default {
color:#606266; color:#606266;
background: transparent; background: transparent;
} }
</style> </style>

39
src/components/page/afterLoan/progress.vue
Unescape View File

@ -17,12 +17,13 @@
<el-option v-for="(item,index) in bankData" :key="item.index" :label="item.value" :value="item.value"></el-option> <el-option v-for="(item,index) in bankData" :key="item.index" :label="item.value" :value="item.value"></el-option>
</el-select> </el-select>
<p class="fz-16 mgr10 font-blue mgl20 nowrap">代偿金额</p> <p class="fz-16 mgr10 font-blue mgl20 nowrap">代偿金额</p>
<el-select style="width:200px" v-model="searchStr.amountSymbol" placeholder="请选择" clearable @change="search"> <el-select style="width:200px" v-model="searchStr.amountSymbol" placeholder="请选择" clearable @change="changeAmountSymbol">
<el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option> <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
</el-select> </el-select>
<el-input <el-input
:disabled="!searchStr.amountSymbol" :disabled="!searchStr.amountSymbol"
placeholder="请输入金额（万）" placeholder="请输入金额（元）"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
class="wd20 mglr10" class="wd20 mglr10"
style="width: 200px" style="width: 200px"
v-model="searchStr.compensationAmount" v-model="searchStr.compensationAmount"
@ -32,13 +33,14 @@
<div class="flex-between mgtb20"> <div class="flex-between mgtb20">
<div class="flex-center"> <div class="flex-center">
<p style="margin-right:15px" class="fz-16 font-blue mgl20 nowrap">代偿余额</p> <p style="margin-right:15px" class="fz-16 font-blue mgl20 nowrap">代偿余额</p>
<el-select style="width:200px;margin-right:15px" v-model="searchStr.balanceSymbol" placeholder="请选择" clearable @change="search"> <el-select style="width:200px;margin-right:15px" @change="changeBalanceSymbol" v-model="searchStr.balanceSymbol" placeholder="请选择" clearable>
<el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option> <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
</el-select> </el-select>
<el-input <el-input
:disabled="!searchStr.balanceSymbol" :disabled="!searchStr.balanceSymbol"
placeholder="请输入金额（万）" placeholder="请输入金额（元）"
class="mglr10" class="mglr10"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
style="width:200px" style="width:200px"
v-model="searchStr.compensatoryBalance" v-model="searchStr.compensatoryBalance"
clearable clearable
@ -83,8 +85,8 @@
v-model="searchStr.queryCondition" v-model="searchStr.queryCondition"
placeholder="企业名称/清收负责人/业务编号" placeholder="企业名称/清收负责人/业务编号"
clearable clearable
></el-input> ><i slot="suffix" class="el-input__icon el-icon-search" @click="quryCollectionProgress" ></i></el-input>
<el-button v-preventReClick type="primary" round @click="quryCollectionProgress">搜索</el-button> <!-- <el-button v-preventReClick type="primary" round @click="quryCollectionProgress">搜索</el-button> -->
</div> </div>
</div> </div>
@ -115,7 +117,15 @@
<el-table-column prop="area" label="所在区域" align="center" min-width="100px"></el-table-column> <el-table-column prop="area" label="所在区域" align="center" min-width="100px"></el-table-column>
<el-table-column prop="repaymentMethod" label="清偿方式" align="center" min-width="100px"></el-table-column> <el-table-column prop="repaymentMethod" label="清偿方式" align="center" min-width="100px"></el-table-column>
<el-table-column prop="personLiable" label="清收负责人" align="center" min-width="100px"></el-table-column> <el-table-column prop="personLiable" label="清收负责人" align="center" min-width="100px"></el-table-column>
<el-table-column prop="repaymentNotes" label="备注" align="center" min-width="100px"></el-table-column> <el-table-column label="备注" align="center" min-width="100px">
<template slot-scope="scope">
<el-tooltip v-if="scope.row.repaymentNotes&&scope.row.repaymentNotes!='-'&&scope.row.repaymentNotes!=' '" style="max-width:300px" class="item" effect="dark" :content="scope.row.repaymentNotes" placement="top">
<div style="max-height:45px;over-flow:auto;">
{{scope.row.repaymentNotes}}
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
@ -248,6 +258,18 @@ export default{
getRowKey(row){ getRowKey(row){
return row.id; return row.id;
}, },
changeAmountSymbol(val){// 处理代偿金额不限，后面的值
if(val==''){
this.$set(this.searchStr, 'compensationAmount', '')
}
},
changeBalanceSymbol(val){// 处理代偿余额不限，后面的值
console.log(val,'zhi')
if(val==''||!val){
this.$set(this.searchStr, 'compensatoryBalance', '')
}
},
}, },
} }
@ -256,4 +278,7 @@ export default{
/deep/ .el-date-editor .el-range-separator{ /deep/ .el-date-editor .el-range-separator{
min-width: 30px; min-width: 30px;
} }
/deep/ .el-tooltip__popper{
max-width: 600px;
}
</style> </style>

4
src/store/modules/guarantee.js
Unescape View File

@ -25,6 +25,7 @@ const state = {
isFgJl: '', isFgJl: '',
fileList: [], fileList: [],
imgListT: [], imgListT: [],
businessId:'',// 新的
// //参数保存-贷审会 // //参数保存-贷审会
// loansDepartment:{ // loansDepartment:{
@ -58,6 +59,9 @@ const getters = {
} }
const mutations = { const mutations = {
businessId(s,v){
s.businessId = v
},
loansData (state, payload) { loansData (state, payload) {
state.loans = payload.loans state.loans = payload.loans
}, },

13
src/store/modules/loan.js
Unescape View File

@ -31,6 +31,8 @@ const state = {
liquidateSearch:{}, liquidateSearch:{},
liquidWatch:false,// 清收统计是否进入查看界面 liquidWatch:false,// 清收统计是否进入查看界面
source:'',// 判断是否为系统流转，且需要判断是否已编辑 source:'',// 判断是否为系统流转，且需要判断是否已编辑
fromOne:false,// 来自第一页的还款录入
records:false,// 催收记录进入详情
} }
const getters = { const getters = {
@ -38,6 +40,10 @@ const getters = {
} }
const mutations = { const mutations = {
records(s,v){
s.records = v
},
leftSidebarData (state, payload) { leftSidebarData (state, payload) {
state.leftStatus = payload.leftStatus state.leftStatus = payload.leftStatus
}, },
@ -54,6 +60,9 @@ const mutations = {
state.hisidId = payload.hisidId, state.hisidId = payload.hisidId,
state.guaranteeAmount = payload.guaranteeAmount state.guaranteeAmount = payload.guaranteeAmount
}, },
hisId(s,val){
s.hisidId = val
},
hispaymentStatusData (state, payload) { hispaymentStatusData (state, payload) {
state.hispaymentStatus = payload.hispaymentStatus state.hispaymentStatus = payload.hispaymentStatus
}, },
@ -110,7 +119,9 @@ const mutations = {
source(s,val){ source(s,val){
s.source = val s.source = val
}, },
fromOne(s,val){
s.fromOne = val
}
} }
const actions = { const actions = {

4
src/utils/api.js
Unescape View File

@ -105,7 +105,11 @@ export const annualStatisticsList = p => post('/api-guarantee/al-collection-stat
export const collection = p => post('/api-guarantee/al-collection/collection', p); export const collection = p => post('/api-guarantee/al-collection/collection', p);
export const collectionList = p => get('/api-guarantee/al-collection/list', p); export const collectionList = p => get('/api-guarantee/al-collection/list', p);
export const collectionListDetail = p => get('/api-guarantee/al-collection/overdue/detail', p); export const collectionListDetail = p => get('/api-guarantee/al-collection/overdue/detail', p);
export const modifyReimbursement = p => get('/api-guarantee/al-reimbursement/modifyReimbursement', p);// 查清收组人员
export const collectionHisList = p => post('/api-guarantee/al-collection/collection/list', p); export const collectionHisList = p => post('/api-guarantee/al-collection/collection/list', p);
export const updateCollection = p => post('/api-guarantee/al-collection/updateCollection', p);// 编辑催收记录
export const delCollection = p => post('/api-guarantee/al-collection/delCollection?id='+p);// 删除催收记录
export const collectionHisListDetail = p => get('/api-guarantee/al-collection/examine/detail', p); export const collectionHisListDetail = p => get('/api-guarantee/al-collection/examine/detail', p);
export const excelInsurance = `${host}/api-guarantee/al-insurance-list/excelExport`; export const excelInsurance = `${host}/api-guarantee/al-insurance-list/excelExport`;
export const excelHis = `${host}/api-guarantee/al-repayment-entry/excelExport`; export const excelHis = `${host}/api-guarantee/al-repayment-entry/excelExport`;

81
src/utils/core.js
Unescape View File

@ -42,11 +42,12 @@ export default {
// 数字转换大写中文 // 数字转换大写中文
fMoney3:function (money) { fMoney3:function (money) {
if(!money) return ''
//汉字的数字 //汉字的数字
let cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'); let cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
let cnIntRadice = new Array('', '拾', '佰', '仟'); //基本单位 let cnIntRadice = new Array('', '拾', '佰', '仟'); //基本单位
let cnIntUnits = new Array('', '万', '亿', '兆'); //对应整数部分扩展单位 let cnIntUnits = new Array('', '万', '亿', '兆'); //对应整数部分扩展单位
let cnDecUnits = new Array('仟', '佰', '拾', ''); //对应小数部分单位 let cnDecUnits = new Array('仟', '佰', '拾', '元', '角' , '分'); //对应小数部分单位
let cnInteger = '元整'; //整数金额时后面跟的字符 let cnInteger = '元整'; //整数金额时后面跟的字符
let cnIntLast = '万'; //整数无小数点的单位 let cnIntLast = '万'; //整数无小数点的单位
let int; //金额整数部分 let int; //金额整数部分
@ -64,7 +65,8 @@ export default {
} else { } else {
parts = money.split('.'); //整数小数分离 parts = money.split('.'); //整数小数分离
int = parts[0]; int = parts[0];
dot = parts[1].substr(0, 4); //最多四位小数 // dot = parts[1].substr(0, 4); //最多四位小数
dot = parts[1].substr(0, 6); //最多六位小数，计算到 角，分
} }
//十进制转换，处理整数部分单位 //十进制转换，处理整数部分单位
if (parseInt(int, 10) > 0) { if (parseInt(int, 10) > 0) {
@ -110,6 +112,81 @@ export default {
// } // }
return chineseStr; return chineseStr;
}, },
// 保后专用
fMoney4:function (money) {
if(!money) return ''
//汉字的数字
let cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
let cnIntRadice = new Array('', '拾', '佰', '仟'); //基本单位
let cnIntUnits = new Array('', '万', '亿', '兆'); //对应整数部分扩展单位
let cnDecUnits = new Array('仟', '佰', '拾', '元', '角' , '分'); //对应小数部分单位
let cnInteger = '元'; //整数金额时后面跟的字符
let cnIntLast = '万'; //整数无小数点的单位
let int; //金额整数部分
let dot; //金额小数部分
let chineseStr = ''; //输出的中文金额字符串
let parts; //分离金额后用的数组，预定义
if (money == '') {
return '';
}
//转换为字符串，获取小数点后的值与整数分离
money = money.toString();
if (money.indexOf('.') == -1) {// 取得小树点后面的值
int = money;
dot = '';
} else {
parts = money.split('.'); //整数小数分离
int = parts[0];
// dot = parts[1].substr(0, 4); //最多四位小数
dot = parts[1].substr(0, 6); //最多六位小数，计算到 角，分
}
//十进制转换，处理整数部分单位
if (parseInt(int, 10) > 0) {
let zeroCount = 0;
let IntLen = int.length;
for (let i = 0; i < IntLen; i++) {
//循环整数部分，给每个位赋值，且判断是否整除4，添加额外赋值
let n = int.substr(i, 1);
let p = IntLen - i - 1; // 长度 -i -1 取得
let q = p / 4;
let m = p % 4;
console.log(q,m,"q,m")
if (n == '0') {
zeroCount++;
} else {
if (zeroCount > 0) {
chineseStr += cnNums[0];
}
//归零
zeroCount = 0;
chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
}
//
if (m == 0 && zeroCount < 4) {
chineseStr += cnIntUnits[q];
}
}
chineseStr += cnIntLast;
}
//小数部分
if (dot != '') {
let decLen = dot.length;
for (let i = 0; i < decLen; i++) {
let n = dot.substr(i, 1);
if (n != '0') {
chineseStr += cnNums[Number(n)] + cnDecUnits[i];
}
}
}
// if (chineseStr == '') {// 为0时，
// chineseStr += cnNums[0] + cnIntLast + cnInteger;
// }
// else if (dot == '') {//小数点为空值时
chineseStr += cnInteger; // 加上元
// }
return chineseStr;
},
orderreleaseType:function (sts) { orderreleaseType:function (sts) {
const status = { const status = {

4
src/utils/http.js
Unescape View File

@ -5,8 +5,8 @@ import { Message } from 'element-ui'
import router from '../router/index' import router from '../router/index'
// 服务器的切换 // 服务器的切换
export const Url = 'https://test.feifanhitech.com'// 测试服务器地址 // export const Url = 'https://test.feifanhitech.com'// 测试服务器地址
// export const Url = 'https://www.feifanhitech.com';// 非凡(正式服) export const Url = 'https://www.feifanhitech.com';// 非凡(正式服)
// export const Url = 'http://192.168.31.137:8080';//陈赓 // export const Url = 'http://192.168.31.137:8080';//陈赓
axios.defaults.baseURL = Url; axios.defaults.baseURL = Url;
const baseurl = Url const baseurl = Url

Write Preview
Loading…
Cancel
Save