| 
					
				 | 
			
			
				@@ -314,13 +314,16 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        materialSheetReset: function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let newMaterialBillsData = materialBillsData; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            console.log(materialBillsData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        materialSheetReset: function (redo = false) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let newMaterialBillsData = _.cloneDeep(materialBillsData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if($('#bills0_list').is(':checked')) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 newMaterialBillsData = _.filter(materialBillsData, function (item) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     return item.quantity !== null && item.quantity !== 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (redo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    SpreadJsObj.initSpreadSettingEvents(materialSpreadSetting, materialCol); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             console.log(newMaterialBillsData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialBillsData); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1164,7 +1167,7 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         showWaitingView(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         setTimeout(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             materialSpreadObj.getMaterialBillsData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            materialSpreadObj.materialSheetReset(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            materialSpreadObj.materialSheetReset(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 消耗量表格更新 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let html = ''; 
			 |