diff --git a/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj.sql
new file mode 100644
index 0000000..814b617
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj.sql
@@ -0,0 +1,13 @@
+
+
+
+--�û���ɫ֧�ֶ��
+ALTER TABLE [Sys_User]
+ALTER COLUMN [RoleId] NVARCHAR(500);
+
+--�ְ�������
+ALTER TABLE QualityAudit_SubUnitQuality
+ALTER COLUMN SubUnitQualityName NVARCHAR(500);
+
+
+
diff --git a/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj（建筑业企业资质）.sql b/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj（建筑业企业资质）.sql
new file mode 100644
index 0000000..7904cb3
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-09-28-xiaj（建筑业企业资质）.sql
@@ -0,0 +1,309 @@
+
+--�ְ������ʱ���������Id
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'QualityAudit_SubUnitQuality' AND COLUMN_NAME = 'QualityId')
+BEGIN
+	ALTER TABLE QualityAudit_SubUnitQuality ADD QualityId nvarchar(2000);
+END
+GO
+
+--�������á�������ҵ��ҵ����
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'CEB340BE-640E-4C95-ACB1-5E6207D4EDDA')
+BEGIN
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('CEB340BE-640E-4C95-ACB1-5E6207D4EDDA','����ҵ��ҵ����','BaseInfo/Qualification.aspx',190,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1)
+END
+GO
+
+IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'CEB340BE-640E-4C95-ACB1-5E6207D4EDDA')
+BEGIN
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('804834BE-E7D0-4209-ACD4-1E90B0179B59','CEB340BE-640E-4C95-ACB1-5E6207D4EDDA','����',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('852036C3-D91F-49C5-B366-462385D1EAC5','CEB340BE-640E-4C95-ACB1-5E6207D4EDDA','�޸�',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('B5248DEC-EBEA-4064-AFE6-A6EA623C6E89','CEB340BE-640E-4C95-ACB1-5E6207D4EDDA','ɾ��',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('7752BE1B-79C6-4EF6-B65E-B12936AC8B2B','CEB340BE-640E-4C95-ACB1-5E6207D4EDDA','����',4)
+END
+GO
+
+
+
+--����ҵ��ҵ���ʱ�
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Base_Qualification') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[Base_Qualification](
+	[QualificationId] [nvarchar](50) NOT NULL,
+	[QualificationCode] [nvarchar](50) NULL,
+	[QualificationName] [nvarchar](50) NOT NULL,
+	[QualificationType] [nvarchar](50) NULL,
+	[Remark] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Base_Qualification] PRIMARY KEY CLUSTERED 
+(
+	[QualificationId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification', @level2type=N'COLUMN',@level2name=N'QualificationId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification', @level2type=N'COLUMN',@level2name=N'QualificationCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification', @level2type=N'COLUMN',@level2name=N'QualificationName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification', @level2type=N'COLUMN',@level2name=N'QualificationType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification', @level2type=N'COLUMN',@level2name=N'Remark'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ҵ��ҵ���ʱ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Qualification'
+END
+
+GO
+
+--����ҵ��ҵ���ʱ���ʼ������
+IF NOT EXISTS (SELECT * FROM Base_Qualification)
+BEGIN
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'00200CD6-DB74-430E-9090-7899132E39C6', N'20038', N'�������¹�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0270C31A-376B-41E9-8CCB-CA641A7474F4', N'20166', N'����ʯ�͹���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'03203A40-E8DA-4922-B51A-501B37E27869', N'20088', N'��·�̹�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0369A520-367A-4BA1-AC12-2DBB50E93133', N'10043', N'ͨ�Ź���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'05F89153-25B3-4F6C-8EFF-B6A616A22BA8', N'20024', N'���ʹ����﹤��һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'06156812-8873-4003-9FCC-599960A09693', N'10015', N'�ۿ��뺽������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'07C1ED12-017D-40B9-AAE1-ED61FA33AEEB', N'20108', N'��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0889E523-248E-4982-9B8A-0D63D373DF64', N'20146', N'�ͱ�繤�̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'08C7846B-FD26-4952-B0C5-AF1296045B62', N'10013', N'�ۿ��뺽������ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0C0ABEA9-2332-471C-AC1E-D322BB625F04', N'20066', N'���ӹ���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0D8148EE-7219-479D-A588-5233936C3B68', N'20122', N'ˮ������������������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0E78D9FE-A7FE-4CE2-9D6E-57D3A1C1B67D', N'10012', N'�ۿ��뺽������ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0ED38AA3-C577-4871-9E4E-6DAA979700B8', N'20058', N'�������ܻ����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'0FBF1518-33D3-4A0C-8648-A1B577AF1486', N'20063', N'���Ź���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'11EB7722-C166-4AE0-A374-59FBF6490091', N'20139', N'ˮ����������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'12026425-AE46-4224-8F43-A802A097BDC5', N'20093', N'������������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1237154C-4D12-449D-8383-67DB4A27F053', N'20069', N'��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'12EA3B75-006B-4426-BA6F-26092EC03E96', N'20116', N'ͨ���豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'13192F57-3229-4879-B61B-E86180B25B20', N'20177', N'����������ʩ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'13EED5F5-BCFD-4257-92D4-60D08526D539', N'20041', N'�����������ּ�����', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'15725F60-BCE9-4C9C-9D05-D252A236ED92', N'20105', N'�ۿ�װж�豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'17162CAB-B8D8-4878-A8BC-50F1A47BDA08', N'20179', N'����רҵ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1971A354-3D42-4F50-A479-B2EA180E74F1', N'20035', N'������ˮ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1A9F2684-37F5-4712-82AE-367599D7B6E6', N'20020', N'԰�ֹŽ�����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1B7AB04F-1F18-40CA-B7A2-6F3339448774', N'20137', N'ˮ�Ͻ�ͨ���ƹ��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1C6DFF14-54FA-46E4-9D48-DA7E2F98983E', N'20037', N'�������¹��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1E203CC0-285F-4C3E-A13B-FBBF6B4BD597', N'20163', N'�����⹤��һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1FD92214-46CB-4BDA-BCC6-5C8B39C996FB', N'10000', N'���ݽ�������ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'1FDDEF25-5979-4258-99AE-403A5909987D', N'20034', N'������ˮ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2063D767-E775-4154-A947-E0DB93FE2337', N'20107', N'�ۿ�װж�豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'219A3E90-2989-46AD-BCBC-4C00E757ACB4', N'20084', N'��·���񹤳�һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'22A05E5A-DE82-4F01-84A0-AD7BFA6E0D8D', N'20028', N'���ݰ�װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'232EF8EC-D57E-4BFC-8724-EC491CF66AED', N'10006', N'��·����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2345D5CD-6042-40BB-9379-ED93E4C2AF84', N'10033', N'����ʯ�͹���ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'23977BE3-F187-471A-A285-EA6DF7967A1F', N'10045', N'���簲װ����ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'23EB9EF9-6B5F-4CFF-90A8-BC2A3007AE09', N'10026', N'��ɽ����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'261A7163-1804-4ED8-951F-F6731945F07E', N'20094', N'�����������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'277D9A9C-67ED-4367-BA91-AC057437B077', N'20027', N'���ݰ�װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'27B698D2-0714-4B03-9EC9-2EA5FA1ED5AB', N'20180', N'����רҵ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'28D8440D-6CFE-411F-8CCB-41B62D07839B', N'20016', N'������Ԥ�ƹ�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'292DBD55-BF5E-49F8-8639-4964D27691C1', N'30009', N'ģ����ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'293F2D16-C4ED-42D2-BB52-44ABB7A4FB0C', N'20029', N'���ݰ�װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2A35D1DF-D3DA-4F91-AE51-22D38F520CC8', N'10034', N'����ʯ�͹���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2AAF1CE8-5788-4C88-8801-0ED28744A751', N'20118', N'ˮ�Ͻ�ͨ���ƹ��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2C1289C2-0EF2-449D-BFF1-AEFF681FB2C5', N'20022', N'�ֽṹ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2DDEDA49-BEA7-4A77-8391-DF2D6F4B2C8A', N'20120', N'ˮ�������������������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2DFD7084-ACF0-4BA6-9626-744E2B7DF4A2', N'20111', N'ͨ����������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'2E2A9DB6-88FF-4B29-84E9-27A828CFF9B8', N'20012', N'Ԥ����Ʒ������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'310ED141-689A-4B30-8231-C4E6825D32FC', N'20150', N'�˹�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'31DC0AFE-5636-4492-AC92-AB36E4AFEFCE', N'20129', N'ˮ��ˮ������豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'321239F4-3298-40CD-A3BC-FEC2D65A1C6E', N'20030', N'������ʩ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'33661BC8-9637-4C7A-B082-3D1CC8FF8FBF', N'20040', N'�����������ּܶ���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3505D34F-65EF-4043-AFED-D3F23D36C556', N'10041', N'ͨ�Ź���ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'352B93C8-7246-4B38-B484-50A4B2AFEE76', N'30011', N'ˮů�簲װ��ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'35C52002-A391-4E92-B335-98D8E5AD89B9', N'20059', N'�������ܻ���������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'35F8CF53-54F9-4ECB-ADC9-8B11D817953B', N'20019', N'԰�ֹŽ������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'38336DAE-B79C-4B7F-AB3C-5E8323A6AE7C', N'10007', N'��·����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'394A3C2D-B11A-4762-B4F1-9479A7BF5D9F', N'20170', N'���й����ͨ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3AD4637D-92BB-4CD5-8E1F-2E56E8C25842', N'10021', N'��������ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3CDA17EC-FFFF-47FA-8C5E-FA6E4F308897', N'20073', N'�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3DF1F048-FEB6-4475-BB91-20E7AB0CD989', N'10008', N'��·����ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3F29CB79-37A0-4FD2-BE3E-AFF954F7A3E6', N'20098', N'�����չܹ��̼���վ¥����ϵͳ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3F994647-09DB-4613-B134-0C15371DD73A', N'20074', N'������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'3FBC648C-F52D-4F81-9DD7-E7AA7E332A8D', N'20047', N'ԤӦ����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'40805131-8DA3-4E3B-B4F6-32E5C53A299B', N'10004', N'��·����ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'40E69C63-FA39-45A8-BBEE-985F43754372', N'20143', N'����豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'40F849F1-63E2-4F3C-A0EC-55C2349D2420', N'10029', N'ұ������ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4132CDB6-1192-4915-91E2-28F6F8834653', N'20070', N'�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'422C3D6E-0F01-4CF4-88B6-F7BC04EB2ED3', N'20076', N'��··�湤�̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'439263B0-92A5-4426-8096-7540C7B8D7DD', N'20101', N'����Ŀ��������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'448C0679-478F-4830-B3B4-8B4D97393C4C', N'20156', N'ұ�������豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'450F2E29-6C82-4D2E-9ECB-696603F6168E', N'20115', N'ͨ���豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4596D596-ABB0-447F-9668-7D2311C025D8', N'20152', N'¯Ҥ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'45B99C65-49A0-4FC1-A734-804412C95FCB', N'20014', N'Ԥ����Ʒ����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'464060EA-7063-43BA-942D-654854C99BFC', N'20007', N'����װ��װ�ι��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'46D9CF42-0E6D-4A59-BB0A-C3D69CAC6AD1', N'20134', N'�̷����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'46EB778D-D921-4206-9C75-74A9CC72F1CA', N'20087', N'��·�̹��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4795C790-4E00-46E0-B6B6-C4DF14B9600C', N'20144', N'����豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4812BB2E-C479-40BC-9132-0D5544E8B75F', N'20018', N'԰�ֹŽ�������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4A853B24-E24B-4031-8F9E-E5CAFD50FD9A', N'20056', N'����������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4A907DEC-364A-47AC-AA71-121FE62B83E0', N'10014', N'�ۿ��뺽������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4CC523B2-AE42-432D-B296-68415D0A8A6E', N'20005', N'��ʯ����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4D2D0E3B-C95E-4D31-A722-CE3FD0BD44E1', N'20125', N'ˮ�������ṹ�����밲װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4E1BE286-6DEC-491B-A907-070716CB87AC', N'20174', N'���м���·������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4E1F0F29-0AAA-41BA-82CE-1F928126E022', N'10010', N'��·����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4E5A5265-5D2F-4E0D-8DF7-8663B7844A57', N'20033', N'������ˮ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'4F1591E8-91D2-4B9F-AAC8-466B5A8B38D8', N'20097', N'�����չܹ��̼���վ¥����ϵͳ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'513A8E96-70B7-4C7A-90B6-A9259EE1A7D2', N'20160', N'�ܵ�����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'51B84B0A-555D-4B59-957A-1A9622404D8E', N'20081', N'��·��ͨ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'52CBD3C7-C6E7-4A41-956F-C4F1D734CCB8', N'20071', N'������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'540F2F68-E21A-41C8-B920-171191DE84A8', N'10018', N'ˮ��ˮ�繤��ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'552FFBBB-B1C0-4A76-9353-07F3DF04FD55', N'20025', N'���ʹ����﹤�̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'56F4E31C-ACD2-4BFA-9897-13DAE78E1F4A', N'20172', N'���м���·��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'57E07642-E2FD-48FB-ADAD-A9A101AA49FF', N'10031', N'ұ������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'58536C45-5F0A-4377-BCBC-71C345F5D716', N'20031', N'������ʩ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'5F9C53A2-AB97-4614-A141-334C3F7021C9', N'20173', N'���м���·�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'61BC1413-DCA3-4AEC-AFB6-D1670336EC9A', N'20008', N'����װ��װ�ι�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'62125C5C-6326-4D85-921B-49623318D19E', N'20010', N'����Ļǽ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'63F20C2F-EB82-4FA1-94D4-7009A8F2318C', N'20015', N'������Ԥ�ƹ���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'64BF9E04-E08B-4FD4-AD9B-6FDA20345DFC', N'10030', N'ұ������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'679322CD-7D86-4696-9647-13B31152ED08', N'20162', N'�ܵ���������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'67A8C709-90D0-4F41-B357-8D12156879E1', N'20083', N'��·��ͨ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'68333DE8-711A-4022-9B18-DED3674D9285', N'20099', N'����Ŀ����������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'69201560-A070-478A-B63D-FFF577BF5251', N'20149', N'�˹��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'6EBB7B34-5F5F-4BB4-B64B-E0EA8E8AD5C3', N'20072', N'��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'6FDFC11D-6E9C-4B3F-9416-0F617370C773', N'20159', N'����ʯ���豸�ܵ���װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7097B084-40A9-4EA7-8B5E-43B92D1C78ED', N'10025', N'��ɽ����ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'713081F6-F44D-4163-8841-5E280126BEEB', N'20114', N'ͨ���豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'731AF2CB-3FD5-4FE6-B563-178271AABF86', N'20032', N'������ʩ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'73D7A21B-FF50-45C2-B4B8-C7877700CC95', N'20128', N'ˮ��ˮ������豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7538526F-2CA5-41C8-9DC4-68897F232745', N'20140', N'ˮ���������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7556778B-D18F-489D-9C61-C53015C48899', N'20067', N'���ӹ��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7675C36B-FED1-44A3-BCA4-4BE39B8D9CF8', N'20164', N'�����⹤�̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7716DE1E-17AF-4DC4-83B3-191A1F113A7D', N'20106', N'�ۿ�װж�豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'792C68D6-F87A-4747-A0D3-A631E7971032', N'10005', N'��·����ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'79CDCFF8-055A-428C-BD02-A3BCB83324E4', N'20133', N'�̷�����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7BFC7372-AE0A-4E9D-89D8-78917B23D2A3', N'20046', N'ԤӦ�����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7FACEF74-5CC1-45D2-B7E1-7B79716B17EF', N'20117', N'ˮ�Ͻ�ͨ���ƹ���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'7FEFF8E8-64F5-4795-9423-AE38569CCED8', N'20003', N'��ʯ������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'804E7D9B-4C38-4A96-AE02-468C8A184A2B', N'10016', N'ˮ��ˮ�繤��ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8296D4B5-C510-496E-B934-A3C378020610', N'30007', N'��������ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'838C584E-EB53-4270-9144-74EDE0C51AB4', N'20057', N'�������ܻ�����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'84AB5627-676D-4919-8352-D81BE08A0CBB', N'20002', N'�ػ��������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'862D2D2D-5923-4E48-83D9-7453A3C84A33', N'20045', N'ԤӦ������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'88539818-D873-44F1-A756-F0CCD0AAEC54', N'20009', N'����Ļǽ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8875BFC7-937A-4630-962E-3C6D56C1E4D9', N'20052', N'�����豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'89307558-571E-485B-842F-E3A8853B6293', N'30003', N'Ĩ����ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8C12D57D-6371-4307-943D-EED6AADF8665', N'10017', N'ˮ��ˮ�繤��ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8C778D9B-2105-4C07-A873-02F9F8EE6920', N'20138', N'ˮ�Ͻ�ͨ���ƹ�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8DD78119-306E-459C-AF9E-379DE3E308DB', N'20148', N'�˹���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8F64848D-A8CD-4596-863F-F615D547E5D0', N'20078', N'��··������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8F8E5E94-1FEE-455C-A1F9-D4C6355CCD1C', N'20123', N'ˮ�����������������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'8FFC662F-0FC1-4515-A876-0E0E308C636E', N'20082', N'��·��ͨ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'90C8F3F8-75B7-42DC-B8A6-E8DE064F10FA', N'20077', N'��··�湤������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9224F586-B335-4095-A36A-341EE7A01D09', N'20102', N'�ۿ��뺣������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'92B80543-442C-4809-BFEC-213F0CD6500E', N'10032', N'����ʯ�͹���ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'932615B2-E86A-4B42-AB4C-BF4EB7633619', N'10035', N'����ʯ�͹���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'93742245-FC2E-4897-AEDC-F8639CC26BBB', N'20127', N'ˮ��ˮ������豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'97CAF43D-4879-43E9-BCC9-4CE216E2056D', N'20091', N'��·���������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'97E02FB4-2FE2-4FBD-8433-9948F67390A5', N'20065', N'���Ź�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'97E5C7A8-15A4-45D1-BE05-A1621FAFE0DE', N'20036', N'�������¹���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'98337F79-E06F-4981-8D69-DDD8CABB1B04', N'30012', N'�ӽ���ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9A71037D-7D4E-471A-9139-A2250092C5C9', N'20021', N'�ֽṹ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9B231ED0-4612-4CFA-B271-0F567C9ABC74', N'20079', N'��··�����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9B71E6C1-21DC-44CB-A9E4-FCC0B50320FE', N'20096', N'�����չܹ��̼���վ¥����ϵͳ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9CC5F787-B2FE-448D-A8BC-06AEA98A7B2C', N'20103', N'�ۿ��뺣�����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9F57BE4B-B8E0-4500-BFA5-433120942485', N'20013', N'Ԥ����Ʒ����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9F826D05-D86D-497D-992C-4B5C99AD334E', N'20051', N'�����豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'9FAB2313-7171-415D-A93D-D552EBA183ED', N'10044', N'���簲װ����ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A1FE1B94-D1DF-4C2A-843C-BD49A862A8E5', N'20004', N'��ʯ�����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A20C3456-DC36-49C2-93E1-A09174142871', N'10038', N'�������ù���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A213FAB8-2DA3-41F5-B90E-EEBB97794B70', N'20126', N'ˮ�������ṹ�����밲װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A22E4FF2-7A92-4B09-B2B4-22BA36AAB94D', N'10003', N'���ݽ�������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A2769748-F7E1-4786-ADDC-3B621D94A779', N'30010', N'������ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A2C5D652-483A-47BA-A4C5-9C84B5DB0956', N'20001', N'�ػ���������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A3D6BF2C-6145-41A3-B238-0968A36984BE', N'20119', N'ˮ�Ͻ�ͨ���ƹ�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A4870C49-8439-49C5-AB4A-44A54E42A811', N'20043', N'�����Ŵ����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A69D9958-5A9F-4295-8E78-C9023C4C9414', N'10036', N'�������ù���ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'A8502567-7ABF-4734-9D68-978E6C2962BD', N'20141', N'ˮ��������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'AA5584EC-1C93-4316-BCAA-9D085E68A7EA', N'10024', N'��ɽ����ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'AADAD85F-6E61-4B6A-BC74-45E4115C2238', N'20178', N'����רҵ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'AB81E894-8D0E-43D5-8702-F2177A728E3F', N'20080', N'��··����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'AC829D5B-523E-48E2-8701-C3D158E91A4A', N'20165', N'�����⹤������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'ACDB6C83-5323-4179-9A6D-29D3D41BEF9E', N'30006', N'�ֽ���ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'AF12B90F-A0BC-466E-85A3-FA7144521504', N'20092', N'��·��������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B0510BA9-70C0-409E-9DFB-F171D068F7D0', N'10027', N'��ɽ����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B07690E3-8E30-4713-A815-17AB7824CF96', N'20113', N'ͨ��������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B2D8BCD3-B972-41A7-A342-980F6636EEAC', N'20153', N'¯Ҥ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B3505D16-2222-453C-9B71-617F51E417BA', N'20062', N'������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B46BF1D3-5F6F-4C9D-9210-2914B91BEE76', N'30013', N'������ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B51B945E-9B58-4659-9688-89B2C8158BDE', N'20104', N'�ۿ��뺣����������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B5B3D244-3944-4CC6-9684-204B108CF220', N'20049', N'�����豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B5F11DDA-CB9D-4054-BFBE-305BC1201032', N'30004', N'ʯ����', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B6EC99E8-2948-40C0-BC76-3C52FF9B7B03', N'20075', N'��··�湤��һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B7AB3B2B-069F-47D7-A056-DAADD72156FF', N'20155', N'ұ�������豸��װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B8018D11-F87A-48CD-A559-06A914218968', N'30002', N'������ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B8B0BE5C-E018-4650-8066-F41F58399E8D', N'30008', N'���ּ���ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B8D0A3C5-A103-4D65-BB76-6F98DBFC48D8', N'20064', N'���Ź��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B8D180CA-0241-4C68-980D-0FB7F756B4E3', N'20124', N'ˮ�������ṹ�����밲װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B90698A5-53A2-4132-89B7-0D4E5A00A748', N'20135', N'�̷���������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'B9E4ADB0-89DA-4D05-A097-2BA97EB406E0', N'20089', N'��·�̹������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'BB1ED0BB-840A-407F-B234-4557045A76EA', N'20048', N'�����豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'BD07CD2B-746E-419B-A958-225A50CBF344', N'20068', N'���ӹ�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'BD21946C-1183-442D-BF0A-BBB78C649B41', N'20157', N'����ʯ���豸�ܵ���װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C03E53A8-E132-4D96-8886-0C77A5ADDFBA', N'20006', N'����װ��װ�ι���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C06B3621-1085-43F7-BB67-B4A741B55B07', N'20053', N'�����豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C13BD53E-10D2-4BC7-8534-AFE762ED595A', N'20142', N'����豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C254E4DA-0CE3-4B10-8C9A-B6EFFA90422E', N'10009', N'��·����ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C3021442-A3FE-4809-BD65-0E1EE423A55C', N'20055', N'�����������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C41087E4-818F-4745-AA28-4ABF1F05B70A', N'20147', N'�ͱ�繤������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C644DF14-67BC-44F4-83CC-BD695E68ABDA', N'20145', N'�ͱ�繤��һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C764CF10-A064-4294-8209-421473E03AB0', N'10001', N'���ݽ�������ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C911DBBA-5A0F-41B6-81E2-4904A36D2949', N'10022', N'��������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C93567E2-9617-4AEA-9B51-B002E60A582C', N'20158', N'����ʯ���豸�ܵ���װ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'C970DF3D-5D68-4EE2-BE6B-CE4ECD444E6B', N'20167', N'����ʯ�͹��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'CC0DDF39-844D-4A3C-B735-A8DF1643B643', N'20039', N'�����������ּ�һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D0FE4C5F-DE47-4420-9373-15E01D1A3DD9', N'20169', N'���й����ͨ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D2EDCE69-4741-48CD-B817-0F606C0AE6D3', N'20026', N'���ʹ����﹤������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D354E817-95F2-4E4B-AAF4-D0173100D3E8', N'20100', N'����Ŀ���������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D3A6C125-163C-4B3B-A946-29FD872137CA', N'20171', N'���й����ͨ��������', N'רҵ�а�', N'')
+
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D4884095-AC6B-4B0E-B113-D7093CABFB0F', N'20042', N'�����Ŵ�����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D48D3BDA-84E5-45CF-A9C2-357430610935', N'20095', N'����������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D48EF025-E19D-4A9E-910F-17F01769498D', N'20151', N'¯Ҥ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D624483F-2A01-4A95-9C27-D11719AC0C1A', N'10047', N'���簲װ����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D6B476C3-5DCB-4098-9DCD-2B487BF7B007', N'20011', N'����Ļǽ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D943C46F-7460-4FFA-B01C-3B595C228B17', N'20061', N'�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'D9DC45CA-F1FF-481B-94A9-6AEB6BDBE101', N'20060', N'��������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'DCB4C76B-2A3B-4395-9EA7-5F9225144693', N'20054', N'������������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'DED90707-32E8-41A5-BC9D-10609D5C0446', N'10039', N'�������ù���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'DF1B59AF-AF3A-42F4-9AC3-146D04FF8570', N'10046', N'���簲װ����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'DF79B2D5-4905-4DFD-9D00-A44434508F1B', N'10040', N'ͨ�Ź���ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E0152591-954F-44A6-81C8-5F257E9A4F38', N'20023', N'�ֽṹ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E1DD1CC1-13D6-442D-B3BB-BF5CECEFA9F5', N'10011', N'��·����ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E1ED3C7F-739C-457D-AEC6-1439E959538D', N'30001', N'ľ����ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E214DEA3-802E-42F1-B0C9-8C8894DB8C08', N'10028', N'ұ������ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E275DFDF-637E-408E-9C9A-4DDDADA6F782', N'20161', N'�ܵ����̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E2FA0314-A511-4F74-A8E3-1563F7E3967F', N'20090', N'��·����������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E4112D04-E4B9-4A39-B7BB-96AC7A846DBE', N'10019', N'ˮ��ˮ�繤��ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E4CA604F-8E3D-4BDF-A0DA-B1225D2422AF', N'20109', N'�������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E54B923C-CAD5-4B73-A497-9F146B704874', N'20130', N'�Ӻ����ι���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E5D1E168-0BDE-46C5-8FB3-4811832F2680', N'20131', N'�Ӻ����ι��̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E5E80A96-CC1E-4097-82A1-03490A4830C3', N'10002', N'���ݽ�������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E66593D3-01DA-460D-98FF-33DBF7566533', N'10023', N'��������ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E90775DD-FFBC-4439-9627-A661C8B038A2', N'20112', N'ͨ���������̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E938EE2F-9C8F-4D63-BCFB-89CFD626BB31', N'20086', N'��·���񹤳�����', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'E9818CDA-0960-4DF0-A422-CAA98D562092', N'30005', N'������ҵ', N'����ְ�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EB401086-EDBA-4D4C-8E1C-67EE1E109CAD', N'20044', N'�����Ŵ���������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EB9A2681-DD9B-4659-A924-41888BC317B6', N'10037', N'�������ù���ʩ���ܳа�һ��', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EBB7AB85-4F65-4B41-BCEE-25615D6A4067', N'10042', N'ͨ�Ź���ʩ���ܳа�����', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'ECD9FD41-5CB4-48B0-8771-0CFD4346A5D6', N'20050', N'�����豸��װ��������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EDBD893B-9FF4-4E27-B512-F957564BC388', N'20017', N'������Ԥ�ƹ�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EF3E87D0-27FF-44EA-89CA-8E36BB85AE49', N'10020', N'��������ʩ���ܳа��ؼ�', N'ʩ���ܳа�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'EFAE1369-2A7D-45F2-A328-2FE02196F261', N'20085', N'��·���񹤳̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F4DD7634-6D4C-4907-B80D-5F32AD2F4FFD', N'20176', N'����������ʩ���̶���', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F5BBCEAD-EC44-4C9B-BA18-E9F321766488', N'20000', N'�ػ����������һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F725C17B-15EC-47AF-999E-C56A70C3D8AC', N'20110', N'������������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F78F633F-47B6-4324-B7AA-650457899E99', N'20175', N'����������ʩ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F8E626CD-C0FF-4E0F-9B67-6B1239AA7BDD', N'20132', N'�Ӻ����ι�������', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'F9AA7B93-5AA9-400A-BC4E-1A2BE7456145', N'20154', N'ұ�������豸��װ����һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'FDA6A0C1-52C7-4175-8C42-65000C110BAA', N'20136', N'ˮ�Ͻ�ͨ���ƹ���һ��', N'רҵ�а�', N'')
+INSERT [dbo].[Base_Qualification] ([QualificationId], [QualificationCode], [QualificationName], [QualificationType], [Remark]) VALUES (N'FEC7013E-1D39-485D-802E-87D0DA93CB5A', N'20168', N'����ʯ�͹�������', N'רҵ�а�', N'')
+END
+GO
+
+
+
+
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 81eece6..2a4c1d8 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -268,6 +268,7 @@
     <Compile Include="BaseInfo\InspectionAreaService.cs" />
     <Compile Include="BaseInfo\LawsRegulationsTypeService.cs" />
     <Compile Include="BaseInfo\EmployeeCategoryService.cs" />
+    <Compile Include="BaseInfo\QualificationService.cs" />
     <Compile Include="BaseInfo\RiskLevelService.cs" />
     <Compile Include="BaseInfo\LicenseTypeService.cs" />
     <Compile Include="BaseInfo\ManageRuleTypeService.cs" />
diff --git a/SGGL/BLL/BaseInfo/QualificationService.cs b/SGGL/BLL/BaseInfo/QualificationService.cs
new file mode 100644
index 0000000..fe4ac62
--- /dev/null
+++ b/SGGL/BLL/BaseInfo/QualificationService.cs
@@ -0,0 +1,139 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+
+namespace BLL
+{
+    public static class QualificationService
+    {
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static Model.Base_Qualification GetQualificationById(string QualificationId)
+        {
+            return Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+        }
+
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static Model.Base_Qualification GetQualificationByName(string QualificationName)
+        {
+            return Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationName == QualificationName);
+        }
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="?"></param>
+        public static void AddQualification(Model.Base_Qualification model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification newModel = new Model.Base_Qualification
+            {
+                QualificationId = model.QualificationId,
+                QualificationCode = model.QualificationCode,
+                QualificationName = model.QualificationName,
+                QualificationType = model.QualificationType,
+                Remark = model.Remark
+            };
+
+            db.Base_Qualification.InsertOnSubmit(newModel);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="teamGroup"></param>
+        public static void UpdateQualification(Model.Base_Qualification model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification newModel = db.Base_Qualification.FirstOrDefault(e => e.QualificationId == model.QualificationId);
+            if (newModel != null)
+            {
+                newModel.QualificationCode = model.QualificationCode;
+                newModel.QualificationName = model.QualificationName;
+                newModel.QualificationType = model.QualificationType;
+                newModel.Remark = model.Remark;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除信息
+        /// </summary>
+        /// <param name="QualificationId"></param>
+        public static void DeleteQualificationById(string QualificationId)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Base_Qualification model = db.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+            {
+                db.Base_Qualification.DeleteOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 获取类别下拉项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Qualification> GetQualificationList()
+        {
+            var list = (from x in Funs.DB.Base_Qualification orderby x.QualificationCode select x).ToList();
+            return list;
+        }
+        /// <summary>
+        /// 获取建筑业企业资质下拉选项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Qualification> GetQualificationDropDownList()
+        {
+            var list = (from x in Funs.DB.Base_Qualification orderby x.QualificationCode select x).ToList();
+            return list;
+        }
+
+        #region 建筑业企业资质表下拉框
+        /// <summary>
+        ///  建筑业企业资质表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitQualificationDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "QualificationId";
+            dropName.DataTextField = "QualificationName";
+            dropName.DataSource = BLL.QualificationService.GetQualificationDropDownList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 根据主键获取信息
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public static string GetQualificationNameById(string QualificationId)
+        {
+            string name = string.Empty;
+            var getType= Funs.DB.Base_Qualification.FirstOrDefault(e => e.QualificationId == QualificationId);
+            if (getType != null)
+            {
+                name = getType.QualificationName;
+            }
+            return name;
+        }
+    }
+}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 93148db..ee354b0 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -1681,6 +1681,10 @@ namespace BLL
         /// </summary>
         public const string ProjectTypeMenuId = "AEB427BD-AE1A-47CC-9337-368BB06B37F7";
         /// <summary>
+        /// 建筑业企业资质
+        /// </summary>
+        public const string QualificationMenuId = "CEB340BE-640E-4C95-ACB1-5E6207D4EDDA";
+        /// <summary>
         /// 执业资格证书证书
         /// </summary>
         public const string PracticeCertificateMenuId = "1390195D8-874B-4E7B-8DBF-D81A5984E973";
diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs
index c540896..457e190 100644
--- a/SGGL/BLL/Common/Funs.cs
+++ b/SGGL/BLL/Common/Funs.cs
@@ -221,10 +221,10 @@ namespace BLL
         /// <param name="DLL">Ŀ��������</param>
         public static void DropDownPageSize(FineUIPro.DropDownList DDL)
         {
-            DDL.Items.Insert(0, new FineUIPro.ListItem("10", "10"));
-            DDL.Items.Insert(1, new FineUIPro.ListItem("20", "20", true));
-            DDL.Items.Insert(2, new FineUIPro.ListItem("30", "30"));
-            DDL.Items.Insert(3, new FineUIPro.ListItem("50", "50"));
+            DDL.Items.Insert(0, new FineUIPro.ListItem("15", "15", true));
+            DDL.Items.Insert(1, new FineUIPro.ListItem("50", "50"));
+            DDL.Items.Insert(2, new FineUIPro.ListItem("100", "100"));
+            DDL.Items.Insert(3, new FineUIPro.ListItem("200", "200"));
             DDL.Items.Insert(4, new FineUIPro.ListItem("������", "1000000"));
             return;
         }
diff --git a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs
index 7e64035..a133cc6 100644
--- a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs
+++ b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs
@@ -43,6 +43,7 @@ namespace BLL
             {
                 SubUnitQualityId = subUnitQuality.SubUnitQualityId,
                 UnitId = subUnitQuality.UnitId,
+                QualityId = subUnitQuality.QualityId,
                 SubUnitQualityCode = subUnitQuality.SubUnitQualityCode,
                 SubUnitQualityName = subUnitQuality.SubUnitQualityName,
                 BusinessLicense = subUnitQuality.BusinessLicense,
@@ -84,6 +85,7 @@ namespace BLL
             if (newSubUnitQuality != null)
             {                
                 newSubUnitQuality.UnitId = subUnitQuality.UnitId;
+                newSubUnitQuality.QualityId = subUnitQuality.QualityId;
                 newSubUnitQuality.SubUnitQualityCode = subUnitQuality.SubUnitQualityCode;
                 newSubUnitQuality.SubUnitQualityName = subUnitQuality.SubUnitQualityName;
                 newSubUnitQuality.BusinessLicense = subUnitQuality.BusinessLicense;
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx
new file mode 100644
index 0000000..6f86a76
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx
@@ -0,0 +1,114 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Qualification.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.Qualification" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>建筑业企业资质</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+
+                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="建筑业企业资质" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="QualificationId" AllowCellEditing="true" ForceFit="true"
+                    ClicksToEdit="2" DataIDField="QualificationId" AllowSorting="true" SortField="QualificationCode"
+                    SortDirection="ASC" EnableColumnLines="true"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="20"
+                    EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnPageIndexChange="Grid1_PageIndexChange">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtQualificationCode" runat="server" Label="资质编号、名称" Width="300px" LabelWidth="140px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DropDownList ID="ddlQualificationType" runat="server" Label="资质类型" LabelWidth="110px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:ListItem Value="" Text=" - 请选择 - "></f:ListItem>
+                                    <f:ListItem Value="施工总承包" Text="施工总承包"></f:ListItem>
+                                    <f:ListItem Value="专业承包" Text="专业承包"></f:ListItem>
+                                    <f:ListItem Value="劳务分包" Text="劳务分包"></f:ListItem>
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSearch" Icon="SystemSearch"
+                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" Hidden="true"
+                                    runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="120px" ColumnID="QualificationCode" DataField="QualificationCode"
+                            SortField="QualificationCode" FieldType="String" HeaderText="资质编号" TextAlign="center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="QualificationName" DataField="QualificationName"
+                            SortField="QualificationName" FieldType="String" HeaderText="资质名称" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="QualificationType" DataField="QualificationType"
+                            SortField="QualificationType" FieldType="String" HeaderText="资质类型" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
+                            SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="50" Value="50" />
+                            <f:ListItem Text="100" Value="100" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                        <f:ToolbarFill runat="server">
+                        </f:ToolbarFill>
+
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="建筑业企业资质" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="700px" Height="400px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
+                    OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.cs
new file mode 100644
index 0000000..26cbe1f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+
+namespace FineUIPro.Web.BaseInfo
+{
+    public partial class Qualification : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                // 绑定表格
+                BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("QualificationEdit.aspx") + "return false;";
+            }
+        }
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+
+        public void BindGrid()
+        {
+            DataTable tb = BindData();
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+
+        protected DataTable BindData()
+        {
+            string strSql = @"select QualificationId,QualificationCode,QualificationName,QualificationType,Remark 
+            from [dbo].[Base_Qualification] 
+            where 1=1  ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.txtQualificationCode.Text.Trim()))
+            {
+                strSql += " AND (QualificationCode like @QualificationCode OR QualificationName like @QualificationCode)";
+                listStr.Add(new SqlParameter("@QualificationCode", "%" + this.txtQualificationCode.Text.Trim() + "%"));
+            }
+            if (this.ddlQualificationType.SelectedValue != null && !string.IsNullOrEmpty(this.ddlQualificationType.SelectedValue.Trim()))
+            {
+                strSql += " AND QualificationType = @QualificationType";
+                listStr.Add(new SqlParameter("@QualificationType", this.ddlQualificationType.SelectedValue.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion 
+
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    BLL.QualificationService.DeleteQualificationById(rowID);
+                }
+
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualificationEdit.aspx?QualificationId={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.QualificationMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuModify.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.designer.cs
new file mode 100644
index 0000000..15d8248
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/Qualification.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+    public partial class Qualification
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// txtQualificationCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQualificationCode;
+
+        /// <summary>
+        /// ddlQualificationType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlQualificationType;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx
new file mode 100644
index 0000000..9a04659
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx
@@ -0,0 +1,60 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualificationEdit.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.QualificationEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>施工专业</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow runat="server">
+                    <Items>
+                        <f:TextBox ID="txtQualificationCode" runat="server" Label="资质编号" Required="true" MaxLength="70" ShowRedStar="true" LabelWidth="110px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow runat="server">
+                    <Items>
+                        <f:TextBox ID="txtQualificationName" runat="server" Label="资质名称" Required="true" MaxLength="70" ShowRedStar="true" LabelWidth="110px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow runat="server">
+                    <Items>
+                        <f:DropDownList ID="ddlQualificationType" runat="server" Label="资质类型" LabelWidth="110px" Required="true" ShowRedStar="true" AutoSelectFirstItem="true">
+                            <f:ListItem Value="施工总承包" Text="施工总承包"></f:ListItem>
+                            <f:ListItem Value="专业承包" Text="专业承包"></f:ListItem>
+                            <f:ListItem Value="劳务分包" Text="劳务分包"></f:ListItem>
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemark" runat="server" LabelWidth="110px" Height="100px" Label="备注" MaxLength="1000">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdCheckerId" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false"
+                            runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.cs
new file mode 100644
index 0000000..912c72d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.cs
@@ -0,0 +1,63 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.BaseInfo
+{
+    public partial class QualificationEdit : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                string QualificationId = Request.Params["QualificationId"];
+                if (!string.IsNullOrEmpty(QualificationId))
+                {
+
+                    Model.Base_Qualification model = BLL.QualificationService.GetQualificationById(QualificationId);
+                    if (model != null)
+                    {
+                        this.txtQualificationCode.Text = model.QualificationCode;
+                        this.txtQualificationName.Text = model.QualificationName;
+                        this.ddlQualificationType.SelectedValue = model.QualificationType;
+                        this.txtRemark.Text = model.Remark;
+                    }
+                }
+            }
+
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData(true);
+        }
+
+        private void SaveData(bool b)
+        {
+            string QualificationId = Request.Params["QualificationId"];
+            Model.Base_Qualification model = new Model.Base_Qualification();
+            model.QualificationCode = this.txtQualificationCode.Text.Trim();
+            model.QualificationName = this.txtQualificationName.Text.Trim();
+            model.QualificationType = this.ddlQualificationType.SelectedValue.Trim();
+            model.Remark = this.txtRemark.Text.Trim();
+            if (!string.IsNullOrEmpty(QualificationId))
+            {
+                model.QualificationId = QualificationId;
+                BLL.QualificationService.UpdateQualification(model);
+            }
+            else
+            {
+                model.QualificationId = SQLHelper.GetNewID(typeof(Model.Base_Qualification));
+                BLL.QualificationService.AddQualification(model);
+
+            }
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.designer.cs
new file mode 100644
index 0000000..64a916e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/QualificationEdit.aspx.designer.cs
@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+    public partial class QualificationEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtQualificationCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQualificationCode;
+
+        /// <summary>
+        /// txtQualificationName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQualificationName;
+
+        /// <summary>
+        /// ddlQualificationType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlQualificationType;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdCheckerId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckerId;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/用户信息模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/用户信息模版.xls
index f708fab..4faae8d 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/用户信息模版.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/用户信息模版.xls differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9eabac1..09247f0 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -246,6 +246,8 @@
     <Content Include="BaseInfo\EmployeeSubgroup.aspx" />
     <Content Include="BaseInfo\GoodsCategory.aspx" />
     <Content Include="BaseInfo\EmployeeCategory.aspx" />
+    <Content Include="BaseInfo\Qualification.aspx" />
+    <Content Include="BaseInfo\QualificationEdit.aspx" />
     <Content Include="BaseInfo\RiskLevelEdit.aspx" />
     <Content Include="BaseInfo\RiskLevel.aspx" />
     <Content Include="BaseInfo\HazardRegisterTypes.aspx" />
@@ -7787,6 +7789,20 @@
     <Compile Include="BaseInfo\EmployeeCategory.aspx.designer.cs">
       <DependentUpon>EmployeeCategory.aspx</DependentUpon>
     </Compile>
+    <Compile Include="BaseInfo\Qualification.aspx.cs">
+      <DependentUpon>Qualification.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\Qualification.aspx.designer.cs">
+      <DependentUpon>Qualification.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="BaseInfo\QualificationEdit.aspx.cs">
+      <DependentUpon>QualificationEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\QualificationEdit.aspx.designer.cs">
+      <DependentUpon>QualificationEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="BaseInfo\RiskLevelEdit.aspx.cs">
       <DependentUpon>RiskLevelEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx
index b282c07..64e68fc 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx
@@ -10,207 +10,216 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="分包商资质" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" EnableTableStyle="false">
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:Label ID="txtUnitName" runat="server" Label="分包单位" LabelAlign="Right"  LabelWidth="120px">
-                    </f:Label>
-                    <f:Label ID="txtTelephone" runat="server" Label="联系电话" LabelAlign="Right" >
-                    </f:Label>
-                    <f:Label ID="txtEmail" runat="server" Label="电子邮箱" LabelAlign="Right" >
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow >
-                <Items>                   
-                    <f:TextBox ID="txtSubUnitQualityName" runat="server" Label="资质" LabelAlign="Right" LabelWidth="120px"
-                        MaxLength="100">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtBusinessLicense" runat="server" Label="营业执照" LabelAlign="Right" LabelWidth="120px"
-                        MaxLength="50">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtBL_EnableDate" runat="server" Label="营业执照有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnBL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnBL_ScanUrl_Click"
-                        AutoPostBack="true" Label="营业执照扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="cpBL" runat="server" ShowHeader="false" ShowBorder="false" Title="营业执照扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divBL_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%" runat="server" Hidden="true">
-                <Items>
-                    <f:TextBox ID="txtOrganCode" runat="server" Label="机构代码" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtO_EnableDate" runat="server" Label="机构代码有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnO_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnO_ScanUrl_Click"
-                        AutoPostBack="true" Label="机构代码扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="机构代码扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divO_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtCertificate" runat="server" Label="资质证书" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtC_EnableDate" runat="server" Label="资质证书有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnC_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnC_ScanUrl_Click"
-                        AutoPostBack="true" Label="资质证书扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="资质证书扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divC_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtQualityLicense" runat="server" Label="质量体系</br>认证证书" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtQL_EnableDate" runat="server" Label="质量--有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnQL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnQL_ScanUrl_Click"
-                        AutoPostBack="true" Label="质量--扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel3" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="质量--扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divQL_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtHSELicense" runat="server" Label="HSE体系认证</br>证书(环保)" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtH_EnableDate" runat="server" Label="有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnH_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnH_ScanUrl_Click"
-                        AutoPostBack="true" Label="扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel4" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divH_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtHSELicense2" runat="server" Label="HSE体系认证</br>证书(职业健康)" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtH_EnableDate2" runat="server" Label="有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnH_ScanUrl2" EmptyText="请选择附件" OnFileSelected="btnH_ScanUrl2_Click"
-                        AutoPostBack="true" Label="扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel6" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divH_ScanUrl2" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="25% 25% 30% 20%">
-                <Items>
-                    <f:TextBox ID="txtSecurityLicense" runat="server" Label="安全生产许可证" LabelAlign="Right"
-                        MaxLength="50" LabelWidth="120px">
-                    </f:TextBox>
-                    <f:DatePicker ID="txtSL_EnableDate" runat="server" Label="有效期" LabelAlign="Right"
-                        EnableEdit="true" LabelWidth="120px">
-                    </f:DatePicker>
-                    <f:FileUpload runat="server" ID="btnSL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnSL_ScanUrl_Click"
-                        AutoPostBack="true" Label="扫描件" LabelWidth="120px">
-                    </f:FileUpload>
-                    <f:ContentPanel ID="ContentPanel5" runat="server" ShowHeader="false" ShowBorder="false"
-                        Title="安全生产许可证扫描件">
-                        <table>
-                            <tr style="height: 28px">
-                                <td align="left">
-                                    <div id="divSL_ScanUrl" runat="server">
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-        </Rows>
-        <Toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                    </f:ToolbarFill>
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Hidden="true"
-                        OnClick="btnSave_Click">
-                    </f:Button>
-                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-    </f:Form>
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="分包商资质" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" EnableTableStyle="false">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:Label ID="txtUnitName" runat="server" Label="分包单位" LabelAlign="Right" LabelWidth="120px">
+                        </f:Label>
+                        <f:Label ID="txtTelephone" runat="server" Label="联系电话" LabelAlign="Right">
+                        </f:Label>
+                        <f:Label ID="txtEmail" runat="server" Label="电子邮箱" LabelAlign="Right">
+                        </f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownBox runat="server" ID="drpUnitQualityBox" Label="资质" LabelWidth="120px" DataControlID="radUnitQuality" EnableMultiSelect="true">
+                            <PopPanel>
+                                <f:SimpleForm ID="SimpleForm2" BodyPadding="10px" runat="server" AutoScroll="true"
+                                    ShowBorder="true" ShowHeader="false" Hidden="true">
+                                    <Items>
+                                        <%--<f:Label ID="Label1" runat="server" Text="请选择单位资质"></f:Label>--%>
+                                        <f:CheckBoxList ID="radUnitQuality" ColumnNumber="3" runat="server">
+                                        </f:CheckBoxList>
+                                    </Items>
+                                </f:SimpleForm>
+                            </PopPanel>
+                        </f:DropDownBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtBusinessLicense" runat="server" Label="营业执照" LabelAlign="Right" LabelWidth="120px"
+                            MaxLength="50">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtBL_EnableDate" runat="server" Label="营业执照有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnBL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnBL_ScanUrl_Click"
+                            AutoPostBack="true" Label="营业执照扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="cpBL" runat="server" ShowHeader="false" ShowBorder="false" Title="营业执照扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divBL_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%" runat="server" Hidden="true">
+                    <Items>
+                        <f:TextBox ID="txtOrganCode" runat="server" Label="机构代码" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtO_EnableDate" runat="server" Label="机构代码有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnO_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnO_ScanUrl_Click"
+                            AutoPostBack="true" Label="机构代码扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="机构代码扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divO_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtCertificate" runat="server" Label="资质证书" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtC_EnableDate" runat="server" Label="资质证书有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnC_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnC_ScanUrl_Click"
+                            AutoPostBack="true" Label="资质证书扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel2" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="资质证书扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divC_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtQualityLicense" runat="server" Label="质量体系</br>认证证书" LabelAlign="Right"
+                            MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtQL_EnableDate" runat="server" Label="质量--有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnQL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnQL_ScanUrl_Click"
+                            AutoPostBack="true" Label="质量--扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel3" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="质量--扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divQL_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtHSELicense" runat="server" Label="HSE体系认证</br>证书(环保)" LabelAlign="Right"
+                            MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtH_EnableDate" runat="server" Label="有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnH_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnH_ScanUrl_Click"
+                            AutoPostBack="true" Label="扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel4" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divH_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtHSELicense2" runat="server" Label="HSE体系认证</br>证书(职业健康)" LabelAlign="Right"
+                            MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtH_EnableDate2" runat="server" Label="有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnH_ScanUrl2" EmptyText="请选择附件" OnFileSelected="btnH_ScanUrl2_Click"
+                            AutoPostBack="true" Label="扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel6" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divH_ScanUrl2" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="25% 25% 30% 20%">
+                    <Items>
+                        <f:TextBox ID="txtSecurityLicense" runat="server" Label="安全生产许可证" LabelAlign="Right"
+                            MaxLength="50" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtSL_EnableDate" runat="server" Label="有效期" LabelAlign="Right"
+                            EnableEdit="true" LabelWidth="120px">
+                        </f:DatePicker>
+                        <f:FileUpload runat="server" ID="btnSL_ScanUrl" EmptyText="请选择附件" OnFileSelected="btnSL_ScanUrl_Click"
+                            AutoPostBack="true" Label="扫描件" LabelWidth="120px">
+                        </f:FileUpload>
+                        <f:ContentPanel ID="ContentPanel5" runat="server" ShowHeader="false" ShowBorder="false"
+                            Title="安全生产许可证扫描件">
+                            <table>
+                                <tr style="height: 28px">
+                                    <td align="left">
+                                        <div id="divSL_ScanUrl" runat="server">
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Hidden="true"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.cs
index 489d6fb..d579758 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.cs
@@ -153,9 +153,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.UnitId = Request.Params["UnitId"];
-               
+
                 if (!string.IsNullOrEmpty(this.UnitId))
                 {
+                    InitDropDownList();
                     var unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
                     if (unit != null)
                     {
@@ -166,9 +167,14 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                     var subUnitQuality = BLL.SubUnitQualityService.GetSubUnitQualityByUnitId(this.UnitId);
                     if (subUnitQuality != null)
                     {
-                        this.SubUnitQualityId = subUnitQuality.SubUnitQualityId;                        
-                        this.txtSubUnitQualityName.Text = subUnitQuality.SubUnitQualityName;
-                        this.txtBusinessLicense.Text = subUnitQuality.SubUnitQualityName;
+                        this.SubUnitQualityId = subUnitQuality.SubUnitQualityId;
+                        if (!string.IsNullOrWhiteSpace(subUnitQuality.QualityId))
+                        {
+                            this.drpUnitQualityBox.Value = subUnitQuality.QualityId;
+                            this.radUnitQuality.SelectedValueArray = subUnitQuality.QualityId.Split(',');
+                        }
+
+                        this.txtBusinessLicense.Text = subUnitQuality.BusinessLicense;
                         this.txtBL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.BL_EnableDate);
                         this.BL_ScanUrl = subUnitQuality.BL_ScanUrl;
                         this.divBL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.BL_ScanUrl);
@@ -184,7 +190,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                         this.txtQL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.QL_EnableDate);
                         this.QL_ScanUrl = subUnitQuality.QL_ScanUrl;
                         this.divQL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.QL_ScanUrl);
-                        
+
                         this.txtHSELicense.Text = subUnitQuality.HSELicense;
                         this.txtH_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.H_EnableDate);
                         this.H_ScanUrl = subUnitQuality.H_ScanUrl;
@@ -194,17 +200,31 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                         this.txtH_EnableDate2.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.H_EnableDate2);
                         this.H_ScanUrl2 = subUnitQuality.H_ScanUrl2;
                         this.divH_ScanUrl2.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.H_ScanUrl2);
-                        
+
                         this.txtSecurityLicense.Text = subUnitQuality.SecurityLicense;
                         this.txtSL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.SL_EnableDate);
                         this.SL_ScanUrl = subUnitQuality.SL_ScanUrl;
                         this.divSL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.SL_ScanUrl);
                     }
-                    
+
                     this.GetButtonPower();
                 }
             }
         }
+
+        /// <summary>
+        ///  初始化下拉框
+        /// </summary>
+        private void InitDropDownList()
+        {
+            var qualifications = Funs.DB.Base_Qualification.OrderBy(x => x.QualificationCode);
+            this.radUnitQuality.DataTextField = "QualificationName";
+            this.radUnitQuality.DataValueField = "QualificationId";
+            this.radUnitQuality.DataSource = qualifications;
+            this.radUnitQuality.DataBind();
+        }
+
+
         #endregion
 
         #region 获取按钮权限
@@ -344,7 +364,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             Model.QualityAudit_SubUnitQuality subUnitQuality = new Model.QualityAudit_SubUnitQuality
             {
                 UnitId = this.UnitId,
-                SubUnitQualityName = this.txtSubUnitQualityName.Text.Trim(),
                 BusinessLicense = this.txtBusinessLicense.Text.Trim(),
                 BL_EnableDate = Funs.GetNewDateTime(this.txtBL_EnableDate.Text.Trim()),
                 BL_ScanUrl = this.BL_ScanUrl,
@@ -369,6 +388,24 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 CompileMan = this.CurrUser.UserId,
                 CompileDate = DateTime.Now
             };
+            if (this.radUnitQuality.SelectedItemArray.Count() > 0)
+            {
+                string qids = string.Empty;
+                string qNames = string.Empty;
+                foreach (var item in this.radUnitQuality.SelectedItemArray)
+                {
+                    qids += item.Value + ",";
+                    qNames += item.Text + ",";
+                }
+                if (!string.IsNullOrEmpty(qids))
+                {
+                    qids = qids.Substring(0, qids.LastIndexOf(","));
+                    qNames = qNames.Substring(0, qNames.LastIndexOf(","));
+                }
+                subUnitQuality.QualityId = qids;
+                subUnitQuality.SubUnitQualityName = qNames;
+            }
+
             if (!string.IsNullOrEmpty(this.SubUnitQualityId))
             {
                 subUnitQuality.SubUnitQualityId = this.SubUnitQualityId;
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.designer.cs
index f43ecb8..9ab4a28 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
-    
-    
-    public partial class SubUnitQualityEdit {
-        
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
+
+
+    public partial class SubUnitQualityEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label txtUnitName;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label txtTelephone;
-        
+
         /// <summary>
         /// txtEmail 控件。
         /// </summary>
@@ -65,16 +67,34 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label txtEmail;
-        
+
         /// <summary>
-        /// txtSubUnitQualityName 控件。
+        /// drpUnitQualityBox 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSubUnitQualityName;
-        
+        protected global::FineUIPro.DropDownBox drpUnitQualityBox;
+
+        /// <summary>
+        /// SimpleForm2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm2;
+
+        /// <summary>
+        /// radUnitQuality 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBoxList radUnitQuality;
+
         /// <summary>
         /// txtBusinessLicense 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtBusinessLicense;
-        
+
         /// <summary>
         /// txtBL_EnableDate 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtBL_EnableDate;
-        
+
         /// <summary>
         /// btnBL_ScanUrl 控件。
         /// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnBL_ScanUrl;
-        
+
         /// <summary>
         /// cpBL 控件。
         /// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel cpBL;
-        
+
         /// <summary>
         /// divBL_ScanUrl 控件。
         /// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBL_ScanUrl;
-        
+
         /// <summary>
         /// txtOrganCode 控件。
         /// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtOrganCode;
-        
+
         /// <summary>
         /// txtO_EnableDate 控件。
         /// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtO_EnableDate;
-        
+
         /// <summary>
         /// btnO_ScanUrl 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnO_ScanUrl;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// divO_ScanUrl 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divO_ScanUrl;
-        
+
         /// <summary>
         /// txtCertificate 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCertificate;
-        
+
         /// <summary>
         /// txtC_EnableDate 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtC_EnableDate;
-        
+
         /// <summary>
         /// btnC_ScanUrl 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnC_ScanUrl;
-        
+
         /// <summary>
         /// ContentPanel2 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel2;
-        
+
         /// <summary>
         /// divC_ScanUrl 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divC_ScanUrl;
-        
+
         /// <summary>
         /// txtQualityLicense 控件。
         /// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtQualityLicense;
-        
+
         /// <summary>
         /// txtQL_EnableDate 控件。
         /// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtQL_EnableDate;
-        
+
         /// <summary>
         /// btnQL_ScanUrl 控件。
         /// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnQL_ScanUrl;
-        
+
         /// <summary>
         /// ContentPanel3 控件。
         /// </summary>
@@ -245,7 +265,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel3;
-        
+
         /// <summary>
         /// divQL_ScanUrl 控件。
         /// </summary>
@@ -254,7 +274,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divQL_ScanUrl;
-        
+
         /// <summary>
         /// txtHSELicense 控件。
         /// </summary>
@@ -263,7 +283,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHSELicense;
-        
+
         /// <summary>
         /// txtH_EnableDate 控件。
         /// </summary>
@@ -272,7 +292,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtH_EnableDate;
-        
+
         /// <summary>
         /// btnH_ScanUrl 控件。
         /// </summary>
@@ -281,7 +301,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnH_ScanUrl;
-        
+
         /// <summary>
         /// ContentPanel4 控件。
         /// </summary>
@@ -290,7 +310,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel4;
-        
+
         /// <summary>
         /// divH_ScanUrl 控件。
         /// </summary>
@@ -299,7 +319,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divH_ScanUrl;
-        
+
         /// <summary>
         /// txtHSELicense2 控件。
         /// </summary>
@@ -308,7 +328,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHSELicense2;
-        
+
         /// <summary>
         /// txtH_EnableDate2 控件。
         /// </summary>
@@ -317,7 +337,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtH_EnableDate2;
-        
+
         /// <summary>
         /// btnH_ScanUrl2 控件。
         /// </summary>
@@ -326,7 +346,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnH_ScanUrl2;
-        
+
         /// <summary>
         /// ContentPanel6 控件。
         /// </summary>
@@ -335,7 +355,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel6;
-        
+
         /// <summary>
         /// divH_ScanUrl2 控件。
         /// </summary>
@@ -344,7 +364,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divH_ScanUrl2;
-        
+
         /// <summary>
         /// txtSecurityLicense 控件。
         /// </summary>
@@ -353,7 +373,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSecurityLicense;
-        
+
         /// <summary>
         /// txtSL_EnableDate 控件。
         /// </summary>
@@ -362,7 +382,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtSL_EnableDate;
-        
+
         /// <summary>
         /// btnSL_ScanUrl 控件。
         /// </summary>
@@ -371,7 +391,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload btnSL_ScanUrl;
-        
+
         /// <summary>
         /// ContentPanel5 控件。
         /// </summary>
@@ -380,7 +400,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel5;
-        
+
         /// <summary>
         /// divSL_ScanUrl 控件。
         /// </summary>
@@ -389,7 +409,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSL_ScanUrl;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -398,7 +418,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -407,7 +427,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -416,7 +436,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx
index e0f43ff..b5fb8a2 100644
--- a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx
@@ -4,86 +4,91 @@
 <html>
 <head runat="server">
     <title>角色管理</title>
-    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />   
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="角色管理" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="RoleId" AllowCellEditing="true" EnableColumnLines="true"
-                ClicksToEdit="2" DataIDField="RoleId" AllowSorting="true" SortField="RoleCode"
-                SortDirection="ASC" OnSort="Grid1_Sort"   AllowPaging="true" IsDatabasePaging="true"
-                PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"  EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                        <Items>
-                            <f:TextBox runat="server" Label="名称" ID="txtRoleName" EmptyText="输入查询条件" 
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
-                             </f:TextBox>
-                             <f:TextBox runat="server" Label="类型" ID="txtRoleTypeName" EmptyText="输入查询条件" 
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
-                             </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden ="true">
-                            </f:Button>                           
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>                   
-                    <f:RenderField Width="100px" ColumnID="RoleCode" DataField="RoleCode" 
-                        SortField="RoleCode" FieldType="String" HeaderText="编码" HeaderTextAlign="Center"
-                        TextAlign="Left">                      
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName" EnableFilter="true"
-                        SortField="RoleName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">                      
-                    </f:RenderField> 
-                     <f:RenderField Width="90px" ColumnID="IsOfficeName" DataField="IsOfficeName" EnableFilter="true"
-                        SortField="IsOfficeName" FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
-                        TextAlign="Left">                      
-                    </f:RenderField>
-                   <%--   <f:RenderField Width="90px" ColumnID="RoleType" DataField="RoleType" EnableFilter="true"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="角色管理" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="RoleId" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="RoleId" AllowSorting="true" SortField="RoleCode"
+                    SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                    PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:TextBox runat="server" Label="名称" ID="txtRoleName" EmptyText="输入查询条件"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
+                                </f:TextBox>
+                                <%--<f:TextBox runat="server" Label="类型" ID="txtRoleTypeName" EmptyText="输入查询条件"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
+                                </f:TextBox>--%>
+                                <f:DropDownList ID="dpRoleType" runat="server" Label="类型" LabelAlign="Right" EnableEdit="true" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:ListItem Text="-请选择-" Value="" />
+                                    <f:ListItem Text="本部角色" Value="1" />
+                                    <f:ListItem Text="项目角色" Value="0" />
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="100px" ColumnID="RoleCode" DataField="RoleCode"
+                            SortField="RoleCode" FieldType="String" HeaderText="编码" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName" EnableFilter="true"
+                            SortField="RoleName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="IsOfficeName" DataField="IsOfficeName" EnableFilter="true"
+                            SortField="IsOfficeName" FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <%--   <f:RenderField Width="90px" ColumnID="RoleType" DataField="RoleType" EnableFilter="true"
                         SortField="RoleType" FieldType="String" HeaderText="级别" HeaderTextAlign="Center"
                         TextAlign="Left">                      
                     </f:RenderField>--%>
-                    <f:CheckBoxField Width="100px" RenderAsStaticField="true" TextAlign="Center"  DataField="IsSystemBuilt" HeaderText="内置" />
-                       <f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center"  DataField="IsAuditFlow" HeaderText="参与审批" />
-                    <f:RenderField  ColumnID="Def" DataField="Def" SortField="Def" FieldType="String" Width="150px"
-                        HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" >
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                   
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="角色管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Self" EnableResize="false" runat="server" IsModal="true" 
-        Width="700px" Height="400px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
-            runat="server" Text="编辑" Hidden ="true" Icon="Pencil">
-        </f:MenuButton>       
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"  Icon="Delete"
-            ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Hidden ="true">
-        </f:MenuButton>        
-    </f:Menu>
+                        <f:CheckBoxField Width="100px" RenderAsStaticField="true" TextAlign="Center" DataField="IsSystemBuilt" HeaderText="内置" />
+                        <f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center" DataField="IsAuditFlow" HeaderText="参与审批" />
+                        <f:RenderField ColumnID="Def" DataField="Def" SortField="Def" FieldType="String" Width="150px"
+                            HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="角色管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="false" runat="server" IsModal="true"
+            Width="700px" Height="400px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Hidden="true" Icon="Pencil">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Hidden="true">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/jscript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.cs
index 91f53a9..789309a 100644
--- a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.cs
@@ -15,7 +15,7 @@
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
-        {           
+        {
             if (!IsPostBack)
             {
                 ////权限按钮方法
@@ -39,14 +39,20 @@
         {
             string strSql = @"SELECT Roles.RoleId,Roles.RoleName,Roles.RoleCode,Roles.Def,Roles.IsSystemBuilt,IsAuditFlow"
                           + @" ,(CASE WHEN IsOffice=1 THEN '本部角色' ELSE '项目角色' END) AS IsOfficeName"
-                          + @" FROM dbo.Sys_Role AS Roles "                          
+                          + @" FROM dbo.Sys_Role AS Roles "
                           + @" WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtRoleName.Text.Trim()))
             {
                 strSql += " AND RoleName LIKE @RoleName";
                 listStr.Add(new SqlParameter("@RoleName", "%" + this.txtRoleName.Text.Trim() + "%"));
-            }       
+            }
+            var roleType = this.dpRoleType.SelectedValue;
+            if (!string.IsNullOrWhiteSpace(roleType))
+            {
+                strSql += " AND IsOffice = @RoleType";
+                listStr.Add(new SqlParameter("@RoleType", roleType));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -55,7 +61,7 @@
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
-        
+
         #region  删除数据
         /// <summary>
         /// 右键删除事件
@@ -84,7 +90,7 @@
                         {
                             BLL.LogService.AddSys_Log(this.CurrUser, roles.RoleCode, roles.RoleId, Const.RoleMenuId, Const.BtnDelete);
                             BLL.RoleService.DeleteRole(rowID);
-                          
+
                         }
                     }
                 }
@@ -102,7 +108,7 @@
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
-        {            
+        {
             BindGrid();
         }
 
@@ -160,7 +166,7 @@
             }
             string Id = Grid1.SelectedRowID;
             var roles = BLL.RoleService.GetRoleByRoleId(Id);
-            if (roles != null && (!roles.IsSystemBuilt.HasValue || roles.IsSystemBuilt == false || this.CurrUser.UserId == BLL.Const.sysglyId ))
+            if (roles != null && (!roles.IsSystemBuilt.HasValue || roles.IsSystemBuilt == false || this.CurrUser.UserId == BLL.Const.sysglyId))
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RoleListEdit.aspx?roleId={0}", Id, "编辑 - ")));
             }
@@ -188,7 +194,7 @@
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
-                    this.btnMenuEdit.Hidden = false;                   
+                    this.btnMenuEdit.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
@@ -222,7 +228,7 @@
             {
                 content = "该角色已在【用户信息】中使用，不能删除！";
             }
-          
+
             if (string.IsNullOrEmpty(content))
             {
                 return true;
diff --git a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.designer.cs
index 6bcf3ff..b0fe40f 100644
--- a/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/RoleList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.SysManage {
-    
-    
-    public partial class RoleList {
-        
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class RoleList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtRoleName 控件。
         /// </summary>
@@ -65,16 +67,16 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRoleName;
-        
+
         /// <summary>
-        /// txtRoleTypeName 控件。
+        /// dpRoleType 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtRoleTypeName;
-        
+        protected global::FineUIPro.DropDownList dpRoleType;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx
index f5719a6..33b7629 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx
@@ -7,8 +7,7 @@
     <title>导入人员信息</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
-        .f-grid-row .f-grid-cell-inner
-        {
+        .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
         }
@@ -16,112 +15,78 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <Toolbars>
-            <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1"
-                        OnClick="btnAudit_Click">
-                    </f:Button>                 
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
-                        OnClick="btnSave_Click">
-                    </f:Button>
-                    <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
-                        LabelWidth="150px">
-                    </f:FileUpload>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
-                        EnableColumnLines="true" BoxFlex="1" DataKeyNames="RCount" AllowCellEditing="true"
-                        ClicksToEdit="2" DataIDField="RCount" AllowSorting="true" SortField="RCount"
-                        PageSize="50" Height="360px">
-                        <Columns>
-                            <f:TemplateField Width="55px" HeaderText="序号">
-                                <ItemTemplate>
-                                    <asp:Label ID="Label2" runat="server" Text='<%# Container.DataItemIndex + 1 %>'></asp:Label>
-                                </ItemTemplate>
-                            </f:TemplateField>
-                              <f:RenderField Width="80px" ColumnID="RCount" DataField="RCount" FieldType="Int"
-                                HeaderText="行号" HeaderTextAlign="Center" TextAlign="Right">
-                            </f:RenderField>
-                            <f:RenderField Width="90px" ColumnID="UserCode" DataField="UserCode" FieldType="String"
-                                HeaderText="用户编号" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="80px" ColumnID="UserName" DataField="UserName"
-                                SortField="UserName" FieldType="String" HeaderText="人员姓名" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                             <f:RenderField Width="80px" ColumnID="Account" DataField="Account"
-                                SortField="Account" FieldType="String" HeaderText="账号" HeaderTextAlign="Center"
-                                TextAlign="Left">
-                            </f:RenderField>
-                              <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
-                                HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="120px" ColumnID="DepartName" DataField="DepartName" FieldType="String"
-                                HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                             <f:RenderField Width="90px" ColumnID="RoleName" DataField="RoleName" FieldType="String"
-                                HeaderText="角色" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>                          
-                            <f:RenderField Width="200px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
-                                FieldType="String" HeaderText="身份证号" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                              <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
-                                FieldType="String" HeaderText="手机号码" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:CheckBoxField Width="60px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
-                                HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:CheckBoxField>  
-                               <f:CheckBoxField Width="60px" SortField="IsOffice" RenderAsStaticField="true" DataField="IsOffice"
-                                HeaderText="本部" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:CheckBoxField>  
-                            <f:RenderField Width="80px" ColumnID="MainCNProfessionalName" DataField="MainCNProfessionalName" FieldType="String"
-                                HeaderText="主专业" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                            <f:RenderField Width="120px" ColumnID="ViceCNProfessionalName" DataField="ViceCNProfessionalName" FieldType="String"
-                                HeaderText="副专业" HeaderTextAlign="Center" TextAlign="Left">
-                            </f:RenderField>
-                        </Columns>
-                    </f:Grid>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:HiddenField ID="hdFileName" runat="server">
-                    </f:HiddenField>
-                    <f:HiddenField ID="hdCheckResult" runat="server">
-                    </f:HiddenField>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Label ID="lblBottom" runat="server" Text="说明：1 人员信息导入模板为.xls后缀的EXCEL文件，黑体字为必填项。2 身份证号码必须为15或18位，所属单位、角色等必须与基础信息中对应类型的名称一致,否则无法导入。3 如需修改已有人员信息，请到系统中修改。4 数据审核后，点击“保存”，即可完成人员信息导入。">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-        </Rows>
-    </f:Form>
-    <f:Window ID="Window1" Title="审核人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="false"
-        CloseAction="HidePostBack" Width="900px" Height="600px">
-    </f:Window>
-    <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
-        CloseAction="HidePostBack" Width="900px" Height="600px">
-    </f:Window>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="导入人员信息" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="false" IsDatabasePaging="false" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True" Height="400">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号" Width="50px">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列" Width="100px">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型" MinWidth="220px">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Label ID="lblBottom" runat="server" Text="说明：1 人员信息导入模板为.xls后缀的EXCEL文件，有填充色项为必填项。2 身份证号码必须为15或18位，所属单位、角色等必须与基础信息中对应类型的名称一致,否则无法导入。3 如需修改已有人员信息，请到系统中修改。4 数据审核后，点击“保存”，即可完成人员信息导入。">
+                        </f:Label>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+        <f:Window ID="Window1" Title="审核人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="false"
+            CloseAction="HidePostBack" Width="900px" Height="600px">
+        </f:Window>
+        <%--<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
+            CloseAction="HidePostBack" Width="900px" Height="600px">
+        </f:Window>--%>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
index ccf5afd..f298538 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.cs
@@ -6,6 +6,8 @@ using System.IO;
 using System.Linq;
 using System.Web.UI;
 using BLL;
+using FineUIPro.Web.HSSE.PostTraining;
+using Model;
 
 namespace FineUIPro.Web.SysManage
 {
@@ -22,10 +24,17 @@ namespace FineUIPro.Web.SysManage
         /// </summary>
         public static List<Model.View_Sys_User> userViews = new List<Model.View_Sys_User>();
 
+        ///// <summary>
+        ///// 错误集合
+        ///// </summary>
+        //public static string errorInfos = string.Empty;
+
         /// <summary>
         /// 错误集合
         /// </summary>
-        public static string errorInfos = string.Empty;
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+
+
         #endregion
 
         #region 加载页面
@@ -44,7 +53,11 @@ namespace FineUIPro.Web.SysManage
                 {
                     userViews.Clear();
                 }
-                errorInfos = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                //errorInfos = string.Empty;
             }
         }
         #endregion
@@ -74,10 +87,14 @@ namespace FineUIPro.Web.SysManage
                 {
                     userViews.Clear();
                 }
-                if (!string.IsNullOrEmpty(errorInfos))
+                if (errorInfos != null)
                 {
-                    errorInfos = string.Empty;
+                    errorInfos.Clear();
                 }
+                //if (!string.IsNullOrWhiteSpace(errorInfos))
+                //{
+                //    errorInfos = string.Empty;
+                //}
                 string rootPath = Server.MapPath("~/");
                 string initFullPath = rootPath + initPath;
                 if (!Directory.Exists(initFullPath))
@@ -159,6 +176,7 @@ namespace FineUIPro.Web.SysManage
             ir = pds.Rows.Count;
             if (pds != null && ir > 0)
             {
+                var users = from x in Funs.DB.View_Sys_User select x;
                 var units = from x in Funs.DB.Base_Unit select x;
                 var roles = from x in Funs.DB.Sys_Role select x;
                 var departs = from x in Funs.DB.Base_Depart select x;
@@ -183,22 +201,44 @@ namespace FineUIPro.Web.SysManage
                         ViceCNProfessionalName = pds.Rows[i][11].ToString().Trim()
                     };
 
-                    if (string.IsNullOrEmpty(newSysUser.UserName))
+                    if (string.IsNullOrWhiteSpace(newSysUser.UserCode))
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "人员姓名" + "," + "此项为必填项！" + "|";
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "员工编号", Reason = "此项为必填项！" });
                     }
-                    if (string.IsNullOrEmpty(newSysUser.Account))
+                    else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "登录账号" + "," + "此项为必填项！" + "|";
+                        //判断人员编号是否存在
+                        bool isexist = users.Where(x => x.UserCode == newSysUser.UserCode).Any();
+                        if (isexist)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "员工编号", Reason = $"已存在编号为[{newSysUser.UserCode}]的人员！" });
+                        }
+                    }
+                    if (!string.IsNullOrWhiteSpace(newSysUser.IdentityCard))
+                    {
+                        //判断人员编号是否存在
+                        bool isexist = users.Where(x => x.IdentityCard == newSysUser.IdentityCard).Any();
+                        if (isexist)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "身份证号", Reason = $"已存在身份证号为[{newSysUser.IdentityCard}]的人员！" });
+                        }
+                    }
+                    if (string.IsNullOrWhiteSpace(newSysUser.UserName))
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "人员姓名", Reason = "此项为必填项！" });
+                    }
+                    if (string.IsNullOrWhiteSpace(newSysUser.Account))
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "登录账号", Reason = "此项为必填项！" });
                     }
 
                     string unitName = newSysUser.UnitName;
-                    if (!string.IsNullOrEmpty(unitName))
+                    if (!string.IsNullOrWhiteSpace(unitName))
                     {
                         var unit = units.FirstOrDefault(e => e.UnitName == unitName);
                         if (unit == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "单位" + "," + "[" + unitName + "]不在单位表中！" + "|";
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "单位", Reason = $"[{unitName}]不在单位表中！" });
                         }
                         else
                         {
@@ -208,52 +248,78 @@ namespace FineUIPro.Web.SysManage
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "单位" + "," + "此项为必填项！" + "|";
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "单位", Reason = "此项为必填项！" });
                     }
 
                     string departName = newSysUser.DepartName;
-                    if (!string.IsNullOrEmpty(departName))
+                    if (!string.IsNullOrWhiteSpace(departName))
                     {
                         var depart = departs.FirstOrDefault(e => e.DepartName == departName);
                         if (depart == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "部门" + "," + "[" + departName + "]不在部门表中！" + "|";
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "部门", Reason = $"[{departName}]不在部门表中！" });
                         }
                         else
                         {
                             newSysUser.DepartId = depart.DepartId;
                         }
-
                     }
                     else
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "部门" + "," + "此项为必填项！" + "|";
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "部门", Reason = "此项为必填项！" });
                     }
 
                     string roleName = newSysUser.RoleName;
-                    var role = roles.FirstOrDefault(e => e.RoleName == roleName);
-                    if (role == null)
+                    string roleIds = string.Empty;
+                    string roleNames = string.Empty;
+                    if (!string.IsNullOrWhiteSpace(roleName))
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "角色" + "," + "[" + roleName + "]错误！" + "|";
-                    }
-                    else
-                    {
-                        newSysUser.RoleId = role.RoleId;
-                        newSysUser.RoleName = role.RoleName;
+                        var roleNameList = roleName.Split(',');
+                        string errRoleName = string.Empty;
+                        foreach (var rol in roleNameList)
+                        {
+                            var role = roles.FirstOrDefault(e => e.RoleName == rol);
+                            if (role == null)
+                            {
+                                errRoleName = !string.IsNullOrWhiteSpace(errRoleName) ? $"{errRoleName},{rol}" : rol;
+                            }
+                            else
+                            {
+                                roleIds = !string.IsNullOrWhiteSpace(roleIds) ? $"{roleIds},{role.RoleId}" : role.RoleId;
+                                roleNames = !string.IsNullOrWhiteSpace(roleNames) ? $"{roleNames},{role.RoleName}" : role.RoleName;
+                            }
+                        }
+                        if (!string.IsNullOrWhiteSpace(errRoleName))
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "角色", Reason = $"[{errRoleName}]不在角色表中！" });
+                        }
                     }
+                    newSysUser.RoleId = roleIds;
+                    newSysUser.RoleName = roleNames;
+
+                    //var role = roles.FirstOrDefault(e => e.RoleName == roleName);
+                    //if (role == null)
+                    //{
+                    //    result += "第" + (i + 2).ToString() + "行," + "角色" + "," + "[" + roleName + "]错误！" + "|";
+                    //}
+                    //else
+                    //{
+                    //    newSysUser.RoleId = role.RoleId;
+                    //    newSysUser.RoleName = role.RoleName;
+                    //}
 
                     if (!newSysUser.IsPost.HasValue)
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "在岗" + "," + "此项为必填项！" + "|";
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "在岗", Reason = "此项为必填项！" });
                     }
 
                     string mainCNProfessionalName = newSysUser.MainCNProfessionalName;
-                    if (!string.IsNullOrEmpty(mainCNProfessionalName))
+                    if (!string.IsNullOrWhiteSpace(mainCNProfessionalName))
                     {
                         var cNProfessional = cNProfessionals.FirstOrDefault(e => e.ProfessionalName == mainCNProfessionalName);
                         if (cNProfessional == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "主专业" + "," + "[" + mainCNProfessionalName + "]不在专业表中！" + "|";
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "主专业", Reason = $"[{mainCNProfessionalName}]不在专业表中！" });
                         }
                         else
                         {
@@ -262,20 +328,22 @@ namespace FineUIPro.Web.SysManage
                     }
 
                     string viceCNProfessionalName = newSysUser.ViceCNProfessionalName;
-                    if (!string.IsNullOrEmpty(viceCNProfessionalName))
+                    if (!string.IsNullOrWhiteSpace(viceCNProfessionalName))
                     {
                         string viceCNProfessionalId = string.Empty;
                         bool hasErr = false;
                         string[] strs = viceCNProfessionalName.Split('，');
+                        string errViceCNProfessionalName = string.Empty;
                         foreach (var item in strs)
                         {
-                            if (!string.IsNullOrEmpty(item))
+                            if (!string.IsNullOrWhiteSpace(item))
                             {
                                 var cNProfessional = cNProfessionals.FirstOrDefault(e => e.ProfessionalName == item);
                                 if (cNProfessional == null)
                                 {
                                     hasErr = true;
-                                    result += "第" + (i + 2).ToString() + "行," + "副专业" + "," + "[" + item + "]不在专业表中！" + "|";
+                                    //result += "第" + (i + 2).ToString() + "行," + "副专业" + "," + "[" + item + "]不在专业表中！" + "|";
+                                    errViceCNProfessionalName = !string.IsNullOrWhiteSpace(errViceCNProfessionalName) ? $"{errViceCNProfessionalName},{item}" : item;
                                 }
                                 else
                                 {
@@ -283,7 +351,11 @@ namespace FineUIPro.Web.SysManage
                                 }
                             }
                         }
-                        if (!string.IsNullOrEmpty(viceCNProfessionalId))
+                        if (!string.IsNullOrWhiteSpace(errViceCNProfessionalName))
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "副专业", Reason = $"[{errViceCNProfessionalName}]不在专业表中！" });
+                        }
+                        if (!string.IsNullOrWhiteSpace(viceCNProfessionalId))
                         {
                             viceCNProfessionalId = viceCNProfessionalId.Substring(0, viceCNProfessionalId.Length - 1);
                         }
@@ -296,31 +368,22 @@ namespace FineUIPro.Web.SysManage
                     ///加入用户视图
                     userViews.Add(newSysUser);
                 }
-                if (!string.IsNullOrEmpty(result))
+                if (errorInfos.Any())
                 {
                     userViews.Clear();
-                    result = result.Substring(0, result.LastIndexOf("|"));
-                    errorInfos = result;
-                    Alert alert = new Alert
-                    {
-                        Message = result,
-                        Target = Target.Self
-                    };
-                    alert.Show();
+                    this.gvErrorInfo.DataSource = errorInfos;
+                    this.gvErrorInfo.DataBind();
                 }
                 else
                 {
-                    errorInfos = string.Empty;
-                    if (userViews.Count > 0)
+                    errorInfos.Clear();
+                    if (!userViews.Any())
                     {
-                        this.Grid1.Hidden = false;
-                        this.Grid1.DataSource = userViews;
-                        this.Grid1.DataBind();
-                        Alert.ShowInTop("审核完成,请点击保存！", MessageBoxIcon.Success);
+                        Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Warning);
                     }
                     else
                     {
-                        Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Warning);
+                        ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
                     }
                 }
             }
@@ -341,7 +404,7 @@ namespace FineUIPro.Web.SysManage
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(errorInfos))
+            if (!errorInfos.Any())
             {
                 int a = userViews.Count();
                 int insertCount = 0;
@@ -354,19 +417,19 @@ namespace FineUIPro.Web.SysManage
                         UserName = userViews[i].UserName,
                         Account = userViews[i].Account,
                         UnitId = userViews[i].UnitId,
-                        DepartId=userViews[i].DepartId,
+                        DepartId = userViews[i].DepartId,
                         RoleId = userViews[i].RoleId,
                         IdentityCard = userViews[i].IdentityCard,
                         Telephone = userViews[i].Telephone,
                         IsPost = userViews[i].IsPost,
                         IsOffice = userViews[i].IsOffice,
-                        MainCNProfessionalId=userViews[i].MainCNProfessionalId,
-                        ViceCNProfessionalId=userViews[i].ViceCNProfessionalId,
+                        MainCNProfessionalId = userViews[i].MainCNProfessionalId,
+                        ViceCNProfessionalId = userViews[i].ViceCNProfessionalId,
                     };
                     var getUser = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == userViews[i].Account);
                     if (getUser == null)
                     {
-                        newUser.Password = Funs.EncryptionPassword(Const.Password); 
+                        newUser.Password = Funs.EncryptionPassword(Const.Password);
                         newUser.RawPassword = Const.Password;
                         BLL.UserService.AddUser(newUser);
                         insertCount++;
@@ -396,24 +459,24 @@ namespace FineUIPro.Web.SysManage
         #endregion        
 
         #region 关闭弹出窗口
-        /// <summary>
-        /// 关闭导入弹出窗口
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Window2_Close(object sender, WindowCloseEventArgs e)
-        {
-            if (Session["sysUsers"] != null)
-            {
-                userViews = Session["sysUsers"] as List<Model.View_Sys_User>;
-            }
-            if (userViews.Count > 0)
-            {
-                this.Grid1.Hidden = false;
-                this.Grid1.DataSource = userViews;
-                this.Grid1.DataBind();
-            }
-        }
+        ///// <summary>
+        ///// 关闭导入弹出窗口
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param>
+        //protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        //{
+        //    if (Session["sysUsers"] != null)
+        //    {
+        //        userViews = Session["sysUsers"] as List<Model.View_Sys_User>;
+        //    }
+        //    if (userViews.Count > 0)
+        //    {
+        //        this.Grid1.Hidden = false;
+        //        this.Grid1.DataSource = userViews;
+        //        this.Grid1.DataBind();
+        //    }
+        //}
 
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.designer.cs
index 8c7d14b..c240703 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserIn.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.SysManage {
-    
-    
-    public partial class UserIn {
-        
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class UserIn
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// btnAudit 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAudit;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnDownLoad 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDownLoad;
-        
+
         /// <summary>
         /// fuAttachUrl 控件。
         /// </summary>
@@ -83,25 +85,25 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload fuAttachUrl;
-        
+
         /// <summary>
-        /// Grid1 控件。
+        /// gvErrorInfo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
-        
+        protected global::FineUIPro.Grid gvErrorInfo;
+
         /// <summary>
-        /// Label2 控件。
+        /// lblPageIndex 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
-        
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
         /// <summary>
         /// hdFileName 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdFileName;
-        
+
         /// <summary>
         /// hdCheckResult 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCheckResult;
-        
+
         /// <summary>
         /// lblBottom 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblBottom;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,14 +139,5 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
-        /// <summary>
-        /// Window2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window2;
     }
 }
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
index 5368854..83b6554 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
@@ -22,7 +22,7 @@
                     runat="server" BoxFlex="1" DataKeyNames="UserId" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="UserId" AllowSorting="true" SortField="UnitName,UserCode" ForceFit="true"
                     SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                    PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                    PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
                     OnRowDoubleClick="Grid1_RowDoubleClick" Width="980px" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
@@ -56,40 +56,40 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
-                        <f:RenderField Width="100px" ColumnID="UserCode" DataField="UserCode" SortField="UserCode"
+                        <f:RenderField Width="90px" ColumnID="UserCode" DataField="UserCode" SortField="UserCode"
                             FieldType="String" HeaderText="员工编号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                        <f:RenderField Width="120px" ColumnID="UserName" DataField="UserName" SortField="UserName"
                             FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="230px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                            FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode"
+                        <%--<f:RenderField Width="100px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode"
                             FieldType="String" HeaderText="单位编号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>--%>
+                        <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                            FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
                             FieldType="String" HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="Account" DataField="Account" SortField="Account"
+                        <f:RenderField Width="100px" ColumnID="Account" DataField="Account" SortField="Account"
                             FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <%-- <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
                             FieldType="String" HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Right" Hidden="true">
                         </f:RenderField>--%>
-                        <f:RenderField Width="150px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
+                        <f:RenderField Width="230px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
                             FieldType="String" HeaderText="本部角色" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
                             FieldType="String" HeaderText="手机号码" HeaderTextAlign="Center" TextAlign="Right" Hidden="true">
                         </f:RenderField>
-                        <f:CheckBoxField Width="60px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
+                        <f:CheckBoxField Width="50px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
                             HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
                         <%--       <f:CheckBoxField Width="50px" SortField="IsOffice" RenderAsStaticField="true" DataField="IsOffice"
                             HeaderText="本部" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>--%>
-                        <f:TemplateField Width="200px" ColumnID="UserId" HeaderText="参与项目" TextAlign="Left">
+                        <f:TemplateField Width="180px" ColumnID="UserId" HeaderText="参与项目" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnPro" runat="server" Text='<%# ConvertProject(Eval("UserId")) %>' OnClick="lbtnPro_Click"></asp:LinkButton>
                             </ItemTemplate>
@@ -116,7 +116,7 @@
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
-            CloseAction="HidePostBack" Width="1000px" Height="560px">
+            CloseAction="HidePostBack" Width="1000px" Height="620px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
index c8594e4..10edefe 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
@@ -1,18 +1,18 @@
 namespace FineUIPro.Web.SysManage
 {
     using System;
-	using System.Collections.Generic;
-	using System.Data;
+    using System.Collections.Generic;
+    using System.Data;
     using System.Data.SqlClient;
     using System.Linq;
     using BLL;
-	using Newtonsoft.Json.Linq;
-	using Newtonsoft.Json;
-	using System.Collections;
-	using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
+    using Newtonsoft.Json.Linq;
+    using Newtonsoft.Json;
+    using System.Collections;
+    using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 
-	public partial class UserList : PageBase
-    { 
+    public partial class UserList : PageBase
+    {
         /// <summary>
         /// 加载页面
         /// </summary>
@@ -44,13 +44,13 @@
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT Users.UserId,Users.Account,Users.UserCode,Users.Password,Users.UserName,Depart.DepartName,Users.RoleId,Users.UnitId,Users.IsPost,CASE WHEN  Users.IsPost=1 THEN '是' ELSE '否' END AS IsPostName,Users.IdentityCard,Users.Telephone,Users.IsOffice,UnitCode,"
-                          + @"Roles.RoleName,Unit.UnitName,Unit.UnitCode"
-                          + @" From dbo.Sys_User AS Users"
-                          + @" LEFT JOIN Sys_Role AS Roles ON Roles.RoleId=Users.RoleId"
-                          + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId"
-                          + @" LEFT JOIN Base_Depart AS Depart ON Depart.DepartId=Users.DepartId"
-                          + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "'";
+            string strSql = $@"SELECT Users.UserId,Users.Account,Users.UserCode,Users.Password,Users.UserName,Depart.DepartName,Users.RoleId,Users.UnitId,Users.IsPost,CASE WHEN  Users.IsPost=1 THEN '是' ELSE '否' END AS IsPostName,Users.IdentityCard,Users.Telephone,Users.IsOffice,UnitCode,Unit.UnitName,Unit.UnitCode 
+ ,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +Users.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')                
+                            From dbo.Sys_User AS Users 
+                                LEFT JOIN Sys_Role AS Roles ON Roles.RoleId=Users.RoleId 
+                                LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId 
+                                LEFT JOIN Base_Depart AS Depart ON Depart.DepartId=Users.DepartId 
+                            WHERE Users.UserId !='{Const.sysglyId}' AND Users.UserId !='{Const.hfnbdId}'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             //strSql += " AND Users.UnitId = @ThisUnitId";
             //listStr.Add(new SqlParameter("@ThisUnitId", Const.UnitId_CWCEC));
@@ -328,94 +328,94 @@
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnImport1_Click(object sender, EventArgs e)
-		{
-			//同步项目
-			int total = 10;
-			int pageSize = 100;
-			int pageIndex = 0;
-			while (pageSize * pageIndex <= total)
-			{
-				string pushContent = string.Empty;
-				var dictTypeCode = new
-				{
-					criteria = new { _expr = new[] {  new { _property = "isusedcode", _value = "0", _op = "=" } } },
-					pageSize = pageSize,
-					pageIndex = pageIndex
-				};
-				Hashtable newToken = new Hashtable
-				{
-					{ "userName", "nuobida_construction" },
-					{ "password", "nuobida@2023" },
-					{ "ClientId", "com.tcc.pm.sggl" },
-					{ "OperationCode", "com.tcc.dm.mdm.ee.basicinfo" }
-				};
-				pushContent = JsonConvert.SerializeObject(dictTypeCode);
-				string returndata = APIGetHttpService.OutsideHttp("https://esb.china-tcc.com:9090/com/tcc/dm/mdm/TCC_TM_EE_BASIC_INFO", "POST", "application/json;charset=utf-8", newToken, pushContent);
-				if (!string.IsNullOrEmpty(returndata))
-				{
-					JObject obj = JObject.Parse(returndata);
-					total = int.Parse(obj["total"].ToString());
-					string datas = obj["datas"].ToString();
-					JArray arr = JArray.Parse(datas);
-					foreach (var item in arr)
-					{
-						string full_name = item["full_name"].ToString();
- 						string genderCode = item["gender_code"].ToString();
-						string idcard = item["idcard"].ToString();
-						string data_source_code = item["data_source_code"].ToString();
-						string hrp_personnel_unique_id = item["hrp_personnel_unique_id"].ToString();
-						string cellphone = item["cellphone"].ToString();
-						string domainAccount = item["domain_account"].ToString();
-						 
-						if (!string.IsNullOrEmpty(idcard))
-						{
-							var sysUser = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == idcard );
-							if (sysUser != null)
-							{
-								sysUser.UserName = full_name;
-								sysUser.Telephone = cellphone;
-								sysUser.DomainAccount = domainAccount;
-								sysUser.Sex = genderCode;
+        {
+            //同步项目
+            int total = 10;
+            int pageSize = 100;
+            int pageIndex = 0;
+            while (pageSize * pageIndex <= total)
+            {
+                string pushContent = string.Empty;
+                var dictTypeCode = new
+                {
+                    criteria = new { _expr = new[] { new { _property = "isusedcode", _value = "0", _op = "=" } } },
+                    pageSize = pageSize,
+                    pageIndex = pageIndex
+                };
+                Hashtable newToken = new Hashtable
+                {
+                    { "userName", "nuobida_construction" },
+                    { "password", "nuobida@2023" },
+                    { "ClientId", "com.tcc.pm.sggl" },
+                    { "OperationCode", "com.tcc.dm.mdm.ee.basicinfo" }
+                };
+                pushContent = JsonConvert.SerializeObject(dictTypeCode);
+                string returndata = APIGetHttpService.OutsideHttp("https://esb.china-tcc.com:9090/com/tcc/dm/mdm/TCC_TM_EE_BASIC_INFO", "POST", "application/json;charset=utf-8", newToken, pushContent);
+                if (!string.IsNullOrEmpty(returndata))
+                {
+                    JObject obj = JObject.Parse(returndata);
+                    total = int.Parse(obj["total"].ToString());
+                    string datas = obj["datas"].ToString();
+                    JArray arr = JArray.Parse(datas);
+                    foreach (var item in arr)
+                    {
+                        string full_name = item["full_name"].ToString();
+                        string genderCode = item["gender_code"].ToString();
+                        string idcard = item["idcard"].ToString();
+                        string data_source_code = item["data_source_code"].ToString();
+                        string hrp_personnel_unique_id = item["hrp_personnel_unique_id"].ToString();
+                        string cellphone = item["cellphone"].ToString();
+                        string domainAccount = item["domain_account"].ToString();
 
-								//sysUser.DataSource = "数据同步";
-								Funs.DB.SubmitChanges();
-							}
-							else
-							{
-								sysUser = new Model.Sys_User
-								{
-									UserId = SQLHelper.GetNewID(),
-								};
-								sysUser.UnitId = BLL.Const.UnitId_XJYJ;
-								sysUser.UserCode = domainAccount;
-								sysUser.UserName = full_name;
-								sysUser.Telephone = cellphone;
-								sysUser.IdentityCard = idcard;
-								sysUser.Account = domainAccount;
-								sysUser.DomainAccount = domainAccount;
-								sysUser.Password = Funs.EncryptionPassword(BLL.Const.Password);
-								sysUser.RawPassword = BLL.Const.Password;
-								sysUser.IsPost = true;
-								sysUser.DataSource = "数据同步";
-								Funs.DB.Sys_User.InsertOnSubmit(sysUser);
-								Funs.DB.SubmitChanges();
-							}
-						}
-					}
+                        if (!string.IsNullOrEmpty(idcard))
+                        {
+                            var sysUser = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == idcard);
+                            if (sysUser != null)
+                            {
+                                sysUser.UserName = full_name;
+                                sysUser.Telephone = cellphone;
+                                sysUser.DomainAccount = domainAccount;
+                                sysUser.Sex = genderCode;
 
-				}
-				pageIndex++;
-			}
+                                //sysUser.DataSource = "数据同步";
+                                Funs.DB.SubmitChanges();
+                            }
+                            else
+                            {
+                                sysUser = new Model.Sys_User
+                                {
+                                    UserId = SQLHelper.GetNewID(),
+                                };
+                                sysUser.UnitId = BLL.Const.UnitId_XJYJ;
+                                sysUser.UserCode = domainAccount;
+                                sysUser.UserName = full_name;
+                                sysUser.Telephone = cellphone;
+                                sysUser.IdentityCard = idcard;
+                                sysUser.Account = domainAccount;
+                                sysUser.DomainAccount = domainAccount;
+                                sysUser.Password = Funs.EncryptionPassword(BLL.Const.Password);
+                                sysUser.RawPassword = BLL.Const.Password;
+                                sysUser.IsPost = true;
+                                sysUser.DataSource = "数据同步";
+                                Funs.DB.Sys_User.InsertOnSubmit(sysUser);
+                                Funs.DB.SubmitChanges();
+                            }
+                        }
+                    }
 
-			BindGrid();
-		}
+                }
+                pageIndex++;
+            }
 
-		/// <summary>
-		/// 关闭导入弹出窗口
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		protected void Window2_Close(object sender, WindowCloseEventArgs e)
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭导入弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
         {
             BindGrid();
         }
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
index 6142e65..3067a63 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
@@ -14,19 +14,19 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtUserCode" runat="server" Label="员工编号" MaxLength="20"  LabelWidth="90px">
+                        <f:TextBox ID="txtUserCode" runat="server" Label="员工编号" MaxLength="20" LabelWidth="90px">
                         </f:TextBox>
                         <f:TextBox ID="txtUserName" runat="server" Label="姓名" Required="true" ShowRedStar="true" MaxLength="20"
                             FocusOnPageLoad="true" LabelWidth="90px">
                         </f:TextBox>
-                          <f:TextBox ID="txtAccount" runat="server" Label="登录账号" Required="true" ShowRedStar="true" MaxLength="50" 
-                              LabelWidth="90px">
+                        <f:TextBox ID="txtAccount" runat="server" Label="登录账号" Required="true" ShowRedStar="true" MaxLength="50"
+                            LabelWidth="90px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                          <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="90px">
                         </f:DropDownList>
                         <f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" MaxLength="50" ShowRedStar="true" Required="true"
@@ -37,50 +37,50 @@
                     </Items>
                 </f:FormRow>
                 <f:FormRow runat="server" ID="trServer">
-                    <Items>                      
+                    <Items>
                         <f:DropDownList ID="drpDepart" runat="server" Label="部门" ShowRedStar="true" Required="true"
                             EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"  
+                        <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"
                             EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
-                          <f:DropDownList ID="drpRole" runat="server" Label="本部角色" EnableEdit="true" ForceSelection="false" LabelWidth="90px">
+                        <f:DropDownList ID="drpRole" runat="server" Label="本部角色" EmptyText="请选择" AutoSelectFirstItem="false" EnableCheckBoxSelect="true" EnableEdit="true" EnableMultiSelect="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
                     </Items>
-                </f:FormRow>                
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
-                          <f:DropDownList ID="drpIsPost" runat="server" Label="在岗" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpIsPost" runat="server" Label="在岗" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="90px">
                         </f:DropDownList>
-                         <f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="35px" ImageWidth="90px" 
-                                BoxFlex="1" Label="签名" LabelWidth="90px">
-                            </f:Image>
-                            <f:FileUpload runat="server" ID="fileSignature" EmptyText="请选择"
-                                OnFileSelected="btnSignature_Click" AutoPostBack="true" Width="150px" LabelWidth="90px">
-                            </f:FileUpload>
+                        <f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="35px" ImageWidth="90px"
+                            BoxFlex="1" Label="签名" LabelWidth="90px">
+                        </f:Image>
+                        <f:FileUpload runat="server" ID="fileSignature" EmptyText="请选择"
+                            OnFileSelected="btnSignature_Click" AutoPostBack="true" Width="150px" LabelWidth="90px">
+                        </f:FileUpload>
                     </Items>
-                </f:FormRow>  
+                </f:FormRow>
                 <f:FormRow runat="server">
-                    <Items>                      
-                          <f:DropDownList ID="drpMainCNProfessional" runat="server" Label="主专业" EnableEdit="true" LabelWidth="90px">
+                    <Items>
+                        <f:DropDownList ID="drpMainCNProfessional" runat="server" Label="主专业" EnableEdit="true" LabelWidth="90px">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true"
+                            EnableMultiSelect="true" MaxLength="500" EnableCheckBoxSelect="true">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpViceCNProfessional" runat="server" Label="副专业" EnableEdit="true" 
-                        EnableMultiSelect="true" MaxLength="500" EnableCheckBoxSelect="true">
-                    </f:DropDownList>
                         <f:RadioButtonList runat="server" ID="rblHomePageType" Label="首页加载">
                             <f:RadioItem Text="施工管理" Value="1" Selected="true" />
                             <f:RadioItem Text="QHSE" Value="2" />
                         </f:RadioButtonList>
                     </Items>
-                </f:FormRow>   
+                </f:FormRow>
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
-                         <f:Button ID="btnArrowRefresh" Text="重置密码" Icon="ArrowRefresh" ConfirmText="确定恢复当前用户原始密码？" OnClick="btnArrowRefresh_Click"
-                                runat="server" Hidden="true">
-                            </f:Button>  
+                        <f:Button ID="btnArrowRefresh" Text="重置密码" Icon="ArrowRefresh" ConfirmText="确定恢复当前用户原始密码？" OnClick="btnArrowRefresh_Click"
+                            runat="server" Hidden="true">
+                        </f:Button>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true"
                             OnClick="btnSave_Click">
@@ -90,7 +90,7 @@
                     </Items>
                 </f:Toolbar>
             </Toolbars>
-        </f:Form>          
+        </f:Form>
         <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
index d24cb52..121aa14 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
+using FineUIPro.Web.ProjectData;
 
 namespace FineUIPro.Web.SysManage
 {
@@ -78,7 +79,7 @@ namespace FineUIPro.Web.SysManage
                 DepartService.InitDepartDropDownList(this.drpDepart, true);
                 CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
                 CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
-                if (!string.IsNullOrEmpty(this.UnitId))
+                if (!string.IsNullOrWhiteSpace(this.UnitId))
                 {
                     this.drpIsOffice.SelectedValue = "False";
                 }
@@ -88,22 +89,22 @@ namespace FineUIPro.Web.SysManage
                     this.drpUnit.Enabled = false;
                 }
                 ///角色下拉框
-                BLL.RoleService.InitRoleDropDownList(this.drpRole, string.Empty, true, true);
-                if (!string.IsNullOrEmpty(this.UserId))
+                BLL.RoleService.InitRoleDropDownList(this.drpRole, string.Empty, true, false);
+                if (!string.IsNullOrWhiteSpace(this.UserId))
                 {
                     var user = BLL.UserService.GetUserByUserId(this.UserId);
                     if (user != null)
                     {
-                        if (!string.IsNullOrEmpty(user.UnitId))
+                        if (!string.IsNullOrWhiteSpace(user.UnitId))
                         {
                             this.drpUnit.SelectedValue = user.UnitId;
                         }
                         this.txtUserCode.Text = user.UserCode;
                         this.txtUserName.Text = user.UserName;
                         this.txtAccount.Text = user.Account;
-                        if (!string.IsNullOrEmpty(user.RoleId))
+                        if (!string.IsNullOrWhiteSpace(user.RoleId))
                         {
-                            this.drpRole.SelectedValue = user.RoleId;
+                            this.drpRole.SelectedValueArray = user.RoleId.Split(',');
                         }
                         if (user.IsPost.HasValue)
                         {
@@ -119,21 +120,21 @@ namespace FineUIPro.Web.SysManage
                             this.drpIsOffice.SelectedValue = "False";
                         }
                         this.txtIdentityCard.Text = user.IdentityCard;
-                        if (!string.IsNullOrEmpty(user.SignatureUrl))
+                        if (!string.IsNullOrWhiteSpace(user.SignatureUrl))
                         {
                             this.SignatureUrl = user.SignatureUrl;
                             this.Image2.ImageUrl = "~/" + this.SignatureUrl;
                         }
                         this.drpDepart.SelectedValue = user.DepartId;
-                        if (!string.IsNullOrEmpty(user.MainCNProfessionalId))
+                        if (!string.IsNullOrWhiteSpace(user.MainCNProfessionalId))
                         {
                             this.drpMainCNProfessional.SelectedValue = user.MainCNProfessionalId;
                         }
-                        if (!string.IsNullOrEmpty(user.ViceCNProfessionalId))
+                        if (!string.IsNullOrWhiteSpace(user.ViceCNProfessionalId))
                         {
                             this.drpViceCNProfessional.SelectedValueArray = user.ViceCNProfessionalId.Split(',');
                         }
-                        if (!string.IsNullOrEmpty(user.HomePageType))
+                        if (!string.IsNullOrWhiteSpace(user.HomePageType))
                         {
                             this.rblHomePageType.SelectedValue = user.HomePageType;
                         }
@@ -174,7 +175,7 @@ namespace FineUIPro.Web.SysManage
                 Alert.ShowInParent("输入的账号已存在！", MessageBoxIcon.Warning);
                 return;
             }
-            if (!string.IsNullOrEmpty(this.txtUserCode.Text))
+            if (!string.IsNullOrWhiteSpace(this.txtUserCode.Text))
             {
                 var q2 = Funs.DB.Sys_User.FirstOrDefault(x => x.UserCode == this.txtUserCode.Text.Trim() && (x.UserId != this.UserId || (this.UserId == null && x.UserId != null)));
                 if (q2 != null)
@@ -184,7 +185,7 @@ namespace FineUIPro.Web.SysManage
                 }
             }
 
-            if (!string.IsNullOrEmpty(this.txtIdentityCard.Text) && BLL.UserService.IsExistUserIdentityCard(this.UserId, this.txtIdentityCard.Text.Trim()) == true)
+            if (!string.IsNullOrWhiteSpace(this.txtIdentityCard.Text) && BLL.UserService.IsExistUserIdentityCard(this.UserId, this.txtIdentityCard.Text.Trim()) == true)
             {
                 Alert.ShowInParent("输入的身份证号码已存在！", MessageBoxIcon.Warning);
                 return;
@@ -206,9 +207,26 @@ namespace FineUIPro.Web.SysManage
             {
                 newUser.UnitId = this.CurrUser.UnitId;
             }
-            if (this.drpRole.SelectedValue != Const._Null)
+            //if (!string.IsNullOrWhiteSpace(this.drpRole.SelectedValue))
+            //{
+            //    newUser.RoleId = this.drpRole.SelectedValue;
+            //}
+            ///角色
+            string roleIds = string.Empty;
+            foreach (var item in this.drpRole.SelectedValueArray)
             {
-                newUser.RoleId = this.drpRole.SelectedValue;
+                var role = BLL.RoleService.GetRoleByRoleId(item);
+                if (role != null)
+                {
+                    if (string.IsNullOrWhiteSpace(newUser.RoleId))
+                    {
+                        newUser.RoleId = role.RoleId;
+                    }
+                    else
+                    {
+                        newUser.RoleId += "," + role.RoleId;
+                    }
+                }
             }
             if (this.drpDepart.SelectedValue != Const._Null)
             {
@@ -227,7 +245,7 @@ namespace FineUIPro.Web.SysManage
                 var cn = BLL.CNProfessionalService.GetCNProfessional(item);
                 if (cn != null)
                 {
-                    if (string.IsNullOrEmpty(newUser.ViceCNProfessionalId))
+                    if (string.IsNullOrWhiteSpace(newUser.ViceCNProfessionalId))
                     {
                         newUser.ViceCNProfessionalId = cn.CNProfessionalId;
                     }
@@ -238,11 +256,11 @@ namespace FineUIPro.Web.SysManage
                 }
             }
             newUser.HomePageType = this.rblHomePageType.SelectedValue;
-            if (string.IsNullOrEmpty(this.UserId))
+            if (string.IsNullOrWhiteSpace(this.UserId))
             {
                 newUser.RawPassword = UserService.getInitialPassword(newUser.UnitId, newUser.IdentityCard); ;
                 newUser.Password = Funs.EncryptionPassword(newUser.RawPassword);
-               
+
                 newUser.UserId = SQLHelper.GetNewID(typeof(Model.Sys_User));
                 newUser.DataSources = this.CurrUser.LoginProjectId;
                 UserService.AddUser(newUser);
@@ -265,7 +283,7 @@ namespace FineUIPro.Web.SysManage
         /// <returns></returns>
         private void GetButtonPower()
         {
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (!string.IsNullOrWhiteSpace(this.CurrUser.LoginProjectId))
             {
                 this.btnSave.Hidden = false;
             }
@@ -331,7 +349,7 @@ namespace FineUIPro.Web.SysManage
         /// <param name="e"></param>
         protected void btnArrowRefresh_Click(object sender, EventArgs e)
         {
-            if (!string.IsNullOrEmpty(this.UserId))
+            if (!string.IsNullOrWhiteSpace(this.UserId))
             {
                 BLL.UserService.UpdatePassword(this.UserId);
                 ShowNotify("密码已重置为原始密码!", MessageBoxIcon.Success);
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 02e3638..a6ced75 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -212,6 +212,9 @@ namespace Model
     partial void InsertBase_PurgeMethod(Base_PurgeMethod instance);
     partial void UpdateBase_PurgeMethod(Base_PurgeMethod instance);
     partial void DeleteBase_PurgeMethod(Base_PurgeMethod instance);
+    partial void InsertBase_Qualification(Base_Qualification instance);
+    partial void UpdateBase_Qualification(Base_Qualification instance);
+    partial void DeleteBase_Qualification(Base_Qualification instance);
     partial void InsertBase_QualityQuestionType(Base_QualityQuestionType instance);
     partial void UpdateBase_QualityQuestionType(Base_QualityQuestionType instance);
     partial void DeleteBase_QualityQuestionType(Base_QualityQuestionType instance);
@@ -2369,21 +2372,12 @@ namespace Model
     partial void InsertSys_Menu(Sys_Menu instance);
     partial void UpdateSys_Menu(Sys_Menu instance);
     partial void DeleteSys_Menu(Sys_Menu instance);
-    partial void InsertSys_Menu_0501(Sys_Menu_0501 instance);
-    partial void UpdateSys_Menu_0501(Sys_Menu_0501 instance);
-    partial void DeleteSys_Menu_0501(Sys_Menu_0501 instance);
-    partial void InsertSys_Menu_0501t(Sys_Menu_0501t instance);
-    partial void UpdateSys_Menu_0501t(Sys_Menu_0501t instance);
-    partial void DeleteSys_Menu_0501t(Sys_Menu_0501t instance);
     partial void InsertSys_MenuFlowOperate(Sys_MenuFlowOperate instance);
     partial void UpdateSys_MenuFlowOperate(Sys_MenuFlowOperate instance);
     partial void DeleteSys_MenuFlowOperate(Sys_MenuFlowOperate instance);
     partial void InsertSys_MenuTemp(Sys_MenuTemp instance);
     partial void UpdateSys_MenuTemp(Sys_MenuTemp instance);
     partial void DeleteSys_MenuTemp(Sys_MenuTemp instance);
-    partial void InsertSys_MenuTemp1(Sys_MenuTemp1 instance);
-    partial void UpdateSys_MenuTemp1(Sys_MenuTemp1 instance);
-    partial void DeleteSys_MenuTemp1(Sys_MenuTemp1 instance);
     partial void InsertSys_OutputValue(Sys_OutputValue instance);
     partial void UpdateSys_OutputValue(Sys_OutputValue instance);
     partial void DeleteSys_OutputValue(Sys_OutputValue instance);
@@ -3228,6 +3222,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_Qualification> Base_Qualification
+		{
+			get
+			{
+				return this.GetTable<Base_Qualification>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_QualityQuestionType> Base_QualityQuestionType
 		{
 			get
@@ -9012,22 +9014,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<Sys_Menu_0501> Sys_Menu_0501
-		{
-			get
-			{
-				return this.GetTable<Sys_Menu_0501>();
-			}
-		}
-		
-		public System.Data.Linq.Table<Sys_Menu_0501t> Sys_Menu_0501t
-		{
-			get
-			{
-				return this.GetTable<Sys_Menu_0501t>();
-			}
-		}
-		
 		public System.Data.Linq.Table<Sys_MenuFlowOperate> Sys_MenuFlowOperate
 		{
 			get
@@ -9044,14 +9030,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<Sys_MenuTemp1> Sys_MenuTemp1
-		{
-			get
-			{
-				return this.GetTable<Sys_MenuTemp1>();
-			}
-		}
-		
 		public System.Data.Linq.Table<Sys_OutputValue> Sys_OutputValue
 		{
 			get
@@ -38432,6 +38410,164 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Qualification")]
+	public partial class Base_Qualification : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _QualificationId;
+		
+		private string _QualificationCode;
+		
+		private string _QualificationName;
+		
+		private string _QualificationType;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnQualificationIdChanging(string value);
+    partial void OnQualificationIdChanged();
+    partial void OnQualificationCodeChanging(string value);
+    partial void OnQualificationCodeChanged();
+    partial void OnQualificationNameChanging(string value);
+    partial void OnQualificationNameChanged();
+    partial void OnQualificationTypeChanging(string value);
+    partial void OnQualificationTypeChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Base_Qualification()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string QualificationId
+		{
+			get
+			{
+				return this._QualificationId;
+			}
+			set
+			{
+				if ((this._QualificationId != value))
+				{
+					this.OnQualificationIdChanging(value);
+					this.SendPropertyChanging();
+					this._QualificationId = value;
+					this.SendPropertyChanged("QualificationId");
+					this.OnQualificationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCode", DbType="NVarChar(50)")]
+		public string QualificationCode
+		{
+			get
+			{
+				return this._QualificationCode;
+			}
+			set
+			{
+				if ((this._QualificationCode != value))
+				{
+					this.OnQualificationCodeChanging(value);
+					this.SendPropertyChanging();
+					this._QualificationCode = value;
+					this.SendPropertyChanged("QualificationCode");
+					this.OnQualificationCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationName", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string QualificationName
+		{
+			get
+			{
+				return this._QualificationName;
+			}
+			set
+			{
+				if ((this._QualificationName != value))
+				{
+					this.OnQualificationNameChanging(value);
+					this.SendPropertyChanging();
+					this._QualificationName = value;
+					this.SendPropertyChanged("QualificationName");
+					this.OnQualificationNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="NVarChar(50)")]
+		public string QualificationType
+		{
+			get
+			{
+				return this._QualificationType;
+			}
+			set
+			{
+				if ((this._QualificationType != value))
+				{
+					this.OnQualificationTypeChanging(value);
+					this.SendPropertyChanging();
+					this._QualificationType = value;
+					this.SendPropertyChanged("QualificationType");
+					this.OnQualificationTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(50)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_QualityQuestionType")]
 	public partial class Base_QualityQuestionType : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -323785,6 +323921,8 @@ namespace Model
 		
 		private string _H_ScanUrl2;
 		
+		private string _QualityId;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
     #region 可扩展性方法定义
@@ -323845,6 +323983,8 @@ namespace Model
     partial void OnH_EnableDate2Changed();
     partial void OnH_ScanUrl2Changing(string value);
     partial void OnH_ScanUrl2Changed();
+    partial void OnQualityIdChanging(string value);
+    partial void OnQualityIdChanged();
     #endregion
 		
 		public QualityAudit_SubUnitQuality()
@@ -324397,6 +324537,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityId", DbType="NVarChar(2000)")]
+		public string QualityId
+		{
+			get
+			{
+				return this._QualityId;
+			}
+			set
+			{
+				if ((this._QualityId != value))
+				{
+					this.OnQualityIdChanging(value);
+					this.SendPropertyChanging();
+					this._QualityId = value;
+					this.SendPropertyChanged("QualityId");
+					this.OnQualityIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_SubUnitQuality_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -343753,8 +343913,6 @@ namespace Model
 		
 		private string _InstitutionalDivisionId;
 		
-		private string _Remarks;
-		
 		private string _EmployeeCategoryName;
 		
 		private string _EmployeeSubgroupName;
@@ -343763,6 +343921,8 @@ namespace Model
 		
 		private string _DepartName;
 		
+		private string _Remarks;
+		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
 		
 		private EntitySet<Accident_AccidentReportOtherItem> _Accident_AccidentReportOtherItem;
@@ -343961,8 +344121,6 @@ namespace Model
     partial void OnEmployeeSubgroupIdChanged();
     partial void OnInstitutionalDivisionIdChanging(string value);
     partial void OnInstitutionalDivisionIdChanged();
-    partial void OnRemarksChanging(string value);
-    partial void OnRemarksChanged();
     partial void OnEmployeeCategoryNameChanging(string value);
     partial void OnEmployeeCategoryNameChanged();
     partial void OnEmployeeSubgroupNameChanging(string value);
@@ -343971,6 +344129,8 @@ namespace Model
     partial void OnInstitutionalDivisionNameChanged();
     partial void OnDepartNameChanging(string value);
     partial void OnDepartNameChanged();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
     #endregion
 		
 		public SitePerson_Person()
@@ -345399,26 +345559,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(500)")]
-		public string Remarks
-		{
-			get
-			{
-				return this._Remarks;
-			}
-			set
-			{
-				if ((this._Remarks != value))
-				{
-					this.OnRemarksChanging(value);
-					this.SendPropertyChanging();
-					this._Remarks = value;
-					this.SendPropertyChanged("Remarks");
-					this.OnRemarksChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeCategoryName", DbType="VarChar(50)")]
 		public string EmployeeCategoryName
 		{
@@ -345499,6 +345639,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(500)")]
+		public string Remarks
+		{
+			get
+			{
+				return this._Remarks;
+			}
+			set
+			{
+				if ((this._Remarks != value))
+				{
+					this.OnRemarksChanging(value);
+					this.SendPropertyChanging();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentPersonRecord> Accident_AccidentPersonRecord
 		{
@@ -370484,562 +370644,6 @@ namespace Model
 		}
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_Menu_0501")]
-	public partial class Sys_Menu_0501 : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _MenuId;
-		
-		private string _MenuName;
-		
-		private string _Icon;
-		
-		private string _Url;
-		
-		private System.Nullable<int> _SortIndex;
-		
-		private string _SuperMenu;
-		
-		private string _MenuType;
-		
-		private System.Nullable<bool> _IsOffice;
-		
-		private System.Nullable<bool> _IsEnd;
-		
-		private System.Nullable<bool> _IsUsed;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnMenuIdChanging(string value);
-    partial void OnMenuIdChanged();
-    partial void OnMenuNameChanging(string value);
-    partial void OnMenuNameChanged();
-    partial void OnIconChanging(string value);
-    partial void OnIconChanged();
-    partial void OnUrlChanging(string value);
-    partial void OnUrlChanged();
-    partial void OnSortIndexChanging(System.Nullable<int> value);
-    partial void OnSortIndexChanged();
-    partial void OnSuperMenuChanging(string value);
-    partial void OnSuperMenuChanged();
-    partial void OnMenuTypeChanging(string value);
-    partial void OnMenuTypeChanged();
-    partial void OnIsOfficeChanging(System.Nullable<bool> value);
-    partial void OnIsOfficeChanged();
-    partial void OnIsEndChanging(System.Nullable<bool> value);
-    partial void OnIsEndChanged();
-    partial void OnIsUsedChanging(System.Nullable<bool> value);
-    partial void OnIsUsedChanged();
-    #endregion
-		
-		public Sys_Menu_0501()
-		{
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-		public string MenuId
-		{
-			get
-			{
-				return this._MenuId;
-			}
-			set
-			{
-				if ((this._MenuId != value))
-				{
-					this.OnMenuIdChanging(value);
-					this.SendPropertyChanging();
-					this._MenuId = value;
-					this.SendPropertyChanged("MenuId");
-					this.OnMenuIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")]
-		public string MenuName
-		{
-			get
-			{
-				return this._MenuName;
-			}
-			set
-			{
-				if ((this._MenuName != value))
-				{
-					this.OnMenuNameChanging(value);
-					this.SendPropertyChanging();
-					this._MenuName = value;
-					this.SendPropertyChanged("MenuName");
-					this.OnMenuNameChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Icon", DbType="NVarChar(50)")]
-		public string Icon
-		{
-			get
-			{
-				return this._Icon;
-			}
-			set
-			{
-				if ((this._Icon != value))
-				{
-					this.OnIconChanging(value);
-					this.SendPropertyChanging();
-					this._Icon = value;
-					this.SendPropertyChanged("Icon");
-					this.OnIconChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(200)")]
-		public string Url
-		{
-			get
-			{
-				return this._Url;
-			}
-			set
-			{
-				if ((this._Url != value))
-				{
-					this.OnUrlChanging(value);
-					this.SendPropertyChanging();
-					this._Url = value;
-					this.SendPropertyChanged("Url");
-					this.OnUrlChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
-		public System.Nullable<int> SortIndex
-		{
-			get
-			{
-				return this._SortIndex;
-			}
-			set
-			{
-				if ((this._SortIndex != value))
-				{
-					this.OnSortIndexChanging(value);
-					this.SendPropertyChanging();
-					this._SortIndex = value;
-					this.SendPropertyChanged("SortIndex");
-					this.OnSortIndexChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperMenu", DbType="NVarChar(50)")]
-		public string SuperMenu
-		{
-			get
-			{
-				return this._SuperMenu;
-			}
-			set
-			{
-				if ((this._SuperMenu != value))
-				{
-					this.OnSuperMenuChanging(value);
-					this.SendPropertyChanging();
-					this._SuperMenu = value;
-					this.SendPropertyChanged("SuperMenu");
-					this.OnSuperMenuChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuType", DbType="NVarChar(50)")]
-		public string MenuType
-		{
-			get
-			{
-				return this._MenuType;
-			}
-			set
-			{
-				if ((this._MenuType != value))
-				{
-					this.OnMenuTypeChanging(value);
-					this.SendPropertyChanging();
-					this._MenuType = value;
-					this.SendPropertyChanged("MenuType");
-					this.OnMenuTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOffice", DbType="Bit")]
-		public System.Nullable<bool> IsOffice
-		{
-			get
-			{
-				return this._IsOffice;
-			}
-			set
-			{
-				if ((this._IsOffice != value))
-				{
-					this.OnIsOfficeChanging(value);
-					this.SendPropertyChanging();
-					this._IsOffice = value;
-					this.SendPropertyChanged("IsOffice");
-					this.OnIsOfficeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEnd", DbType="Bit")]
-		public System.Nullable<bool> IsEnd
-		{
-			get
-			{
-				return this._IsEnd;
-			}
-			set
-			{
-				if ((this._IsEnd != value))
-				{
-					this.OnIsEndChanging(value);
-					this.SendPropertyChanging();
-					this._IsEnd = value;
-					this.SendPropertyChanged("IsEnd");
-					this.OnIsEndChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")]
-		public System.Nullable<bool> IsUsed
-		{
-			get
-			{
-				return this._IsUsed;
-			}
-			set
-			{
-				if ((this._IsUsed != value))
-				{
-					this.OnIsUsedChanging(value);
-					this.SendPropertyChanging();
-					this._IsUsed = value;
-					this.SendPropertyChanged("IsUsed");
-					this.OnIsUsedChanged();
-				}
-			}
-		}
-		
-		public event PropertyChangingEventHandler PropertyChanging;
-		
-		public event PropertyChangedEventHandler PropertyChanged;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_Menu_0501t")]
-	public partial class Sys_Menu_0501t : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _MenuId;
-		
-		private string _MenuName;
-		
-		private string _Icon;
-		
-		private string _Url;
-		
-		private System.Nullable<int> _SortIndex;
-		
-		private string _SuperMenu;
-		
-		private string _MenuType;
-		
-		private System.Nullable<bool> _IsOffice;
-		
-		private System.Nullable<bool> _IsEnd;
-		
-		private System.Nullable<bool> _IsUsed;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnMenuIdChanging(string value);
-    partial void OnMenuIdChanged();
-    partial void OnMenuNameChanging(string value);
-    partial void OnMenuNameChanged();
-    partial void OnIconChanging(string value);
-    partial void OnIconChanged();
-    partial void OnUrlChanging(string value);
-    partial void OnUrlChanged();
-    partial void OnSortIndexChanging(System.Nullable<int> value);
-    partial void OnSortIndexChanged();
-    partial void OnSuperMenuChanging(string value);
-    partial void OnSuperMenuChanged();
-    partial void OnMenuTypeChanging(string value);
-    partial void OnMenuTypeChanged();
-    partial void OnIsOfficeChanging(System.Nullable<bool> value);
-    partial void OnIsOfficeChanged();
-    partial void OnIsEndChanging(System.Nullable<bool> value);
-    partial void OnIsEndChanged();
-    partial void OnIsUsedChanging(System.Nullable<bool> value);
-    partial void OnIsUsedChanged();
-    #endregion
-		
-		public Sys_Menu_0501t()
-		{
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-		public string MenuId
-		{
-			get
-			{
-				return this._MenuId;
-			}
-			set
-			{
-				if ((this._MenuId != value))
-				{
-					this.OnMenuIdChanging(value);
-					this.SendPropertyChanging();
-					this._MenuId = value;
-					this.SendPropertyChanged("MenuId");
-					this.OnMenuIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")]
-		public string MenuName
-		{
-			get
-			{
-				return this._MenuName;
-			}
-			set
-			{
-				if ((this._MenuName != value))
-				{
-					this.OnMenuNameChanging(value);
-					this.SendPropertyChanging();
-					this._MenuName = value;
-					this.SendPropertyChanged("MenuName");
-					this.OnMenuNameChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Icon", DbType="NVarChar(50)")]
-		public string Icon
-		{
-			get
-			{
-				return this._Icon;
-			}
-			set
-			{
-				if ((this._Icon != value))
-				{
-					this.OnIconChanging(value);
-					this.SendPropertyChanging();
-					this._Icon = value;
-					this.SendPropertyChanged("Icon");
-					this.OnIconChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(200)")]
-		public string Url
-		{
-			get
-			{
-				return this._Url;
-			}
-			set
-			{
-				if ((this._Url != value))
-				{
-					this.OnUrlChanging(value);
-					this.SendPropertyChanging();
-					this._Url = value;
-					this.SendPropertyChanged("Url");
-					this.OnUrlChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
-		public System.Nullable<int> SortIndex
-		{
-			get
-			{
-				return this._SortIndex;
-			}
-			set
-			{
-				if ((this._SortIndex != value))
-				{
-					this.OnSortIndexChanging(value);
-					this.SendPropertyChanging();
-					this._SortIndex = value;
-					this.SendPropertyChanged("SortIndex");
-					this.OnSortIndexChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperMenu", DbType="NVarChar(50)")]
-		public string SuperMenu
-		{
-			get
-			{
-				return this._SuperMenu;
-			}
-			set
-			{
-				if ((this._SuperMenu != value))
-				{
-					this.OnSuperMenuChanging(value);
-					this.SendPropertyChanging();
-					this._SuperMenu = value;
-					this.SendPropertyChanged("SuperMenu");
-					this.OnSuperMenuChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuType", DbType="NVarChar(50)")]
-		public string MenuType
-		{
-			get
-			{
-				return this._MenuType;
-			}
-			set
-			{
-				if ((this._MenuType != value))
-				{
-					this.OnMenuTypeChanging(value);
-					this.SendPropertyChanging();
-					this._MenuType = value;
-					this.SendPropertyChanged("MenuType");
-					this.OnMenuTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOffice", DbType="Bit")]
-		public System.Nullable<bool> IsOffice
-		{
-			get
-			{
-				return this._IsOffice;
-			}
-			set
-			{
-				if ((this._IsOffice != value))
-				{
-					this.OnIsOfficeChanging(value);
-					this.SendPropertyChanging();
-					this._IsOffice = value;
-					this.SendPropertyChanged("IsOffice");
-					this.OnIsOfficeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEnd", DbType="Bit")]
-		public System.Nullable<bool> IsEnd
-		{
-			get
-			{
-				return this._IsEnd;
-			}
-			set
-			{
-				if ((this._IsEnd != value))
-				{
-					this.OnIsEndChanging(value);
-					this.SendPropertyChanging();
-					this._IsEnd = value;
-					this.SendPropertyChanged("IsEnd");
-					this.OnIsEndChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")]
-		public System.Nullable<bool> IsUsed
-		{
-			get
-			{
-				return this._IsUsed;
-			}
-			set
-			{
-				if ((this._IsUsed != value))
-				{
-					this.OnIsUsedChanging(value);
-					this.SendPropertyChanging();
-					this._IsUsed = value;
-					this.SendPropertyChanged("IsUsed");
-					this.OnIsUsedChanged();
-				}
-			}
-		}
-		
-		public event PropertyChangingEventHandler PropertyChanging;
-		
-		public event PropertyChangedEventHandler PropertyChanged;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_MenuFlowOperate")]
 	public partial class Sys_MenuFlowOperate : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -371596,284 +371200,6 @@ namespace Model
 		}
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_MenuTemp1")]
-	public partial class Sys_MenuTemp1 : INotifyPropertyChanging, INotifyPropertyChanged
-	{
-		
-		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-		
-		private string _MenuId;
-		
-		private string _MenuName;
-		
-		private string _Icon;
-		
-		private string _Url;
-		
-		private System.Nullable<int> _SortIndex;
-		
-		private string _SuperMenu;
-		
-		private string _MenuType;
-		
-		private System.Nullable<bool> _IsOffice;
-		
-		private System.Nullable<bool> _IsEnd;
-		
-		private System.Nullable<bool> _IsUsed;
-		
-    #region 可扩展性方法定义
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnMenuIdChanging(string value);
-    partial void OnMenuIdChanged();
-    partial void OnMenuNameChanging(string value);
-    partial void OnMenuNameChanged();
-    partial void OnIconChanging(string value);
-    partial void OnIconChanged();
-    partial void OnUrlChanging(string value);
-    partial void OnUrlChanged();
-    partial void OnSortIndexChanging(System.Nullable<int> value);
-    partial void OnSortIndexChanged();
-    partial void OnSuperMenuChanging(string value);
-    partial void OnSuperMenuChanged();
-    partial void OnMenuTypeChanging(string value);
-    partial void OnMenuTypeChanged();
-    partial void OnIsOfficeChanging(System.Nullable<bool> value);
-    partial void OnIsOfficeChanged();
-    partial void OnIsEndChanging(System.Nullable<bool> value);
-    partial void OnIsEndChanged();
-    partial void OnIsUsedChanging(System.Nullable<bool> value);
-    partial void OnIsUsedChanged();
-    #endregion
-		
-		public Sys_MenuTemp1()
-		{
-			OnCreated();
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-		public string MenuId
-		{
-			get
-			{
-				return this._MenuId;
-			}
-			set
-			{
-				if ((this._MenuId != value))
-				{
-					this.OnMenuIdChanging(value);
-					this.SendPropertyChanging();
-					this._MenuId = value;
-					this.SendPropertyChanged("MenuId");
-					this.OnMenuIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuName", DbType="NVarChar(50)")]
-		public string MenuName
-		{
-			get
-			{
-				return this._MenuName;
-			}
-			set
-			{
-				if ((this._MenuName != value))
-				{
-					this.OnMenuNameChanging(value);
-					this.SendPropertyChanging();
-					this._MenuName = value;
-					this.SendPropertyChanged("MenuName");
-					this.OnMenuNameChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Icon", DbType="NVarChar(50)")]
-		public string Icon
-		{
-			get
-			{
-				return this._Icon;
-			}
-			set
-			{
-				if ((this._Icon != value))
-				{
-					this.OnIconChanging(value);
-					this.SendPropertyChanging();
-					this._Icon = value;
-					this.SendPropertyChanged("Icon");
-					this.OnIconChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(200)")]
-		public string Url
-		{
-			get
-			{
-				return this._Url;
-			}
-			set
-			{
-				if ((this._Url != value))
-				{
-					this.OnUrlChanging(value);
-					this.SendPropertyChanging();
-					this._Url = value;
-					this.SendPropertyChanged("Url");
-					this.OnUrlChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
-		public System.Nullable<int> SortIndex
-		{
-			get
-			{
-				return this._SortIndex;
-			}
-			set
-			{
-				if ((this._SortIndex != value))
-				{
-					this.OnSortIndexChanging(value);
-					this.SendPropertyChanging();
-					this._SortIndex = value;
-					this.SendPropertyChanged("SortIndex");
-					this.OnSortIndexChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperMenu", DbType="NVarChar(50)")]
-		public string SuperMenu
-		{
-			get
-			{
-				return this._SuperMenu;
-			}
-			set
-			{
-				if ((this._SuperMenu != value))
-				{
-					this.OnSuperMenuChanging(value);
-					this.SendPropertyChanging();
-					this._SuperMenu = value;
-					this.SendPropertyChanged("SuperMenu");
-					this.OnSuperMenuChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MenuType", DbType="NVarChar(50)")]
-		public string MenuType
-		{
-			get
-			{
-				return this._MenuType;
-			}
-			set
-			{
-				if ((this._MenuType != value))
-				{
-					this.OnMenuTypeChanging(value);
-					this.SendPropertyChanging();
-					this._MenuType = value;
-					this.SendPropertyChanged("MenuType");
-					this.OnMenuTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOffice", DbType="Bit")]
-		public System.Nullable<bool> IsOffice
-		{
-			get
-			{
-				return this._IsOffice;
-			}
-			set
-			{
-				if ((this._IsOffice != value))
-				{
-					this.OnIsOfficeChanging(value);
-					this.SendPropertyChanging();
-					this._IsOffice = value;
-					this.SendPropertyChanged("IsOffice");
-					this.OnIsOfficeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsEnd", DbType="Bit")]
-		public System.Nullable<bool> IsEnd
-		{
-			get
-			{
-				return this._IsEnd;
-			}
-			set
-			{
-				if ((this._IsEnd != value))
-				{
-					this.OnIsEndChanging(value);
-					this.SendPropertyChanging();
-					this._IsEnd = value;
-					this.SendPropertyChanged("IsEnd");
-					this.OnIsEndChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")]
-		public System.Nullable<bool> IsUsed
-		{
-			get
-			{
-				return this._IsUsed;
-			}
-			set
-			{
-				if ((this._IsUsed != value))
-				{
-					this.OnIsUsedChanging(value);
-					this.SendPropertyChanging();
-					this._IsUsed = value;
-					this.SendPropertyChanged("IsUsed");
-					this.OnIsUsedChanged();
-				}
-			}
-		}
-		
-		public event PropertyChangingEventHandler PropertyChanging;
-		
-		public event PropertyChangedEventHandler PropertyChanged;
-		
-		protected virtual void SendPropertyChanging()
-		{
-			if ((this.PropertyChanging != null))
-			{
-				this.PropertyChanging(this, emptyChangingEventArgs);
-			}
-		}
-		
-		protected virtual void SendPropertyChanged(String propertyName)
-		{
-			if ((this.PropertyChanged != null))
-			{
-				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-			}
-		}
-	}
-	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_OutputValue")]
 	public partial class Sys_OutputValue : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -375111,7 +374437,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(500)")]
 		public string RoleId
 		{
 			get
@@ -451161,7 +450487,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(500)")]
 		public string RoleId
 		{
 			get
@@ -460441,7 +459767,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", DbType="NVarChar(500)")]
 		public string RoleId
 		{
 			get