Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
		
						commit
						293cc846d0
					
				|  | @ -0,0 +1,12 @@ | ||||||
|  | 
 | ||||||
|  | alter table Report_ConstructionProblems | ||||||
|  | alter column ProblemDesrioption nvarchar(2000) null; | ||||||
|  | 
 | ||||||
|  | alter table Report_ConstructionProblems | ||||||
|  | alter column TreatmentMeasures nvarchar(2000) null; | ||||||
|  | 
 | ||||||
|  | alter table Report_RowMaterialProblem | ||||||
|  | alter column ProblemDesrioption nvarchar(2000) null; | ||||||
|  | 
 | ||||||
|  | alter table Report_RowMaterialProblem | ||||||
|  | alter column TreatmentMeasures nvarchar(2000) null; | ||||||
|  | @ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|         #region 加载所有单位 |         #region 加载所有单位 | ||||||
|  |         [Serializable] | ||||||
|         public class UnitClass { |         public class UnitClass { | ||||||
|             public string UnitId { get; set; } |             public string UnitId { get; set; } | ||||||
|             public string UnitName { get; set; } |             public string UnitName { get; set; } | ||||||
|  | @ -72,16 +73,40 @@ namespace FineUIPro.Web.CQMS.ManageReportNew | ||||||
|             public string UnitType { get; set; } |             public string UnitType { get; set; } | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public List<UnitClass> units = new List<UnitClass>(); |         //public List<UnitClass> units = new List<UnitClass>(); | ||||||
|  | 
 | ||||||
|  |         public List<UnitClass> units | ||||||
|  |         { | ||||||
|  |             get | ||||||
|  |             { | ||||||
|  |                 return (List<UnitClass>)ViewState["units"]; | ||||||
|  |             } | ||||||
|  |             set | ||||||
|  |             { | ||||||
|  |                 ViewState["units"] = value; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|         #region 加载所有专业 |         #region 加载所有专业 | ||||||
|  |         [Serializable] | ||||||
|         public class ProfessionalsClass { |         public class ProfessionalsClass { | ||||||
|             public string CNProfessionalId { get; set; } |             public string CNProfessionalId { get; set; } | ||||||
|             public string ProfessionalName { get; set; } |             public string ProfessionalName { get; set; } | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>(); |         //public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>(); | ||||||
|  |         public List<ProfessionalsClass> CNProfessionals | ||||||
|  |         { | ||||||
|  |             get | ||||||
|  |             { | ||||||
|  |                 return (List<ProfessionalsClass>)ViewState["CNProfessionals"]; | ||||||
|  |             } | ||||||
|  |             set | ||||||
|  |             { | ||||||
|  |                 ViewState["CNProfessionals"] = value; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|         #region 加载页面 |         #region 加载页面 | ||||||
|  |  | ||||||
|  | @ -19321,7 +19321,7 @@ | ||||||
|       </FlavorProperties> |       </FlavorProperties> | ||||||
|     </VisualStudio> |     </VisualStudio> | ||||||
|   </ProjectExtensions> |   </ProjectExtensions> | ||||||
|   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> |   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" /> | ||||||
|   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  |   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  | ||||||
|        Other similar extension points exist, see Microsoft.Common.targets. |        Other similar extension points exist, see Microsoft.Common.targets. | ||||||
|   <Target Name="BeforeBuild"> |   <Target Name="BeforeBuild"> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue