|
@@ -298,23 +298,33 @@ export default {
|
|
|
const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
|
|
|
console.log(auditInfo)
|
|
|
bookSns.map(item => {
|
|
|
- // 授信明细
|
|
|
+ // 授信明细,还款明细
|
|
|
const rs = rows.filter(a => a.bookSn == item)
|
|
|
let detailItemUseStr = ''
|
|
|
+ let detailPayUseStr = ''
|
|
|
rs.map(b => {
|
|
|
if (b.detailItemUseList) {
|
|
|
- b.detailItemUseList.map((k, i) => {
|
|
|
- detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ')' + (i == b.detailItemUseList.length - 1 ? '。' : ';')
|
|
|
- })
|
|
|
+ detailItemUseStr = this.getUseDetailInfo(b.detailItemUseList)
|
|
|
+ }
|
|
|
+ if(b.detailItemPayList){
|
|
|
+ detailPayUseStr = this.getUseDetailInfo(b.detailItemPayList)
|
|
|
}
|
|
|
})
|
|
|
// 审核信息
|
|
|
const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : ''
|
|
|
- retArr.push({ audit: auditStr, detail: detailItemUseStr, subList: rs })
|
|
|
+ retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail:detailPayUseStr, subList: rs })
|
|
|
})
|
|
|
console.log(retArr, '------------')
|
|
|
this.handlePrint(retArr, 1, rows, bookSns)
|
|
|
},
|
|
|
+ // 获取授信西悉尼
|
|
|
+ getUseDetailInfo(list){
|
|
|
+ let ret = ''
|
|
|
+ list.map((k, i) => {
|
|
|
+ ret = ret + k.itemName + '(' + k.itemAmount + ')' + (i == list.length - 1 ? '。' : ';')
|
|
|
+ })
|
|
|
+ return ret
|
|
|
+ },
|
|
|
// 获取审核信息
|
|
|
getAuditInfo (auditList) {
|
|
|
let auditStr = ''
|
|
@@ -353,16 +363,18 @@ export default {
|
|
|
this.spinning = true
|
|
|
this.showTipModal = true
|
|
|
let detailItemUseStr = ''
|
|
|
-
|
|
|
+ let detailPayUseStr = ''
|
|
|
this.$nextTick(() => {
|
|
|
+ // type == 0 单个打印时
|
|
|
if (type == 0 && row.detailItemUseList) {
|
|
|
- row.detailItemUseList.map(k => {
|
|
|
- detailItemUseStr = detailItemUseStr + k.itemName + '(' + k.itemAmount + ');'
|
|
|
- })
|
|
|
+ detailItemUseStr = this.getUseDetailInfo(row.detailItemUseList)
|
|
|
+ }
|
|
|
+ if (type == 0 && row.detailItemPayList) {
|
|
|
+ detailPayUseStr = this.getUseDetailInfo(row.detailItemPayList)
|
|
|
}
|
|
|
// 审核信息
|
|
|
const auditStr = auditInfo ? this.getAuditInfo(auditInfo[list.bookSn]) : ''
|
|
|
- this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, subList: [row] }], type ? list : [list])
|
|
|
+ this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: [row] }], type ? list : [list])
|
|
|
})
|
|
|
},
|
|
|
printOk (res) {
|