| 
					
				 | 
			
			
				@@ -373,13 +373,13 @@ var dbController = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (node) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             updateId = node.getID(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             field = billsLibSetting.cols[args.col].data.field; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (field === 'engineering') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            /* if (field === 'engineering') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (isNaN(args.editingText) || args.editingText % 1 !== 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     alert('工程专业只能输入整数!'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } else if (field === 'unitPrice') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } else  */if (field === 'unitPrice') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (isNaN(args.editingText)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     alert('单价只能输入数值!'); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1144,9 +1144,9 @@ var tools = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     unit = sheet.getValue(i, 3), ruleText = sheet.getValue(i, 4), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     engineerContent = sheet.getValue(i, 5), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     unitPrice = sheet.getValue(i, 6), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    engineering = sheet.getValue(i, 7), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    fixedFlag = sheet.getValue(i, 8); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineerContent, unitPrice, engineering: engineering, fixedFlag: fixedFlag, rowIdx: i }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    // engineering = sheet.getValue(i, 7), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    fixedFlag = sheet.getValue(i, 7); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineerContent, unitPrice, /* engineering: engineering, */ fixedFlag: fixedFlag, rowIdx: i }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 sheetDatas.datas.push(data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 sheetDatas.datasIdx['rowIdx' + i] = data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |