|  | @@ -345,6 +345,8 @@ $(document).ready(() => {
 | 
	
		
			
				|  |  |              headerFont: 'bold 10px 微软雅黑',
 | 
	
		
			
				|  |  |              font: '10px 微软雅黑'
 | 
	
		
			
				|  |  |          };
 | 
	
		
			
				|  |  | +        if (gxby) setting.cols.push({title: '工序报验', colSpan: '1', rowSpan: '2', field: 'gxby', hAlign: 1, width: 80, formatter: '@'});
 | 
	
		
			
				|  |  | +        if (dagl) setting.cols.push({title: '档案管理', colSpan: '1', rowSpan: '2', field: 'dagl', hAlign: 1, width: 80, formatter: '@'});
 | 
	
		
			
				|  |  |          if (!xmjSheet.zh_tree) return;
 | 
	
		
			
				|  |  |          for (const node of xmjSheet.zh_tree.nodes) {
 | 
	
		
			
				|  |  |              data.push({
 | 
	
	
		
			
				|  | @@ -353,7 +355,7 @@ $(document).ready(() => {
 | 
	
		
			
				|  |  |                  contract_tp: node.contract_tp, qc_tp: node.qc_tp, gather_tp: node.gather_tp,
 | 
	
		
			
				|  |  |                  end_contract_tp: node.end_contract_tp, end_qc_tp: node.end_qc_tp, end_gather_tp: node.end_gather_tp,
 | 
	
		
			
				|  |  |                  end_gather_percent: node.end_gather_percent,
 | 
	
		
			
				|  |  | -                drawing_code: node.drawing_code, postil: node.postil, memo: node.memo
 | 
	
		
			
				|  |  | +                drawing_code: node.drawing_code, postil: node.postil, memo: node.memo, gxby: getGxbyText(node), dagl: getDaglText(node),
 | 
	
		
			
				|  |  |              });
 | 
	
		
			
				|  |  |              if (node.unitTree) {
 | 
	
		
			
				|  |  |                  for (const unitNode of node.unitTree.nodes) {
 | 
	
	
		
			
				|  | @@ -368,7 +370,8 @@ $(document).ready(() => {
 | 
	
		
			
				|  |  |                          end_qc_qty: unitNode.end_qc_qty, end_qc_tp: unitNode.end_qc_tp,
 | 
	
		
			
				|  |  |                          end_gather_qty: unitNode.end_gather_qty, end_gather_tp: unitNode.end_gather_tp,
 | 
	
		
			
				|  |  |                          end_gather_percent: unitNode.end_gather_percent,
 | 
	
		
			
				|  |  | -                        drawing_code: unitNode.drawing_code_merge, postil: unitNode.postil_merge, memo: unitNode.memo_merge
 | 
	
		
			
				|  |  | +                        drawing_code: unitNode.drawing_code_merge, postil: unitNode.postil_merge, memo: unitNode.memo_merge,
 | 
	
		
			
				|  |  | +                        gxby: getGxbyText(unitNode), dagl: getDaglText(unitNode),
 | 
	
		
			
				|  |  |                      });
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  |              }
 |