| 
					
				 | 
			
			
				@@ -311,11 +311,11 @@ module.exports = app => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const bills = await this.ctx.service.ledger.getAllDataByCondition({ where: { tender_id: stage.tid, is_leaf: true } }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const extraData = await this.ctx.service.ledgerExtra.getData(stage.tid, ['id', 'is_tp']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const settleStatusBills = stage.readySettle ? await this.ctx.service.settleBills.getAllDataByCondition({ where: { settle_id: stage.readySettle.id }}) : []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            const preStageBills = stage.preCheckedStage ? await this.ctx.service.stageBillsFinal.getFinalData(stage.tid, this.ctx.stage.preCheckedStage.order) : []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            const preStageBills = stage.preCheckedStage ? await this.ctx.service.stageBillsFinal.getFinalData(this.ctx.tender, this.ctx.stage.preCheckedStage.order) : []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.ctx.helper.assignRelaData(bills, [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { data: extraData, fields: ['is_tp'], prefix: '', relaId: 'id' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { data: settleStatusBills, fields: ['settle_status'], prefix: '', relaId: 'lid' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                { data: preStageBills, field: ['contract_qty', 'contract_tp', 'qc_minus_qty'], prefix: 'pre_', relaId: 'lid'}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { data: preStageBills, fields: ['contract_qty', 'contract_tp', 'qc_minus_qty'], prefix: 'pre_', relaId: 'lid'}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const pos = await this.ctx.service.pos.getAllDataByCondition({ where: { tid: stage.tid } }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const settleStatusPos = stage.readySettle ? await this.ctx.service.settlePos.getAllDataByCondition({ where: { settle_id: stage.readySettle.id }}) : []; 
			 |