This commit is contained in:
		
						commit
						9db2db1ad1
					
				| 
						 | 
					@ -240,20 +240,18 @@
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        function updateGridRow(rowId, values) {
 | 
					        function updateGridRow(rowId, values) {
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
           // var allCode = "";
 | 
					           var allCode = "";
 | 
				
			||||||
            var grid = F(grid1ClientID);
 | 
					            var grid = F(grid1ClientID);
 | 
				
			||||||
            //var selectedCell = grid.getSelectedCell();
 | 
					            var selectedCell = grid.getSelectedCell();
 | 
				
			||||||
            //var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
 | 
					            var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
 | 
				
			||||||
            //if (values) {
 | 
					            if (values) {
 | 
				
			||||||
            //    allCode = values["WeldJointCode"];
 | 
					                allCode = values["WeldJointCode"];
 | 
				
			||||||
            //    console.log('allCode=' + allCode)
 | 
					            }
 | 
				
			||||||
            //}
 | 
					            if (selStrCode && selStrCode != "全部")
 | 
				
			||||||
            //if (selStrCode && selStrCode != "全部")
 | 
					            {
 | 
				
			||||||
            //{
 | 
					                allCode +=","+selStrCode;
 | 
				
			||||||
            //    allCode +=","+selStrCode;
 | 
					            }
 | 
				
			||||||
            //}
 | 
					            values["WeldJointCode"] = allCode;
 | 
				
			||||||
            ////  allCode = allCode.substring(0, allCode.length - 1);
 | 
					 | 
				
			||||||
            //values["WeldJointCode"] = allCode;
 | 
					 | 
				
			||||||
            // cancelEdit用来取消编辑
 | 
					            // cancelEdit用来取消编辑
 | 
				
			||||||
            grid.cancelEdit();
 | 
					            grid.cancelEdit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,7 +43,7 @@
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
         function onGridRowSelect() {
 | 
					         function onGridRowSelect() {
 | 
				
			||||||
             console.log(1);
 | 
					             
 | 
				
			||||||
            // 返回当前活动Window对象(浏览器窗口对象通过F.getActiveWindow().window获取)
 | 
					            // 返回当前活动Window对象(浏览器窗口对象通过F.getActiveWindow().window获取)
 | 
				
			||||||
            var activeWindow = F.getActiveWindow();
 | 
					            var activeWindow = F.getActiveWindow();
 | 
				
			||||||
            // 选中行数据
 | 
					            // 选中行数据
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -78,7 +78,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
 | 
					            var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
 | 
				
			||||||
             .OrderBy(t => t.WeldJointCode).AsQueryable();
 | 
					             .OrderBy(t => t.WeldJointCode).AsQueryable();
 | 
				
			||||||
            if (listData.Count>0 && string.IsNullOrEmpty(this.ptpId))
 | 
					            if (listData.Count>0)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                query = query.Where(t => !listData.Contains(t.WeldJointCode));
 | 
					                query = query.Where(t => !listData.Contains(t.WeldJointCode));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue