Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
		
						commit
						f36bf41692
					
				|  | @ -185,12 +185,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl | |||
|                 return; | ||||
|             } | ||||
|             //合格的情况下不允许修改 | ||||
|             var model = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.InspectionId == Grid1.SelectedRowID); | ||||
|             if (model.IsOnceQualified == true) | ||||
|             { | ||||
|                 Alert.ShowInTop("该共检通知单已合格,不允许修改!", MessageBoxIcon.Warning); | ||||
|                 return; | ||||
|             } | ||||
|             //var model = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.InspectionId == Grid1.SelectedRowID); | ||||
|             //if (model.IsOnceQualified == true) | ||||
|             //{ | ||||
|             //    Alert.ShowInTop("该共检通知单已合格,不允许修改!", MessageBoxIcon.Warning); | ||||
|             //    return; | ||||
|             //} | ||||
| 
 | ||||
|             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionNoticeEdit.aspx?InspectionId={0}", Grid1.SelectedRowID, "编辑 - "))); | ||||
|         } | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <PropertyGroup> | ||||
|     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> | ||||
|     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> | ||||
|     <UseIISExpress>true</UseIISExpress> | ||||
|     <Use64BitIISExpress /> | ||||
|     <IISExpressSSLPort /> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue