| 
					
				 | 
			
			
				@@ -155,7 +155,8 @@ import recordModal from './recordModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import printModel from './printModel.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import chooseWarehouse from '@/views/common/chooseWarehouse' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import customerService from '@/views/common/customerService' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { financeBookDetailList, updateFinanceBookDetail, checkPrintStatus } from '@/api/financeBook' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { getProcessInstance } from '@/api/expenseManagement' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'ReceiptPrintList', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -305,9 +306,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const retArr = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      console.log(auditInfo) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      bookSns.map(item => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      for (let i = 0; i < bookSns.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const item = bookSns[i] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 授信明细,还款明细 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const rs = rows.filter(a => a.bookSn == item) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let detailItemUseStr = '' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -320,10 +320,11 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             detailPayUseStr += this.getUseDetailInfo(b.detailItemPayList) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const auditInfo = await getProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSn': item }).then(res => (res.data[0] && res.data[0].opinionList) ? res.data[0].opinionList : []) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 审核信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const auditStr = auditInfo ? this.getAuditInfo(auditInfo[item]) : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const auditStr = auditInfo ? this.getAuditInfo(auditInfo) : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         retArr.push({ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: rs }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.handlePrint(retArr, 1, rows, bookSns) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 获取授信西悉尼 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -337,10 +338,10 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 获取审核信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getAuditInfo (auditList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       let auditStr = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if (auditList && auditList.taskVOList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const auditLists = auditList.taskVOList.filter(item => item.userType == '审批人') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if (auditList && auditList.length) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const auditLists = auditList.filter(item => item.processTaskType == '审批人') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         auditLists.map((a, i) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          auditStr = auditStr + a.userName + '(' + a.state + ')' + (i == auditLists.length - 1 ? ';' : ',') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          auditStr = auditStr + a.approvalName + '(' + a.approvalStateDictValue + ')' + (i == auditLists.length - 1 ? ';' : ',') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return auditStr 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -365,10 +366,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        auditInfo = await getProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSn': list.bookSn }).then(res => (res.data[0] && res.data[0].opinionList) ? res.data[0].opinionList : []) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      console.log(auditInfo) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.spinning = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.showTipModal = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       let detailItemUseStr = '' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -382,7 +381,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           detailPayUseStr = this.getUseDetailInfo(row.detailItemPayList) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 审核信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const auditStr = auditInfo ? this.getAuditInfo(auditInfo[list.bookSn]) : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const auditStr = auditInfo ? this.getAuditInfo(auditInfo) : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$refs.printModel.getData(type ? row : [{ audit: auditStr, detail: detailItemUseStr, payDetail: detailPayUseStr, subList: [row] }], type ? list : [list]) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 |