202305291、修改奖励通知单、奖惩通知单。

2023-05-29 09:09:30 +08:00
parent cd3d51ae3f
commit 9c804196e7
43 changed files with 3070 additions and 3544 deletions
@@ -0,0 +1,178 @@
+ALTER TABLE [dbo].[CostGoods_Expense] ALTER COLUMN ExpenseCode nvarchar(50) NULL
+GO
+ALTER TABLE CostGoods_Expense ALTER COLUMN CompileMan NVARCHAR(50) NULL
+GO
+ALTER TABLE CostGoods_Expense ALTER COLUMN CheckMan NVARCHAR(50) NULL
+GO
+ALTER TABLE CostGoods_Expense ALTER COLUMN ApproveMan NVARCHAR(50) NULL
+GO
+
+ALTER TABLE CostGoods_ExpenseDetail add CostTypeName NVARCHAR(50) NULL
+GO
+ALTER TABLE CostGoods_ExpenseDetail add SortIndex int NULL
+GO
+ALTER TABLE CostGoods_ExpenseDetail add SupCostTypeId NVARCHAR(50) NULL
+GO
+ALTER TABLE CostGoods_ExpenseDetail add SupCostTypeName NVARCHAR(50) NULL
+GO
+ALTER TABLE CostGoods_ExpenseDetail add SupSortIndex int NULL
+GO
+
+ALTER TABLE CostGoods_ExpenseDetail alter column CostMoney decimal(18, 2) NULL
+GO
+
+CREATE TABLE [dbo].[Base_CostTypeItem](
+	[CostTypeItemId] [nvarchar](50) NOT NULL,
+	[CostTypeId] [nvarchar](50) NULL,
+	[SortIndex] [int] NULL,
+	[CostTypeItemName] [nvarchar](50) NULL,
+	[Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Base_CostTypeItem] PRIMARY KEY CLUSTERED 
+(
+	[CostTypeItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Base_CostTypeItem]  WITH CHECK ADD  CONSTRAINT [FK_Base_CostTypeItem_Base_CostType] FOREIGN KEY([CostTypeId])
+REFERENCES [dbo].[Base_CostType] ([CostTypeId])
+GO
+
+ALTER TABLE [dbo].[Base_CostTypeItem] CHECK CONSTRAINT [FK_Base_CostTypeItem_Base_CostType]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CostTypeItem', @level2type=N'COLUMN',@level2name=N'CostTypeItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'费用类型id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CostTypeItem', @level2type=N'COLUMN',@level2name=N'CostTypeId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CostTypeItem', @level2type=N'COLUMN',@level2name=N'SortIndex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CostTypeItem', @level2type=N'COLUMN',@level2name=N'CostTypeItemName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'费用类型明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CostTypeItem'
+GO
+
+DELETE FROM Base_CostType
+GO
+ALTER TABLE Base_CostType ALTER COLUMN CostTypeCode INT NULL
+GO
+--插入费用类型数据
+INSERT INTO [dbo].[Base_CostType]([CostTypeId],[CostTypeCode],[CostTypeName],[Remark])
+VALUES('ca2dacae-ca5f-4104-aca1-3bd185b737b2',1,'安全施工','起重作业、动火作业、脚手架、试压与吹扫、拆除工程')
+GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A1','ca2dacae-ca5f-4104-aca1-3bd185b737b2',1,'办公用品')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A2','ca2dacae-ca5f-4104-aca1-3bd185b737b2',2,'HSE培训')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A3','ca2dacae-ca5f-4104-aca1-3bd185b737b2',3,'警示标识')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A4','ca2dacae-ca5f-4104-aca1-3bd185b737b2',4,'检测器具')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A5','ca2dacae-ca5f-4104-aca1-3bd185b737b2',5,'安全奖励')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A6','ca2dacae-ca5f-4104-aca1-3bd185b737b2',6,'安全技术')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A7','ca2dacae-ca5f-4104-aca1-3bd185b737b2',7,'安全用电')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A8','ca2dacae-ca5f-4104-aca1-3bd185b737b2',8,'高处作业及临边孔洞')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A9','ca2dacae-ca5f-4104-aca1-3bd185b737b2',9,'气瓶防护')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A10','ca2dacae-ca5f-4104-aca1-3bd185b737b2',10,'脚手架（防护）')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A11','ca2dacae-ca5f-4104-aca1-3bd185b737b2',11,'木工防护棚')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A12','ca2dacae-ca5f-4104-aca1-3bd185b737b2',12,'钢筋加工防护棚')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A13','ca2dacae-ca5f-4104-aca1-3bd185b737b2',13,'受限空间')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A14','ca2dacae-ca5f-4104-aca1-3bd185b737b2',14,'机械设备')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A15','ca2dacae-ca5f-4104-aca1-3bd185b737b2',15,'喷砂作业')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A16','ca2dacae-ca5f-4104-aca1-3bd185b737b2',16,'消防')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A17','ca2dacae-ca5f-4104-aca1-3bd185b737b2',17,'应急')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('A18','ca2dacae-ca5f-4104-aca1-3bd185b737b2',18,'化工试车')
+	GO
+
+INSERT INTO [dbo].[Base_CostType]([CostTypeId],[CostTypeCode],[CostTypeName],[Remark])
+VALUES('fa9e4e0c-8f0d-46c4-a659-682d4de1ca0f',2,'职业健康','健康保护')
+GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('B1','fa9e4e0c-8f0d-46c4-a659-682d4de1ca0f',1,'临时设施（饮水间、厕所、吸烟室等）')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('B2','fa9e4e0c-8f0d-46c4-a659-682d4de1ca0f',2,'防护用品')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('B3','fa9e4e0c-8f0d-46c4-a659-682d4de1ca0f',3,'体检费用')
+	GO
+INSERT INTO [dbo].[Base_CostType]([CostTypeId],[CostTypeCode],[CostTypeName],[Remark])
+VALUES('2c5b070a-ef8c-44f8-b35a-00316aed7d3a',3,'环境保护','噪音防护、污水废水排放、防尘降尘、危险物质控制、固体废弃物清理、辐射防护')
+GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C1','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',1,'噪声控制')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C2','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',2,'扬尘控制')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C3','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',3,'固体废弃物清理')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C4','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',4,'污水处理')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C5','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',5,'高危物质控制')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('C6','2c5b070a-ef8c-44f8-b35a-00316aed7d3a',6,'防辐射')
+	GO
+
+INSERT INTO [dbo].[Base_CostType]([CostTypeId],[CostTypeCode],[CostTypeName],[Remark])
+VALUES('278e29bc-fa92-463a-88de-f481d41a69e0',4,'文明施工','现场围挡、五牌一图、企业标志、场容场貌、材料存放、不扰民措施、成品半成品保护')
+GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('D1','278e29bc-fa92-463a-88de-f481d41a69e0',1,'场容场貌')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('D2','278e29bc-fa92-463a-88de-f481d41a69e0',2,'宣传标识')
+	GO
+	INSERT INTO [dbo].[Base_CostTypeItem]([CostTypeItemId],[CostTypeId],[SortIndex],[CostTypeItemName])
+	VALUES('D3','278e29bc-fa92-463a-88de-f481d41a69e0',3,'智慧化工地')
+	GO
+	   
+
+ALTER TABLE [dbo].[CostGoods_Expense] ADD SortIndex int null
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CostGoods_Expense', @level2type=N'COLUMN',@level2name=N'SortIndex'
+GO
+
+ALTER TABLE [dbo].[CostGoods_Expense] ADD Year int null
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'年度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CostGoods_Expense', @level2type=N'COLUMN',@level2name=N'Year'
+GO
@@ -0,0 +1,4 @@
+--ADD BY YangHongwei 2023-05-29
+1、修改奖励通知单、奖惩通知单。
+2、费用计划页面开发。
+--END
@@ -80,11 +80,11 @@
                var getUser = db.Person_Persons.FirstOrDefault(x => x.PersonId == personId);
                if (getUser != null && !string.IsNullOrEmpty(getUser.OpenId))
                {
-                    if (thing2.Length > 20)
+                    if (!string.IsNullOrEmpty(thing2) && thing2.Length > 20)
                    {
                        thing2 = thing2.Substring(0, 20);
                    }
-                    if (name1.Length > 10)
+                    if (!string.IsNullOrEmpty(name1) && name1.Length > 10)
                    {
                        name1 = name1.Substring(0, 10);
                    }
@@ -133,7 +133,7 @@ namespace BLL
                    person.AttachUrl2 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#2", null);
                    person.AttachUrl3 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#3", null);
                    person.AttachUrl4 = getAttachUrl4(getProjectPerson.PersonId);
-                    //person.AttachUrl5 = APIUpLoadFileService.getFileUrl(personId + "#5", null);
+                    person.AttachUrl5 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId  + "#5", null);
                }
                var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard);
                if (getPerson != null)
@@ -742,6 +742,15 @@ namespace BLL
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == person.IdentityCard || x.PersonId == person.PersonId);
+                if (getPerson == null)
+                {
+                    var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId ==person.PersonId);
+                    if (getSitePerson != null)
+                    {
+                        getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == getSitePerson.IdentityCard || x.PersonId == getSitePerson.PersonId);
+                    }
+                }
+
                if (getPerson != null)
                {
                    if (!string.IsNullOrEmpty(person.PhotoUrl))
@@ -6,110 +6,53 @@ namespace BLL
 {
    public class ExpenseDetailService
    {
-        public static decimal? GetSumCostMoneyByExpenseId(string expenseId)
-        {
-            return (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x.CostMoney).Sum();
-        }
       
        public static List<Model.CostGoods_ExpenseDetail> GetExpenseDetailsByExpenseId(string expenseId)
        {
            return (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x).ToList();
        }

-        public static decimal GetSumCostMoneyByExpenseIdAndType(string expenseId, string costType)
-        {
-            Model.CostGoods_ExpenseDetail detail = (from x in Funs.DB.CostGoods_ExpenseDetail where x.ExpenseId == expenseId && x.CostType == costType select x).FirstOrDefault();
-            if (detail != null)
-            {
-                return detail.CostMoney ?? 0;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// 根据单位和时间获取费用明细集合
-        /// </summary>
-        /// <param name="unitId"></param>
-        /// <param name="startTime"></param>
-        /// <param name="endTime"></param>
-        /// <returns></returns>
-        public static List<Model.CostGoods_ExpenseDetail> GetCostDetailsByUnitId(string unitId, DateTime startTime, DateTime endTime)
-        {
-            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            {
-                return (from x in db.CostGoods_ExpenseDetail
-                        join y in db.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
-                        where y.UnitId == unitId && y.States == BLL.Const.State_2 && y.ApproveDate >= startTime && y.ApproveDate < endTime
-                        select x).Distinct().ToList();
-            }
-        }
-
-        /// <summary>
-        /// 根据单位和时间及费用类型获取当期费用
-        /// </summary>
-        /// <param name="unitId"></param>
-        /// <param name="startTime"></param>
-        /// <param name="endTime"></param>
-        /// <param name="costType"></param>
-        /// <returns></returns>
-        public static decimal GetCostDetailsByUnitIdAndCostType(string unitId, DateTime startTime, DateTime endTime, string costType)
-        {
-            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            {
-                decimal cost = 0;
-                var q = from x in db.CostGoods_ExpenseDetail
-                        join y in db.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
-                        join z in db.Sys_FlowOperate
-                        on y.ExpenseId equals z.DataId
-                        where y.UnitId == unitId && y.States == BLL.Const.State_2 && z.State == BLL.Const.State_2 && z.OperaterTime >= startTime && z.OperaterTime < endTime && x.CostType.Contains(costType)
-                        select x.CostMoney;
-                foreach (var item in q)
-                {
-                    if (item != null)
-                    {
-                        cost += Funs.GetNewDecimalOrZero(item.ToString());
-                    }
-                }
-                return cost;
-                //return (from x in Funs.DB.CostGoods_ExpenseDetail
-                //        join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
-                //        where y.UnitId == unitId && y.States == BLL.Const.State_2 && y.ApproveDate >= startTime && y.ApproveDate < endTime && x.CostType.Contains(costType)
-                //        select x.CostMoney ?? 0).Sum();
-            }
-        }

        /// <summary>
        /// 增加费用明细信息
        /// </summary>
        /// <param name="pauseNotice">费用明细实体</param>
-        public static void AddCostDetail(string expenseId, string costType, decimal costMoney, string costDef)
+        public static void AddCostDetail(string expenseId )
        {          
+            DeleteCostDetailByExpenseId(expenseId);
            Model.SGGLDB db = Funs.DB;
-            Model.CostGoods_ExpenseDetail newExpenseDetail = new Model.CostGoods_ExpenseDetail
+            var getItems = from x in db.Base_CostTypeItem
+                           join y in db.Base_CostType on x.CostTypeId equals y.CostTypeId
+                           select new
+                           {
+                               SupCostTypeId = y.CostTypeId,
+                               SupCostTypeName = y.CostTypeName,
+                               SupSortIndex = y.CostTypeCode,
+                               CostType = x.CostTypeId,
+                               CostTypeName=x.CostTypeItemName,
+                               SortIndex=x.SortIndex,
+                               CostMoney=0,
+                           };
+            foreach (var item in getItems)
            {
-                ExpenseDetailId = SQLHelper.GetNewID(typeof(Model.CostGoods_ExpenseDetail)),
-                ExpenseId = expenseId,
-                CostType = costType,
-                CostMoney = costMoney,
-                CostDef = costDef
-            };
-            db.CostGoods_ExpenseDetail.InsertOnSubmit(newExpenseDetail);
-            db.SubmitChanges();
+                Model.CostGoods_ExpenseDetail newExpenseDetail = new Model.CostGoods_ExpenseDetail
+                {
+                    ExpenseDetailId = SQLHelper.GetNewID(),
+                    ExpenseId = expenseId,
+                    SupCostTypeId=item.SupCostTypeId,
+                    SupCostTypeName=item.SupCostTypeName,
+                    SupSortIndex=item.SupSortIndex,
+
+                    CostType = item.CostType,
+                    CostTypeName = item.CostTypeName,
+                    SortIndex=item.SortIndex,
+                    CostMoney = item.CostMoney,
+                };
+                db.CostGoods_ExpenseDetail.InsertOnSubmit(newExpenseDetail);
+                db.SubmitChanges();
+            }          
        }

-        /// <summary>
-        /// 根据费用编号和费用类型获取费用明细信息
-        /// </summary>
-        /// <param name="expenseId"></param>
-        /// <param name="costType"></param>
-        /// <returns></returns>
-        public static Model.CostGoods_ExpenseDetail GetCostDetailByExpenseIdAndCostType(string expenseId, string costType)
-        {
-            return Funs.DB.CostGoods_ExpenseDetail.FirstOrDefault(e => (e.ExpenseId == expenseId && e.CostType == costType));
-        }

        /// <summary>
        /// 根据费用编号删除对应的费用明细信息
@@ -118,9 +61,12 @@ namespace BLL
        public static void DeleteCostDetailByExpenseId(string expenseId)
        {
            Model.SGGLDB db = Funs.DB;
-            var q = (from x in db.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x).ToList();
-            db.CostGoods_ExpenseDetail.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            var q = from x in db.CostGoods_ExpenseDetail where x.ExpenseId == expenseId select x;
+            if (q.Count() > 0)
+            {
+                db.CostGoods_ExpenseDetail.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
        }
    }
 }
@@ -21,6 +21,28 @@ namespace BLL
            return Funs.DB.CostGoods_Expense.FirstOrDefault(e => e.ExpenseId == expenseId);
        }

+        /// <summary>
+        /// 根据主键获取措施费用使用计划
+        /// </summary>
+        /// <param name="expenseId"></param>
+        /// <returns></returns>
+        public static List<Model.CostGoods_Expense> GetExpenseList(string projectId, string unitId, int? year)
+        {
+            var getData = from x in Funs.DB.CostGoods_Expense
+                          where x.ProjectId == projectId
+                          select x;
+            if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
+            {
+                getData = getData.Where(x =>x.UnitId == unitId);
+            }
+            if (year.HasValue)
+            {
+                getData = getData.Where(x => x.Year == year);
+            }
+
+            return getData.OrderBy(x => x.SortIndex).ToList();
+        }
+
        /// <summary>
        /// 根据时间获取当期单位Id集合
        /// </summary>
@@ -49,22 +71,17 @@ namespace BLL
                ProjectId = expense.ProjectId,
                ExpenseCode = expense.ExpenseCode,
                UnitId = expense.UnitId,
-                //newExpense.CompileMan = expense.CompileMan;
+                ReportDate=expense.ReportDate,
                CreateDate = expense.CreateDate,
                States = expense.States,
-                Months = expense.Months,
-                ReportDate = expense.ReportDate,
-                PlanCostA = expense.PlanCostA,
-                PlanCostB = expense.PlanCostB,
+               CompileMan = expense.CompileMan,
                CompileDate = expense.CompileDate,
-                // newExpense.CheckMan = expense.CheckMan;
-                CheckDate = expense.CheckDate,
-                // newExpense.ApproveMan = expense.ApproveMan;
-                ApproveDate = expense.ApproveDate
+                SortIndex = expense.SortIndex,
+                Year = expense.Year,
            };
            db.CostGoods_Expense.InsertOnSubmit(newExpense);
            db.SubmitChanges();
-            BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectExpenseMenuId, expense.ProjectId, null, expense.ExpenseId, expense.CreateDate);
+
        }

        /// <summary>
@@ -80,19 +97,21 @@ namespace BLL
                //newExpense.ProjectId = expense.ProjectId;
                newExpense.ExpenseCode = expense.ExpenseCode;
                newExpense.UnitId = expense.UnitId;               
-                // newExpense.CompileMan = expense.CompileMan;
-                newExpense.CreateDate = expense.CreateDate;
                newExpense.States = expense.States;
                newExpense.Months = expense.Months;
                newExpense.ReportDate = expense.ReportDate;
                newExpense.PlanCostA = expense.PlanCostA;
                newExpense.PlanCostB = expense.PlanCostB;
                newExpense.CompileDate = expense.CompileDate;
+                newExpense.CompileMan = expense.CompileMan;
                //newExpense.CheckMan = expense.CheckMan;
-                newExpense.CheckDate = expense.CheckDate;
+                //newExpense.CheckDate = expense.CheckDate;
                //newExpense.ApproveMan = expense.ApproveMan;
-                newExpense.ApproveDate = expense.ApproveDate;
+                //  newExpense.ApproveDate = expense.ApproveDate;
+                newExpense.SortIndex = expense.SortIndex;
+                newExpense.Year = expense.Year;
                db.SubmitChanges();
+
            }
        }

@@ -112,6 +131,48 @@ namespace BLL
                BLL.CommonService.DeleteFlowOperateByID(expenseId);
                db.CostGoods_Expense.DeleteOnSubmit(expense);
                db.SubmitChanges();
+
+                if (expense.Year.HasValue)
+                {
+                    SetSumYearExpense(expense.ProjectId, expense.Year.Value);
+                }
+            }
+        }
+
+        /// <summary>
+        ///  当前合计数
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="Year"></param>
+        public static void SetSumYearExpense(string projectId,int Year)
+        {
+            var getYearEx = Funs.DB. CostGoods_Expense.FirstOrDefault(x=>x.ProjectId == projectId && x.Year == Year && x.UnitId == null);
+            if (getYearEx != null)
+            {
+                Funs.DB.CostGoods_Expense.DeleteOnSubmit(getYearEx);
+                Funs.DB.SubmitChanges();
+            }
+
+            var getALLEx=from x in Funs.DB.CostGoods_Expense where x.ProjectId == projectId && x.Year == Year && x.UnitId != null select x;
+            if (getALLEx.Count() > 0)
+            {
+                Model.CostGoods_Expense newExpense = new Model.CostGoods_Expense
+                {
+                    ExpenseId = SQLHelper.GetNewID(),
+                    ProjectId = projectId,
+                    UnitId = null,
+                    CreateDate = DateTime.Now,
+                    Months = DateTime.Now,
+                    ReportDate = DateTime.Now,
+                    CompileDate = DateTime.Now,
+                    CheckDate = DateTime.Now,
+                    ApproveDate = DateTime.Now,
+                    SortIndex = 0,
+                    Year = Year,
+                };
+
+                db.CostGoods_Expense.InsertOnSubmit(newExpense);
+                db.SubmitChanges();
            }
        }
    }
@@ -12,26 +12,20 @@
  <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="费用类型" Layout="HBox"  ShowHeader="false">
        <Items>
-            <f:Grid ID="Grid1" Title="费用类型" ShowHeader="false" EnableCollapse="true" PageSize="10"  EnableColumnLines="true"
-                ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
-                DataKeyNames="CostTypeId" DataIDField="CostTypeId" OnPageIndexChange="Grid1_PageIndexChange"
-                AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+              <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="费用类型" EnableCollapse="true" ForceFit="true"
+                    runat="server" BoxFlex="1" AllowPaging="false" DataKeyNames="ID" EnableTree="true" TreeColumn="Name"
+                    DataIDField="ID" DataParentIDField="ParentId" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
+                    AllowSorting="true" SortField="Code" OnSort="Grid1_Sort" SortDirection="ASC" EnableColumnLines="true"
+                    EnableTextSelection="True"   ExpandAllTreeNodes="true">
                <Columns>
-                   <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
-                    <f:RenderField Width="90px" ColumnID="CostTypeCode" DataField="CostTypeCode" FieldType="String"
-                        HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="CostTypeName" DataField="CostTypeName" FieldType="String"
-                        HeaderText="类型" HeaderTextAlign="Center" TextAlign="Left">
+                   <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"/>      
+                    <f:RenderField Width="250px" ColumnID="Name" DataField="Name" FieldType="String"
+                        HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
                    </f:RenderField>
                    <f:RenderField Width="400px" ColumnID="Remark" DataField="Remark" FieldType="String"
                        HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
                    </f:RenderField>
                </Columns>                
-                <Listeners>
-                    <f:Listener Event="rowselect" Handler="onGridRowSelect" />
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
                <PageItems>
                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                    </f:ToolbarSeparator>
@@ -42,105 +36,13 @@
                    </f:DropDownList>
                </PageItems>
            </f:Grid>
-            <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
-                LabelWidth="80px" BodyPadding="5px" Width="350px">
-                <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
-                    </f:HiddenField>
-                    <f:TextBox ID="txtCostTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
-                        LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
-                    </f:TextBox>
-                    <f:TextBox ID="txtCostTypeName" Label="类型" ShowRedStar="true" Required="true" runat="server"
-                        LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
-                    </f:TextBox>
-                    <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
-                    </f:TextArea>
-                </Items>
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
-                        <Items>
-                            <f:Button ID="btnNew"  Icon="Add" Text="新增" EnablePostBack="false" runat="server">
-                                <Listeners>
-                                    <f:Listener Event="click" Handler="onNewButtonClick" />
-                                </Listeners>
-                            </f:Button>
-                            <f:Button ID="btnDelete" Enabled="false" Text="删除" Icon="Delete" ConfirmText="确定删除当前数据？"
-                                OnClick="btnDelete_Click" runat="server">
-                            </f:Button>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
-                                OnClick="btnSave_Click"  Text="保存">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-            </f:SimpleForm>
        </Items>
    </f:Panel>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
-            runat="server" Text="编辑" Icon="Pencil">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Icon="Delete">
-        </f:MenuButton>
-    </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;
-        }
-
        function reloadGrid() {
            __doPostBack(null, 'reloadGrid');
        }
-
-
-        var gridClientID = '<%= Grid1.ClientID %>';
-        var btnDeleteClientID = '<%= btnDelete.ClientID %>';
-        var btnSaveClientID = '<%= btnSave.ClientID %>';
-
-        var formClientID = '<%= SimpleForm1.ClientID %>';
-        var hfFormIDClientID = '<%= hfFormID.ClientID %>';
-        var txtCodeClientID = '<%= txtCostTypeCode.ClientID %>';
-        var txtNameClientID = '<%= txtCostTypeName.ClientID %>';
-        var txtRemarkClientID = '<%=txtRemark.ClientID %>';
-
-        function onGridRowSelect(event, rowId) {
-            var grid = F(gridClientID);
-
-            // 启用删除按钮
-            F(btnDeleteClientID).enable();
-
-            // 当前行数据
-            var rowValue = grid.getRowValue(rowId);
-
-            // 使用当前行数据填充表单字段
-            F(hfFormIDClientID).setValue(rowId);
-            F(txtCodeClientID).setValue(rowValue['CostTypeCode']);
-            F(txtNameClientID).setValue(rowValue['CostTypeName']);
-            F(txtRemarkClientID).setValue(rowValue['Remark']);
-
-            // 更新保存按钮文本
-//            F(btnSaveClientID).setText('保存数据（编辑）');
-        }
-
-        function onNewButtonClick() {
-            // 重置表单字段
-            F(formClientID).reset();
-            F(hfFormIDClientID).reset();
-            // 清空表格选中行
-            F(gridClientID).clearSelections();
-            // 禁用删除按钮
-            F(btnDeleteClientID).disable();
-
-            // 更新保存按钮文本
-//            F(btnSaveClientID).setText('保存数据（新增）');
-        }
    </script>
 </body>
 </html>
@@ -1,6 +1,7 @@
 using BLL;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Web.UI.WebControls;

@@ -18,8 +19,6 @@ namespace FineUIPro.Web.BaseInfo
        {
            if (!IsPostBack)
            {
-                ////权限按钮方法
-                this.GetButtonPower();
                Funs.DropDownPageSize(this.ddlPageSize);
                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                // 绑定表格
@@ -33,47 +32,54 @@ namespace FineUIPro.Web.BaseInfo
        private void BindGrid()
        {
            var q = from x in Funs.DB.Base_CostType orderby x.CostTypeCode select x;
-            Grid1.RecordCount = q.Count();
-            // 2.获取当前分页数据
-            var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize);
+            DataTable tb = GetTreeDataTable(q.ToList()); //this.LINQToDataTable(getData.ToList());
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
            Grid1.DataSource = table;
            Grid1.DataBind();
        }

        /// <summary>
-        /// 分页
+        /// 获取模拟树表格
        /// </summary>
        /// <returns></returns>
-        private List<Model.Base_CostType> GetPagedDataTable(int pageIndex, int pageSize)
+        public DataTable GetTreeDataTable(List<Model.Base_CostType> getData)
        {
-            List<Model.Base_CostType> source = (from x in Funs.DB.Base_CostType orderby x.CostTypeCode select x).ToList();
-            List<Model.Base_CostType> paged = new List<Model.Base_CostType>();
+            DataTable table = new DataTable();
+            table.Columns.Add(new DataColumn("ID", typeof(string)));
+            table.Columns.Add(new DataColumn("ParentId", typeof(string)));
+            table.Columns.Add(new DataColumn("Code", typeof(int)));
+            table.Columns.Add(new DataColumn("Name", typeof(String)));
+            table.Columns.Add(new DataColumn("Remark", typeof(String)));

-            int rowbegin = pageIndex * pageSize;
-            int rowend = (pageIndex + 1) * pageSize;
-            if (rowend > source.Count())
+            foreach (var item in getData)
            {
-                rowend = source.Count();
+                DataRow row = table.NewRow();
+                row[0] = item.CostTypeId;
+                row[1] ="-1";
+                row[2] = item.CostTypeCode;
+                row[3] = item.CostTypeCode+ item.CostTypeName;
+                row[4] = item.Remark;
+                table.Rows.Add(row);
+                var getU = Funs.DB.Base_CostTypeItem.Where(x => x.CostTypeId == item.CostTypeId).OrderBy(x=>x.SortIndex);
+                foreach (var itemU in getU)
+                {
+                    DataRow rowC = table.NewRow();
+                    rowC[0] = itemU.CostTypeItemId;
+                    rowC[1] = item.CostTypeId;
+                    rowC[2] = itemU.SortIndex.ToString();
+                    rowC[3] = itemU.SortIndex.ToString() + itemU.CostTypeItemName;
+                    rowC[4] = itemU.Remark;
+                    table.Rows.Add(rowC);
+                }
            }

-            for (int i = rowbegin; i < rowend; i++)
-            {
-                paged.Add(source[i]);
-            }
-
-            return paged;
+            return table;
        }

-        /// <summary>
-        /// 过滤表头
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_FilterChange(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
+        #endregion

+        #region 分页 排序
        /// <summary>
        /// 改变索引事件
        /// </summary>
@@ -81,198 +87,31 @@ namespace FineUIPro.Web.BaseInfo
        /// <param name="e"></param>
        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
        {
-            Grid1.PageIndex = e.NewPageIndex;
            BindGrid();
        }
-        #endregion

-        #region 分页下拉选择
        /// <summary>
-        /// 分页下拉选择
+        /// 分页下拉选择事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
        {
-            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
            BindGrid();
        }
-        #endregion

-        #region 删除
        /// <summary>
-        /// 删除
+        /// 
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        protected void btnDelete_Click(object sender, EventArgs e)
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
        {
-            var getV = BLL.CostTypeService.GetCostTypeById(hfFormID.Text);
-            if (getV != null)
-            {
-                BLL.LogService.AddSys_Log(this.CurrUser, getV.CostTypeCode, getV.CostTypeId, BLL.Const.CostTypeMenuId, BLL.Const.BtnDelete);
-                BLL.CostTypeService.DeleteCostTypeById(hfFormID.Text);
-                // 重新绑定表格，并模拟点击[新增按钮]
-                BindGrid();
-                PageContext.RegisterStartupScript("onNewButtonClick();");
-            }
-        }
-
-        /// <summary>
-        /// 右键删除事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuDelete_Click(object sender, EventArgs e)
-        {
-            this.DeleteData();
-        }
-
-        /// <summary>
-        /// 删除方法
-        /// </summary>
-        private void DeleteData()
-        {
-            if (Grid1.SelectedRowIndexArray.Length > 0)
-            {
-                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
-                {
-                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var getV = BLL.CostTypeService.GetCostTypeById(rowID);
-                    if (getV != null)
-                    {
-                        BLL.LogService.AddSys_Log(this.CurrUser, getV.CostTypeCode, getV.CostTypeId, BLL.Const.CostTypeMenuId, BLL.Const.BtnDelete);
-                        BLL.CostTypeService.DeleteCostTypeById(rowID);
-                    }
-                }
-
-                BindGrid();
-                PageContext.RegisterStartupScript("onNewButtonClick();");
-            }
-        }
-        #endregion
-
-        #region 编辑
-        /// <summary>
-        /// 右键编辑事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuEdit_Click(object sender, EventArgs e)
-        {
-            this.EditData();
-        }
-
-        /// <summary>
-        /// 编辑数据方法
-        /// </summary>
-        private void EditData()
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-            string Id = Grid1.SelectedRowID;
-            var costType = BLL.CostTypeService.GetCostTypeById(Id);
-            if (costType != null)
-            {
-                this.txtCostTypeCode.Text = costType.CostTypeCode;
-                this.txtCostTypeName.Text = costType.CostTypeName;
-                this.txtRemark.Text = costType.Remark;
-                hfFormID.Text = Id;
-                this.btnDelete.Enabled = true;
-            }
-        }
-        #endregion
-
-        #region 保存
-        /// <summary>
-        /// 保存按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSave_Click(object sender, EventArgs e)
-        {
-            string strRowID = hfFormID.Text;
-            Model.Base_CostType costType = new Model.Base_CostType
-            {
-                CostTypeCode = this.txtCostTypeCode.Text.Trim(),
-                CostTypeName = this.txtCostTypeName.Text.Trim(),
-                Remark = txtRemark.Text.Trim()
-            };
-            if (string.IsNullOrEmpty(strRowID))
-            {
-                costType.CostTypeId = SQLHelper.GetNewID(typeof(Model.Base_CostType));
-                BLL.CostTypeService.AddCostType(costType);
-                BLL.LogService.AddSys_Log(this.CurrUser, costType.CostTypeCode, costType.CostTypeId, BLL.Const.CostTypeMenuId, BLL.Const.BtnAdd);
-            }
-            else
-            {
-                costType.CostTypeId = strRowID;
-                BLL.CostTypeService.UpdateCostType(costType);
-                BLL.LogService.AddSys_Log(this.CurrUser, costType.CostTypeCode, costType.CostTypeId, BLL.Const.CostTypeMenuId, BLL.Const.BtnModify);
-            }
-
-            this.SimpleForm1.Reset();
-            // 重新绑定表格，并点击当前编辑或者新增的行
            BindGrid();
-            PageContext.RegisterStartupScript(String.Format("F('{0}').selectRow('{1}');", Grid1.ClientID, costType.CostTypeId));
        }
+
        #endregion
                
-        #region 验证费用类别名称、编号是否存在
-        /// <summary>
-        /// 验证费用类别名称、编号是否存在
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void TextBox_TextChanged(object sender, EventArgs e)
-        {
-            var q = Funs.DB.Base_CostType.FirstOrDefault(x => x.CostTypeCode == this.txtCostTypeCode.Text.Trim() && (x.CostTypeId != hfFormID.Text || (hfFormID.Text == null && x.CostTypeId != null)));
-            if (q != null)
-            {
-                ShowNotify("输入的类别编号已存在！", MessageBoxIcon.Warning);
-            }
-
-            var q2 = Funs.DB.Base_CostType.FirstOrDefault(x => x.CostTypeName == this.txtCostTypeName.Text.Trim() && (x.CostTypeId != hfFormID.Text || (hfFormID.Text == null && x.CostTypeId != null)));
-            if (q2 != null)
-            {
-                ShowNotify("输入的类别名称已存在！", MessageBoxIcon.Warning);
-            }
-        }
-        #endregion
-
-        #region 获取按钮权限
-        /// <summary>
-        /// 获取按钮权限
-        /// </summary>
-        /// <param name="button"></param>
-        /// <returns></returns>
-        private void GetButtonPower()
-        {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.CostTypeMenuId);
-            if (buttonList.Count() > 0)
-            {
-                if (buttonList.Contains(BLL.Const.BtnAdd))
-                {
-                    this.btnNew.Hidden = false;
-                }
-                if (buttonList.Contains(BLL.Const.BtnModify))
-                {
-                    this.btnMenuEdit.Hidden = false;
-                }
-                if (buttonList.Contains(BLL.Const.BtnDelete))
-                {
-                    this.btnDelete.Hidden = false;
-                    this.btnMenuDelete.Hidden = false;
-                }
-                if (buttonList.Contains(BLL.Const.BtnSave))
-                {
-                    this.btnSave.Hidden = false;
-                }
-            }
-        }
-        #endregion        
    }
 }
@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.BaseInfo {
+namespace FineUIPro.Web.BaseInfo
+{


-    public partial class CostType {
+    public partial class CostType
+    {

        /// <summary>
        /// form1 控件。
@@ -74,122 +76,5 @@ namespace FineUIPro.Web.BaseInfo {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList ddlPageSize;
-        
-        /// <summary>
-        /// SimpleForm1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.SimpleForm SimpleForm1;
-        
-        /// <summary>
-        /// hfFormID 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
-        
-        /// <summary>
-        /// txtCostTypeCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCostTypeCode;
-        
-        /// <summary>
-        /// txtCostTypeName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCostTypeName;
-        
-        /// <summary>
-        /// txtRemark 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
-        
-        /// <summary>
-        /// Toolbar1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar1;
-        
-        /// <summary>
-        /// btnNew 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnNew;
-        
-        /// <summary>
-        /// btnDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnDelete;
-        
-        /// <summary>
-        /// ToolbarFill1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
-        /// <summary>
-        /// btnSave 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSave;
-        
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-        
-        /// <summary>
-        /// btnMenuEdit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuEdit;
-        
-        /// <summary>
-        /// btnMenuDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDelete;
    }
 }
@@ -752,9 +752,10 @@
    <Content Include="HSSE\CostGoods\CostSmallDetail.aspx" />
    <Content Include="HSSE\CostGoods\CostSmallDetailEdit.aspx" />
    <Content Include="HSSE\CostGoods\CostSmallDetailView.aspx" />
-    <Content Include="HSSE\CostGoods\Expense.aspx" />
+    <Content Include="HSSE\CostGoods\ExpenseUnit.aspx" />
    <Content Include="HSSE\CostGoods\ExpenseEdit.aspx" />
    <Content Include="HSSE\CostGoods\ExpenseView.aspx" />
+    <Content Include="HSSE\CostGoods\Expense.aspx" />
    <Content Include="HSSE\EduTrain\AccidentCase.aspx" />
    <Content Include="HSSE\EduTrain\AccidentCaseItemSave.aspx" />
    <Content Include="HSSE\EduTrain\AccidentCaseItemSelectCloumn.aspx" />
@@ -1654,6 +1655,7 @@
    <Content Include="obj\Debug\Web.csprojResolveAssemblyReference.cache" />
    <Content Include="File\Word\Person\员工总结模板.doc" />
    <Fakes Include="Fakes\FastReport.fakes" />
+    <Content Include="libman.json" />
    <None Include="packages.config" />
    <Content Include="ReportPrint\ReportTabFile\分包商上传周报.tab" />
    <Content Include="ReportPrint\ReportTabFile\HSSE日志暨管理数据收集.tab" />
@@ -9307,12 +9309,12 @@
    <Compile Include="HSSE\CostGoods\CostSmallDetailView.aspx.designer.cs">
      <DependentUpon>CostSmallDetailView.aspx</DependentUpon>
    </Compile>
-    <Compile Include="HSSE\CostGoods\Expense.aspx.cs">
-      <DependentUpon>Expense.aspx</DependentUpon>
+    <Compile Include="HSSE\CostGoods\ExpenseUnit.aspx.cs">
+      <DependentUpon>ExpenseUnit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
-    <Compile Include="HSSE\CostGoods\Expense.aspx.designer.cs">
-      <DependentUpon>Expense.aspx</DependentUpon>
+    <Compile Include="HSSE\CostGoods\ExpenseUnit.aspx.designer.cs">
+      <DependentUpon>ExpenseUnit.aspx</DependentUpon>
    </Compile>
    <Compile Include="HSSE\CostGoods\ExpenseEdit.aspx.cs">
      <DependentUpon>ExpenseEdit.aspx</DependentUpon>
@@ -9328,6 +9330,13 @@
    <Compile Include="HSSE\CostGoods\ExpenseView.aspx.designer.cs">
      <DependentUpon>ExpenseView.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HSSE\CostGoods\Expense.aspx.cs">
+      <DependentUpon>Expense.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\CostGoods\Expense.aspx.designer.cs">
+      <DependentUpon>Expense.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HSSE\EduTrain\AccidentCase.aspx.cs">
      <DependentUpon>AccidentCase.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -13522,7 +13531,7 @@
          <AutoAssignPort>True</AutoAssignPort>
          <DevelopmentServerPort>0</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:3027/</IISUrl>
+          <IISUrl>http://localhost:5403/</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
@@ -105,8 +105,8 @@
            </Items>
        </f:Panel>
        <f:Window ID="Window1" Title="奖励通知单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-            Height="620px">
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
+            Height="650px" Maximized="true">
        </f:Window>
        <f:Menu ID="Menu1" runat="server">
            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IncentiveNoticeAdd.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.IncentiveNoticeAdd" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IncentiveNoticeAdd.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.IncentiveNoticeAdd" ValidateRequest="false" %>

 <!DOCTYPE html>

@@ -113,7 +113,7 @@
        </f:Panel>
        <f:Window ID="Window1" Title="处罚通知单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
-            Height="600px" OnClose="Window1_Close">
+            Height="600px" OnClose="Window1_Close" Maximized="true">
        </f:Window>
        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px" OnClose="WindowAtt_Close"
@@ -130,7 +130,7 @@
                                <f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
                                    FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
+                                <f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
                                    FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                </f:RenderField>
                                <f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.HSSE.Check
        //办理记录
        public void BindGrid1()
        {
-            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
            List<SqlParameter> listStr = new List<SqlParameter>();
            strSql += "where PunishNoticeId= @PunishNoticeId";
            listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));
@@ -132,7 +132,7 @@
                                        <f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
                                            FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
+                                        <f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
                                            FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                        </f:RenderField>
                                        <f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
@@ -174,7 +174,7 @@ namespace FineUIPro.Web.HSSE.Check
        //办理记录
        public void BindGrid1()
        {
-            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
            List<SqlParameter> listStr = new List<SqlParameter>();
            strSql += "where PunishNoticeId= @PunishNoticeId";
            listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));
@@ -97,7 +97,7 @@
                                <f:RenderField Width="250px" ColumnID="OperateName" DataField="OperateName"
                                    FieldType="String" HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Left">
                                </f:RenderField>
-                                <f:RenderField Width="200px" ColumnID="UserName" DataField="UserName"
+                                <f:RenderField Width="200px" ColumnID="PersonName" DataField="PersonName"
                                    FieldType="String" HeaderText="操作人" HeaderTextAlign="Center" TextAlign="Center">
                                </f:RenderField>
                                <f:RenderField Width="150px" ColumnID="Opinion" DataField="Opinion"
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.HSSE.Check
        //办理记录
        public void BindGrid()
        {
-            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.UserName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.UserId ";
+            string strSql = @"select FlowOperateId, PunishNoticeId, OperateName, OperateManId, OperateTime, case when IsAgree='False' then '否' else '是' end  As IsAgree, Opinion,S.PersonName from Check_PunishNoticeFlowOperate C left join Person_Persons S on C.OperateManId=s.PersonId ";
            List<SqlParameter> listStr = new List<SqlParameter>();
            strSql += "where PunishNoticeId= @PunishNoticeId";
            listStr.Add(new SqlParameter("@PunishNoticeId", PunishNoticeId));
@@ -1,98 +1,86 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Expense.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.Expense" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Expense.aspx.cs"
+    Inherits="FineUIPro.Web.HSSE.CostGoods.Expense" %>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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" />
+    <title>费用计划</title>
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
 </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" EnableColumnLines="true" DataKeyNames="ExpenseId" ForceFit="true"
-                DataIDField="ExpenseId" AllowSorting="true" SortField="ExpenseCode" SortDirection="DESC" OnSort="Grid1_Sort" 
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" 
-                                OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="350px">
-                            </f:DropDownList>  
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
-                                runat="server">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="90px" ColumnID="ExpenseCode" DataField="ExpenseCode" SortField="ExpenseCode"
-                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" 
-                        SortField="UnitName" FieldType="String" HeaderText="填报单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="Months" DataField="Months" SortField="Months"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileMan" DataField="CompileMan"
-                        SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                  <%--  <f:WindowField TextAlign="Left" Width="160px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
-                        DataIFrameUrlFields="ExpenseId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ExpenseAttachUrl&menuId=EEE7CBBE-2EFB-4D64-96A6-A932E20FF9DB"
-                        HeaderTextAlign="Center" />--%>
-                </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="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        Height="560px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
-            Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <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="费用计划"  runat="server" BoxFlex="1"  ForceFit="true"
+                    AllowPaging="false" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true"   EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" >
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                            
+                                <f:DropDownList runat="server" ID="drpUnit" EnableEdit="true" Width="300px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                </f:DropDownList>
+                                <%--<f:DatePicker runat="server" Required="true" DateFormatString="yyyy" EmptyText="请选择年度" AutoPostBack="true"
+                                    ID="txtYear" DisplayType="Year" ShowTodayButton="false" OnTextChanged="drpUnit_SelectedIndexChanged">
+                                </f:DatePicker>--%>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <%--  <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click">
+                                </f:Button>--%>
+                                <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
+                                    runat="server">
+                                </f:Button>
+                                 <f:Button ID="btnUnit" Text="按单位" Icon="Table" EnablePostBack="false"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp" 
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+
+                    <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="Parent" EnableResize="false" runat="server" IsModal="true"
+            Width="1200px" Height="650px">
+        </f:Window>
+          <f:Window ID="Window2" Title="按单位" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Maximized="true"
+            Width="1200px" Height="650px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true" runat="server" Text="查看">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
    </form>
    <script type="text/javascript">
        var menuID = '<%= Menu1.ClientID %>';
@@ -2,16 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;

 namespace FineUIPro.Web.HSSE.CostGoods
 {
    public partial class Expense : PageBase
    {
-        #region 项目主键
        /// <summary>
-        /// 项目主键
+        /// 项目id
        /// </summary>
        public string ProjectId
        {
@@ -24,93 +22,214 @@ namespace FineUIPro.Web.HSSE.CostGoods
                ViewState["ProjectId"] = value;
            }
        }
+
+        #region Page_Init
+
+        // 注意：动态创建的代码需要放置于Page_Init（不是Page_Load），这样每次构造页面时都会执行
+        protected void Page_Init(object sender, EventArgs e)
+        {
+            InitYearGrid();
+        }
+
+        protected static DateTime sDate = new DateTime();
+        protected static DateTime eDate = new DateTime();
+        #region 按年份
+        private void InitYearGrid()
+        {
+            FineUIPro.BoundField bf;
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "Id";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "编号";
+            bf.Width = 60;
+             bf.Hidden = true;
+            Grid1.Columns.Add(bf);
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "SupCostTypeName";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "类别名称";
+            bf.Width = 90;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "CostTypeName";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "分项名称";
+            bf.Width = 120;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            this.ProjectId = this.ProjectId ?? this.CurrUser.LoginProjectId;
+            var getProject = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == this.ProjectId);
+            if (getProject != null)
+            {
+               sDate= getProject.StartDate ?? DateTime.Now;
+                eDate = getProject.EndDate ?? DateTime.Now;
+                for (int i = 0; sDate.Year + i <= eDate.Year; i++)
+                {
+                    bf = new FineUIPro.BoundField();
+                    bf.DataField = (sDate.Year + i).ToString();
+                    bf.DataFormatString = "{0}";
+                    bf.HeaderText = (sDate.Year + i).ToString() +"年";
+                    bf.Width = 200;
+                    bf.HeaderTextAlign = TextAlign.Center;
+                    Grid1.Columns.Add(bf);
+                }
+            }
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "SumC";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "合计";
+            bf.Width = 90;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            Grid1.DataKeyNames = new string[] { "Id", "CostTypeName" };
+        }
+        #endregion
+
        #endregion

-        #region 加载
-        /// <summary>
-        /// 加载页面
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
        protected void Page_Load(object sender, EventArgs e)
        {
            if (!IsPostBack)
            {
-                Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
                {
                    this.ProjectId = Request.Params["projectId"];
                }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
-                }
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ////权限按钮方法
+                this.GetButtonPower();
                this.btnNew.OnClientClick = Window1.GetShowReference("ExpenseEdit.aspx") + "return false;";
-                // 绑定表格
-                this.BindGrid();
+                this.btnUnit.OnClientClick = Window2.GetShowReference("ExpenseUnit.aspx") + "return false;";
+                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, false);
+                Funs.FineUIPleaseSelect(drpUnit, "请选择单位");
+                LoadData();
            }
        }
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
-        private void BindGrid()
-        {
-            string strSql = @" SELECT Expense.ExpenseId, "
-                          + @" Expense.ProjectId,"
-                          + @" CodeRecords.Code AS ExpenseCode,"
-                          + @" Expense.UnitId,"
-                          + @" Expense.CompileMan,"
-                          + @" Expense.Months,"
-                          + @" Expense.CompileDate,"
-                          + @" Expense.States,"
-                          + @" Unit.UnitName,"
-                          + @" (CASE WHEN Expense.States = " + BLL.Const.State_0 + " OR Expense.States IS NULL THEN '待['+OperateUser.PersonName+']提交' WHEN Expense.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS  FlowOperateName"
-                          + @" FROM CostGoods_Expense AS Expense "
-                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON Expense.ExpenseId = CodeRecords.DataId "
-                          + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON Expense.ExpenseId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
-                          + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId = OperateUser.PersonId"
-                          + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Expense.UnitId WHERE 1=1 ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            strSql += " AND Expense.ProjectId = @ProjectId";
-            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
-            {
-                listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
-                strSql += " AND Expense.States = @States";  ///状态为已完成
-                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
-            }
-            else
-            {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            }
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND Expense.UnitId = @UnitId";
-                listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
-            }
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

+        /// <summary>
+        /// 获取数据
+        /// </summary>
+        private void LoadData()
+        {
+            DataTable tb = GetDataTable(); //this.LINQToDataTable(getData.ToList());
            Grid1.RecordCount = tb.Rows.Count;
            var table = this.GetPagedDataTable(Grid1, tb);
            Grid1.DataSource = table;
            Grid1.DataBind();
        }
-        #endregion

-        #region 查询
        /// <summary>
-        /// 查询
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetDataTable()
+        {
+            DataTable table = new DataTable();
+            table.Columns.Add(new DataColumn("Id", typeof(string)));
+            table.Columns.Add(new DataColumn("SupCostTypeName", typeof(string)));
+            table.Columns.Add(new DataColumn("CostTypeName", typeof(string)));        
+            for (int i = 0; sDate.Year + i <= eDate.Year; i++)
+            {
+                table.Columns.Add(new DataColumn((sDate.Year + i).ToString(), typeof(string)));
+            }
+
+            table.Columns.Add(new DataColumn("SumC", typeof(String)));
+
+            if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
+            {
+                var getDetail = from x in Funs.DB.CostGoods_ExpenseDetail
+                                join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
+                                where y.ProjectId == this.ProjectId && y.UnitId == this.drpUnit.SelectedValue
+                                orderby y.Year, x.SupSortIndex, x.SortIndex
+                                select new { x.ExpenseDetailId, x.ExpenseId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney };
+
+                foreach (var item in getDetail)
+                {
+                    DataRow row = table.NewRow();
+                    row[0] = item.ExpenseDetailId +"#" +item.ExpenseId;
+                    row[1] = item.SupCostTypeName;
+                    row[2] = item.CostTypeName;
+                    int r = 3;
+                    for (int i = 0; sDate.Year + i <= eDate.Year; i++)
+                    {
+                        var getV = getDetail.Where(x => x.Year == sDate.Year + i && x.CostType == item.CostType);
+                        if (getV.Count() > 0)
+                        {
+                            row[r] = getV.Sum(x => x.CostMoney ?? 0);
+                        }
+                        else
+                        {
+                            row[r] = 0.00;
+                        }
+
+                        r = i + 4;
+                    }
+                    row[r] = getDetail.Where(x => x.CostType == item.CostType).Sum(x => x.CostMoney ?? 0);
+                    table.Rows.Add(row);
+                }
+            }
+            else
+            {
+                var getDetail = from x in Funs.DB.CostGoods_ExpenseDetail
+                                join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
+                                where y.ProjectId == this.ProjectId
+                                orderby y.Year, x.SupSortIndex, x.SortIndex
+                                select new { x.ExpenseDetailId, x.ExpenseId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney };
+
+                foreach (var item in getDetail)
+                {
+                    DataRow row = table.NewRow();
+                    row[0] = item.ExpenseDetailId + "#" + item.ExpenseId;
+                    row[1] = item.SupCostTypeName;
+                    row[2] = item.CostTypeName;
+                    int r = 3;
+                    for (int i = 0; sDate.Year + i <= eDate.Year; i++)
+                    {
+                        var getV = getDetail.Where(x => x.Year == sDate.Year + i && x.CostType == item.CostType);
+                        if (getV.Count() > 0)
+                        {
+                            row[r] = getV.Sum(x => x.CostMoney ?? 0);
+                        }
+                        else
+                        {
+                            row[r] = "0.00";
+                        }
+                       
+                        r = i + 4;
+                    }
+                    row[r] = getDetail.Where(x => x.CostType == item.CostType).Sum(x => x.CostMoney ?? 0);
+                    table.Rows.Add(row);
+                }
+            }
+
+            return table;
+        }
+
+
+        #region 导出按钮
+        /// 导出按钮
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        protected void TextBox_TextChanged(object sender, EventArgs e)
+        protected void btnOut_Click(object sender, EventArgs e)
        {
-            this.BindGrid();
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("费用计划" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+           
+            Response.Write(GetTableHtml(GetDataTable()));
+            Response.End();
        }
        #endregion

@@ -122,7 +241,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
        /// <param name="e"></param>
        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
        {
-            BindGrid();
+            LoadData();
        }

        /// <summary>
@@ -133,21 +252,31 @@ namespace FineUIPro.Web.HSSE.CostGoods
        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
        {
            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
-            BindGrid();
+            LoadData();
        }

        /// <summary>
-        /// 排序
+        /// 
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
        {
-            this.BindGrid();
+            LoadData();
        }
+
        #endregion

-        #region 编辑
+        /// <summary>
+        /// 查看
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            this.EditData("view");
+        }
+
        /// <summary>
        /// 双击事件
        /// </summary>
@@ -169,30 +298,33 @@ namespace FineUIPro.Web.HSSE.CostGoods
        }

        /// <summary>
-        /// 编辑数据方法
+        /// 编辑数据
        /// </summary>
-        private void EditData()
+        private void EditData(string type = null)
        {
            if (Grid1.SelectedRowIndexArray.Length == 0)
            {
                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                return;
            }
-            string id = Grid1.SelectedRowID;
-            var expense = BLL.ExpenseService.GetExpenseById(id);
-            if (expense != null)
+            string id = Grid1.SelectedRow.Values[0].ToString();
+            var getID = Funs.GetStrListByStr(id, '#');
+            if (getID != null && getID.Count > 1)
            {
-                if (this.btnMenuEdit.Hidden || expense.States == BLL.Const.State_2)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
+                var getEx = ExpenseService.GetExpenseById(getID[1]);
+                if (getEx != null && !string.IsNullOrEmpty(getEx.UnitId))
                {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseView.aspx?ExpenseId={0}", id, "查看 - ")));
-                }
-                else
-                {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseEdit.aspx?ExpenseId={0}", id, "编辑 - ")));
+                    if (this.btnMenuEdit.Hidden || type == "view")   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseView.aspx?ExpenseId={0}", id, "查看 - ")));
+                    }
+                    else
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseEdit.aspx?ExpenseId={0}", id, "编辑 - ")));
+                    }
                }
            }
        }
-        #endregion

        #region 删除
        /// <summary>
@@ -207,21 +339,30 @@ namespace FineUIPro.Web.HSSE.CostGoods
                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                {
                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var expense = BLL.ExpenseService.GetExpenseById(rowID);
-                    if (expense != null)
+                    var getEx = ExpenseService.GetExpenseById(rowID);
+                    if (getEx != null && !string.IsNullOrEmpty(getEx.UnitId))
                    {
-                        BLL.LogService.AddSys_Log(this.CurrUser, expense.ExpenseCode, expense.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnDelete);
-                        BLL.ExpenseDetailService.DeleteCostDetailByExpenseId(rowID);
+                        BLL.LogService.AddSys_Log(this.CurrUser, getEx.ExpenseCode, getEx.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnDelete);                    
                        BLL.ExpenseService.DeleteExpenseById(rowID);
                    }
                }

-                this.BindGrid();
+                this.LoadData();
                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
            }
        }
        #endregion

+        /// <summary>
+        /// 单位查询事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+           this.LoadData();
+        }
+
        #region 获取按钮权限
        /// <summary>
        /// 获取按钮权限
@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.CostGoods {
+namespace FineUIPro.Web.HSSE.CostGoods
+{


-    public partial class Expense {
+    public partial class Expense
+    {

        /// <summary>
        /// form1 控件。
@@ -58,22 +60,13 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Toolbar Toolbar2;

        /// <summary>
-        /// drpUnitId 控件。
+        /// drpUnit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitId;
-        
-        /// <summary>
-        /// ToolbarFill1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        protected global::FineUIPro.DropDownList drpUnit;

        /// <summary>
        /// btnNew 控件。
@@ -84,6 +77,24 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        /// </remarks>
        protected global::FineUIPro.Button btnNew;

+        /// <summary>
+        /// btnUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnUnit;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
        /// <summary>
        /// ToolbarSeparator1 控件。
        /// </summary>
@@ -121,13 +132,13 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Window Window1;

        /// <summary>
-        /// WindowAtt 控件。
+        /// Window2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Window WindowAtt;
+        protected global::FineUIPro.Window Window2;

        /// <summary>
        /// Menu1 控件。
@@ -138,6 +149,15 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        /// </remarks>
        protected global::FineUIPro.Menu Menu1;

+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+
        /// <summary>
        /// btnMenuEdit 控件。
        /// </summary>
@@ -1,329 +1,172 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ExpenseEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.ExpenseEdit"
    ValidateRequest="false" %>
-<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
-    TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>编辑安全费用计划</title>
+    <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" AutoSizePanelID="SimpleForm1" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="安全费用计划" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" 
-        Layout="VBox">
-        <Rows>
-            <f:FormRow ColumnWidths="30% 20% 50%">
-                <Items>
-                    <f:DropDownList ID="drpYear" runat="server" Label="月份" LabelWidth="100px" Required="true"
-                        ShowRedStar="true">
-                    </f:DropDownList>
-                    <f:DropDownList ID="drpMonths" runat="server" Required="true">
-                    </f:DropDownList>
-                    <f:TextBox ID="txtExpenseCode" runat="server" Label="编号" LabelAlign="Right" MaxLength="50"
-                        Readonly="true" Width="200px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="50% 50%">
-                <Items>
-                    <f:DropDownList ID="drpUnitId" runat="server" Label="填报单位" LabelAlign="Right" EnableEdit="true"
-                        Required="true" LabelWidth="100px" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitId_SelectedIndexChanged">
-                    </f:DropDownList>
-                    <f:DatePicker ID="txtReportDate" runat="server" Label="填报日期" LabelAlign="Right">
-                    </f:DatePicker>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel2" runat="server" ShowBorder="false" Layout="Table" TableConfigColumns="5"
-                        ShowHeader="false" BodyPadding="1px">
-                        <Items>
-                            <f:Panel ID="Panel1" Title="Panel1" MarginRight="0" Width="100px"
-                                runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
-                                <Items>
-                                    <f:Label runat="server" ID="Label58" Text="编号">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel3" Title="Panel1" runat="server" BodyPadding="1px" Width="200px"
-                                ShowBorder="false" ShowHeader="false" MarginLeft="50">
-                                <Items>
-                                    <f:Label runat="server" ID="lblAccidentType11" Text="类别">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel5" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="200px" ShowHeader="false" MarginLeft="60px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label1" Text="当期费用（元）">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel6" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="250px" ShowHeader="false" MarginLeft="115px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label3" Text="项目累计费用（元）">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel4" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="300px" ShowHeader="false" MarginLeft="180px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label2" Text="备注">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label5" Text="A1" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label6" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;基础管理" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA1" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA1_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA1" NoDecimal="false" NoNegative="false" Readonly="true"
-                        MinValue="0" runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA1" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label7" Text="A2" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label8" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;安全技术" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA2" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA2_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA2" NoDecimal="false" NoNegative="false" Readonly="true"
-                        MinValue="0" runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA2" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label9" Text="A3" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label10" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;职业健康" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA3" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA3_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA3" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA3" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label11" Text="A4" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label12" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;安全防护" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA4" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA4_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA4" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA4" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label13" Text="A5" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label14" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;化工试车" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA5" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA5_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA5" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA5" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label15" Text="A6" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label16" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;教育培训" Width="150px" >
-                    </f:Label>
-                    <f:NumberBox ID="nbA6" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbA6_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA6" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA6" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label29" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label17" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A安全生产费用合计" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbA" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label18" Text="" Width="400px">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label19" Text="B1" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label20" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;文明施工" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbB1" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbB1_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB1" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB1" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label21" Text="B2" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label22" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;临时设施" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbB2" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbB2_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB2" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB2" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label23" Text="B3" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label24" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;环境保护" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbB3" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        AutoPostBack="true" Label="" OnTextChanged="nbB3_TextChanged" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB3" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB3" Width="400px">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label30" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label25" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B文明施工措施费合计" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label26" Text="" Width="400px">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label31" Width="100px">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label27" Text="A+B安全生产及文明施工措施费总计" Width="150px">
-                    </f:Label>
-                    <f:NumberBox ID="nbAB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectAB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="" Width="200px">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label28" Text="" Width="400px">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-        </Rows>
-        <Toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server" Margin="0 50 30 50">
-                <Items>
-                    <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
-                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
-                    </f:Button>
-                    <f:HiddenField runat="server" ID="hdProjectA1">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectA2">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectA3">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectA4">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectA5">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectA6">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectB1">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectB2">
-                    </f:HiddenField>
-                    <f:HiddenField runat="server" ID="hdProjectB3">
-                    </f:HiddenField>
-                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                    </f:ToolbarFill>
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
-                        OnClick="btnSave_Click">
-                    </f:Button>
-                    <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
-                        OnClick="btnSubmit_Click">
-                    </f:Button>
-                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-    </f:Form>
-    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
+        <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"
+            Layout="VBox">
+            <Rows>
+                <f:FormRow ColumnWidths="50% 25% 20%">
+                    <Items>
+                        <f:DropDownList runat="server" ID="drpUnit" EnableEdit="true" Label="单位"
+                            AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                        </f:DropDownList>
+                        <f:DatePicker runat="server" Required="true" DateFormatString="yyyy" Label="年度" AutoPostBack="true"
+                            ID="txtYear" DisplayType="Year" ShowTodayButton="false" OnTextChanged="drpUnit_SelectedIndexChanged">
+                        </f:DatePicker>
+                        <f:DatePicker ID="txtReportDate" runat="server" Label="填报日期" LabelAlign="Right">
+                        </f:DatePicker>
+                        <f:Label runat="server" ID="lbSortIndex" Hidden="true"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel1" IsFluid="true" BodyPadding="10" EnableCollapse="false" Title="" runat="server"  ShowHeader="false">
+                            <Items>
+                                <f:GroupPanel Title="安全施工(单位：元)" BodyPadding="10" ID="GroupPanel1" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="false" runat="server" LabelAlign="Right">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="办公用品" FocusOnPageLoad="true" ID="txtA1" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="HSE培训" ID="txtA2" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="警示标识" ID="txtA3" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="检测器具" ID="txtA4" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="安全奖励" ID="txtA5" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="安全技术" ID="txtA6" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="安全用电" ID="txtA7" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="高处作业及临边孔洞" LabelWidth="150px" ID="txtA8" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="气瓶防护" ID="txtA9" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="脚手架（防护）" LabelWidth="150px" ID="txtA10" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="木工防护棚" ID="txtA11" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="钢筋加工防护棚" LabelWidth="150px" ID="txtA12" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="受限空间" ID="txtA13" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="机械设备" ID="txtA14" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="喷砂作业" ID="txtA15" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="消防" ID="txtA16" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="应急" ID="txtA17" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="化工试车" ID="txtA18" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="职业健康(单位：元)" BodyPadding="10" ID="GroupPanel2" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow ColumnWidths="50% 25% 25%">
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="临时设施(饮水间、厕所、吸烟室等)" LabelWidth="250px"
+                                                            ID="txtB1" DecimalPrecision="2" NoNegative="true">
+                                                        </f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="防护用品" ID="txtB2" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="体检费用" ID="txtB3" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="环境保护(单位：元)" BodyPadding="10" ID="GroupPanel3" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form3" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="噪声控制"
+                                                            ID="txtC1" DecimalPrecision="2" NoNegative="true">
+                                                        </f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="扬尘控制" ID="txtC2" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="固体废弃物清理" LabelWidth="150px" ID="txtC3" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="污水处理"
+                                                            ID="txtC4" DecimalPrecision="2" NoNegative="true">
+                                                        </f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="高危物质控制" LabelWidth="150px" ID="txtC5" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="防辐射" ID="txtC6" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="文明施工(单位：元)" BodyPadding="10" ID="GroupPanel4" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form4" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" Label="场容场貌"
+                                                            ID="txtD1" DecimalPrecision="2" NoNegative="true">
+                                                        </f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="宣传标识" ID="txtD2" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                        <f:NumberBox runat="server" Label="智慧化工地" ID="txtD3" DecimalPrecision="2" NoNegative="true"></f:NumberBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server" Margin="0 50 30 50">
+                    <Items>
+                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
    </form>
 </body>
 </html>
@@ -50,187 +50,80 @@ namespace FineUIPro.Web.HSSE.CostGoods
            {
                this.ProjectId = this.CurrUser.LoginProjectId;
                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                this.hdProjectA1.Text = "0";
-                this.hdProjectA2.Text = "0";
-                this.hdProjectA3.Text = "0";
-                this.hdProjectA4.Text = "0";
-                this.hdProjectA5.Text = "0";
-                this.hdProjectA6.Text = "0";
-                this.hdProjectB1.Text = "0";
-                this.hdProjectB2.Text = "0";
-                this.hdProjectB3.Text = "0";
-                this.InitDropDownList();
-                this.ExpenseId = Request.Params["ExpenseId"];
-                if (!string.IsNullOrEmpty(this.ExpenseId))
+                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, false);
+                if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && !CommonService.IsSedinOrSub(this.CurrUser.UnitId))
                {
-                    Model.CostGoods_Expense expense = BLL.ExpenseService.GetExpenseById(this.ExpenseId);
-                    if (expense != null)
+                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                    this.drpUnit.Readonly = true;
+                }
+
+                this.ExpenseId = Request.Params["ExpenseId"];
+                if (string.IsNullOrEmpty(this.ExpenseId))
+                {
+                    this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? Const.UnitId_SEDIN;
+                    this.txtYear.Text = DateTime.Now.Year.ToString();
+                    this.txtReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    var getEx = Funs.DB.CostGoods_Expense.FirstOrDefault(x => x.UnitId == this.drpUnit.SelectedValue && x.Year == Funs.GetNewInt(this.txtYear.Text));
+                    if (getEx != null)
                    {
-                        this.ProjectId = expense.ProjectId;
-                        if (this.ProjectId != this.CurrUser.LoginProjectId)
+                        this.ExpenseId = getEx.ExpenseId;
+                    }
+                    else
+                    {
+                        if (CommonService.IsSedinOrSub(this.drpUnit.SelectedValue))
                        {
-                            this.InitDropDownList();
+                            this.lbSortIndex.Text = "1";
                        }
-                        if (expense.Months != null)
+                        else
                        {
-                            //this.txtMonths.Text = string.Format("{0:yyyy-MM}", expense.Months);
-                            this.drpYear.SelectedValue = Convert.ToString(expense.Months.Value.Year);
-                            this.drpMonths.SelectedValue = Convert.ToString(expense.Months.Value.Month);
+                            var index = Funs.DB.CostGoods_Expense.Where(x => x.Year.ToString() == this.txtYear.Text).Max(x => x.SortIndex);
+                            if (index.HasValue)
+                            {
+                                this.lbSortIndex.Text = (index.Value + 1).ToString();
+                            }
+                            else
+                            {
+                                this.lbSortIndex.Text = "2";
+                            }
                        }
-                        this.txtExpenseCode.Text = CodeRecordsService.ReturnCodeByDataId(this.ExpenseId);
-                        if (!string.IsNullOrEmpty(expense.UnitId))
+
+                        Model.CostGoods_Expense newExpense = new Model.CostGoods_Expense
                        {
-                            this.drpUnitId.SelectedValue = expense.UnitId;
-                        }
-                        if (expense.ReportDate != null)
-                        {
-                            this.txtReportDate.Text = string.Format("{0:yyyy-MM-dd}", expense.ReportDate);
-                        }
-                        //this.txtCompileMan.Text = expense.CompileMan;
-                        //if (expense.CompileDate != null)
-                        //{
-                        //    this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", expense.CompileDate);
-                        //}
-                        //this.txtCheckMan.Text = expense.CheckMan;
-                        //if (expense.CheckDate != null)
-                        //{
-                        //    this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", expense.CheckDate);
-                        //}
-                        //this.txtApproveMan.Text = expense.ApproveMan;
-                        //if (expense.ApproveDate != null)
-                        //{
-                        //    this.txtApproveDate.Text = string.Format("{0:yyyy-MM-dd}", expense.ApproveDate);
-                        //}
-                        decimal totalA = 0, totalB = 0, totalProjectA = 0, totalProjectB = 0;
-                        Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
-                        List<Model.CostGoods_ExpenseDetail> projectDetails = BLL.ExpenseDetailService.GetCostDetailsByUnitId(expense.UnitId, project != null ? Convert.ToDateTime(project.StartDate) : Convert.ToDateTime("2000-01-01"), Convert.ToDateTime(expense.Months));
-                        List<Model.CostGoods_ExpenseDetail> details = BLL.ExpenseDetailService.GetExpenseDetailsByExpenseId(this.ExpenseId);
-                        Model.CostGoods_ExpenseDetail a1 = details.FirstOrDefault(x => x.CostType == "A1");
-                        this.hdProjectA1.Text = (from x in projectDetails where x.CostType == "A1" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectA2.Text = (from x in projectDetails where x.CostType == "A2" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectA3.Text = (from x in projectDetails where x.CostType == "A3" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectA4.Text = (from x in projectDetails where x.CostType == "A4" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectA5.Text = (from x in projectDetails where x.CostType == "A5" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectA6.Text = (from x in projectDetails where x.CostType == "A6" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectB1.Text = (from x in projectDetails where x.CostType == "B1" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectB2.Text = (from x in projectDetails where x.CostType == "B2" select x.CostMoney ?? 0).Sum().ToString();
-                        this.hdProjectB3.Text = (from x in projectDetails where x.CostType == "B3" select x.CostMoney ?? 0).Sum().ToString();
-                        if (a1 != null)
-                        {
-                            this.nbA1.Text = (a1.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA1.Text);
-                            this.nbProjectA1.Text = ((from x in projectDetails where x.CostType == "A1" select x.CostMoney ?? 0).Sum() + a1.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA1.Text);
-                            this.txtDefA1.Text = a1.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a2 = details.FirstOrDefault(x => x.CostType == "A2");
-                        if (a2 != null)
-                        {
-                            this.nbA2.Text = (a2.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA2.Text);
-                            this.nbProjectA2.Text = ((from x in projectDetails where x.CostType == "A2" select x.CostMoney ?? 0).Sum() + a2.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA2.Text);
-                            this.txtDefA2.Text = a2.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a3 = details.FirstOrDefault(x => x.CostType == "A3");
-                        if (a3 != null)
-                        {
-                            this.nbA3.Text = (a3.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA3.Text);
-                            this.nbProjectA3.Text = ((from x in projectDetails where x.CostType == "A3" select x.CostMoney ?? 0).Sum() + a3.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA3.Text);
-                            this.txtDefA3.Text = a3.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a4 = details.FirstOrDefault(x => x.CostType == "A4");
-                        if (a4 != null)
-                        {
-                            this.nbA4.Text = (a4.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA4.Text);
-                            this.nbProjectA4.Text = ((from x in projectDetails where x.CostType == "A4" select x.CostMoney ?? 0).Sum() + a4.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA4.Text);
-                            this.txtDefA4.Text = a4.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a5 = details.FirstOrDefault(x => x.CostType == "A5");
-                        if (a5 != null)
-                        {
-                            this.nbA5.Text = (a5.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA5.Text);
-                            this.nbProjectA5.Text = ((from x in projectDetails where x.CostType == "A5" select x.CostMoney ?? 0).Sum() + a5.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA5.Text);
-                            this.txtDefA5.Text = a5.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a6 = details.FirstOrDefault(x => x.CostType == "A6");
-                        if (a6 != null)
-                        {
-                            this.nbA6.Text = (a6.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA6.Text);
-                            this.nbProjectA6.Text = ((from x in projectDetails where x.CostType == "A6" select x.CostMoney ?? 0).Sum() + a6.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA6.Text);
-                            this.txtDefA6.Text = a6.CostDef;
-                        }
-                        this.nbA.Text = totalA.ToString();
-                        this.nbProjectA.Text = totalProjectA.ToString();
-                        Model.CostGoods_ExpenseDetail b1 = details.FirstOrDefault(x => x.CostType == "B1");
-                        if (b1 != null)
-                        {
-                            this.nbB1.Text = (b1.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB1.Text);
-                            this.nbProjectB1.Text = ((from x in projectDetails where x.CostType == "B1" select x.CostMoney ?? 0).Sum() + b1.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB1.Text);
-                            this.txtDefB1.Text = b1.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail b2 = details.FirstOrDefault(x => x.CostType == "B2");
-                        if (b2 != null)
-                        {
-                            this.nbB2.Text = (b2.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB2.Text);
-                            this.nbProjectB2.Text = ((from x in projectDetails where x.CostType == "B2" select x.CostMoney ?? 0).Sum() + b2.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB2.Text);
-                            this.txtDefB2.Text = b2.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail b3 = details.FirstOrDefault(x => x.CostType == "B3");
-                        if (b3 != null)
-                        {
-                            this.nbB3.Text = (b3.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB3.Text);
-                            this.nbProjectB3.Text = ((from x in projectDetails where x.CostType == "B3" select x.CostMoney ?? 0).Sum() + b3.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB3.Text);
-                            this.txtDefB3.Text = b3.CostDef;
-                        }
-                        this.nbB.Text = totalB.ToString();
-                        this.nbProjectB.Text = totalProjectB.ToString();
-                        this.nbAB.Text = (totalA + totalB).ToString();
-                        this.nbProjectAB.Text = (totalProjectA + totalProjectB).ToString();
+                            ExpenseId = SQLHelper.GetNewID(),
+                            ProjectId = this.ProjectId,
+                            UnitId = this.drpUnit.SelectedValue,
+                            ReportDate = DateTime.Now,
+                            CreateDate = DateTime.Now,
+                            CompileMan =this.CurrUser.PersonId,
+                            CompileDate = DateTime.Now,
+                            Year =Funs.GetNewInt(this.txtYear.Text),
+                            SortIndex=Funs.GetNewIntOrZero(this.lbSortIndex.Text),
+                        };
+
+                        ExpenseService.AddExpense(newExpense);
+                        ExpenseDetailService.AddCostDetail(newExpense.ExpenseId);
                    }
                }
-                else
-                {
-                    this.drpYear.SelectedValue = Convert.ToString(DateTime.Now.Year);
-                    this.drpMonths.SelectedValue = Convert.ToString(DateTime.Now.Month);
-                    //this.txtMonths.Text = DateTime.Now.ToString("yyyy-MM");
-                    //this.txtCompileMan.Text = this.CurrUser.PersonName;
-                    this.txtReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    //this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    ////自动生成编码
-                    this.txtExpenseCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectExpenseMenuId, this.ProjectId, this.CurrUser.UnitId);
-                }
-                ///初始化审核菜单
-                this.ctlAuditFlow.MenuId = BLL.Const.ProjectExpenseMenuId;
-                this.ctlAuditFlow.DataId = this.ExpenseId;
-                this.ctlAuditFlow.ProjectId = this.ProjectId;
-                this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
+
+                SetPage(BLL.ExpenseService.GetExpenseById(this.ExpenseId));
            }
        }
        #endregion

        /// <summary>
-        ///  初始化下拉框
+        /// 
        /// </summary>
-        private void InitDropDownList()
+        private void SetPage(Model.CostGoods_Expense expense)
        {
-            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-            BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
-            BLL.ConstValue.InitConstValueDropDownList(this.drpMonths, BLL.ConstValue.Group_0009, true);
+            if (expense != null)
+            {
+                this.ExpenseId = expense.ExpenseId;
+                this.ProjectId = expense.ProjectId;
+                this.drpUnit.SelectedValue = expense.UnitId;
+                this.txtYear.Text = expense.Year.ToString();
+                this.lbSortIndex.Text=expense.SortIndex.ToString();
+              
+            }            
        }

        #region 保存
@@ -241,36 +134,15 @@ namespace FineUIPro.Web.HSSE.CostGoods
        /// <param name="e"></param>
        protected void btnSave_Click(object sender, EventArgs e)
        {
-            if (this.drpYear.SelectedValue == BLL.Const._Null || this.drpMonths.SelectedValue == BLL.Const._Null)
+            if (this.drpUnit.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.txtYear.Text))
            {
-                Alert.ShowInTop("请选择月份", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请选择单位、年度！", MessageBoxIcon.Warning);
                return;
            }
            this.SaveData(BLL.Const.BtnSave);
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
        }

-        /// <summary>
-        /// 提交按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSubmit_Click(object sender, EventArgs e)
-        {
-            if (this.drpYear.SelectedValue == BLL.Const._Null || this.drpMonths.SelectedValue == BLL.Const._Null)
-            {
-                Alert.ShowInTop("请选择月份", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
-            {
-                ShowNotify("请选择下一步办理人！", MessageBoxIcon.Warning);
-                return;
-            }
-            this.SaveData(BLL.Const.BtnSubmit);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
-        }
-
        /// <summary>
        /// 保存数据
        /// </summary>
@@ -279,37 +151,18 @@ namespace FineUIPro.Web.HSSE.CostGoods
        {
            Model.CostGoods_Expense expense = new Model.CostGoods_Expense
            {
-                ProjectId = this.ProjectId
-            };
-            //if (!string.IsNullOrEmpty(this.txtMonths.Text))
-            //{
-            //    expense.Months = Funs.GetNewDateTime(this.txtMonths.Text + "-01");
-            //}
-            if (this.drpYear.SelectedValue != BLL.Const._Null && this.drpMonths.SelectedValue != BLL.Const._Null)
-            {
-                expense.Months = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + this.drpMonths.SelectedValue);
-            }
-            expense.ExpenseCode = this.txtExpenseCode.Text.Trim();
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                expense.UnitId = this.drpUnitId.SelectedValue;
-            }
-            expense.ReportDate = Funs.GetNewDateTime(this.txtReportDate.Text.Trim());
+                ProjectId = this.ProjectId,            
+                UnitId = this.drpUnit.SelectedValue,
+                ReportDate = Funs.GetNewDateTime(this.txtReportDate.Text.Trim()),              
+                CompileDate = DateTime.Now,
+                CompileMan = this.CurrUser.PersonId,
+                SortIndex = Funs.GetNewInt(this.lbSortIndex.Text),
+                Year =Funs.GetNewInt(this.txtYear.Text),
+                
+            };
                     
-            //expense.CheckMan = this.txtCheckMan.Text;
-            //expense.CheckDate = Funs.GetNewDateTime(this.txtCheckDate.Text.Trim());
-            //expense.ApproveMan = this.txtApproveMan.Text;
-            //expense.ApproveDate = Funs.GetNewDateTime(this.txtApproveDate.Text.Trim());
-            ////单据状态
-            expense.States = BLL.Const.State_0;
-            if (type == BLL.Const.BtnSubmit)
-            {
-                expense.States = this.ctlAuditFlow.NextStep;
-            }
            if (!string.IsNullOrEmpty(this.ExpenseId))
            {
-                expense.CompileDate = DateTime.Now;
-                expense.CompileMan = this.CurrUser.PersonId;
                expense.ExpenseId = this.ExpenseId;
                BLL.ExpenseService.UpdateExpense(expense);
                BLL.LogService.AddSys_Log(this.CurrUser, expense.ExpenseCode, expense.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnModify);
@@ -317,25 +170,13 @@ namespace FineUIPro.Web.HSSE.CostGoods
            }
            else
            {
-                this.ExpenseId = SQLHelper.GetNewID(typeof(Model.CostGoods_Expense));
+                this.ExpenseId = SQLHelper.GetNewID();
                expense.ExpenseId = this.ExpenseId;
-                expense.CompileMan = this.CurrUser.PersonName;
-                expense.CompileDate = DateTime.Now;
+                expense.CreateDate = DateTime.Now;
                BLL.ExpenseService.AddExpense(expense);
                BLL.LogService.AddSys_Log(this.CurrUser, expense.ExpenseCode, expense.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnAdd);
            }
-            //保存费用明细
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A1", Funs.GetNewDecimalOrZero(this.nbA1.Text), this.txtDefA1.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A2", Funs.GetNewDecimalOrZero(this.nbA2.Text), this.txtDefA2.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A3", Funs.GetNewDecimalOrZero(this.nbA3.Text), this.txtDefA3.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A4", Funs.GetNewDecimalOrZero(this.nbA4.Text), this.txtDefA4.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A5", Funs.GetNewDecimalOrZero(this.nbA5.Text), this.txtDefA5.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "A6", Funs.GetNewDecimalOrZero(this.nbA6.Text), this.txtDefA6.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "B1", Funs.GetNewDecimalOrZero(this.nbB1.Text), this.txtDefB1.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "B2", Funs.GetNewDecimalOrZero(this.nbB2.Text), this.txtDefB2.Text.Trim());
-            BLL.ExpenseDetailService.AddCostDetail(expense.ExpenseId, "B3", Funs.GetNewDecimalOrZero(this.nbB3.Text), this.txtDefB3.Text.Trim());
-            ////保存流程审核数据         
-            this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectExpenseMenuId, this.ExpenseId, (type == BLL.Const.BtnSubmit ? true : false), expense.ExpenseCode, "../CostGoods/ExpenseView.aspx?ExpenseId={0}");
+       
        }
        #endregion

@@ -355,214 +196,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
        }
        #endregion

-        #region 输入框变化事件
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA1_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA1.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbA1.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA1.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }

-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA2_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA2.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA2.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA3_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA3.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA3.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA4_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA4.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA4.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA5_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA5.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA5.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbA6_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectA6.Text = (Funs.GetNewDecimalOrZero(this.hdProjectA6.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbA.Text = (Funs.GetNewDecimalOrZero(this.nbA1.Text) + Funs.GetNewDecimalOrZero(this.nbA2.Text) + Funs.GetNewDecimalOrZero(this.nbA3.Text) + Funs.GetNewDecimalOrZero(this.nbA4.Text) + Funs.GetNewDecimalOrZero(this.nbA5.Text) + Funs.GetNewDecimalOrZero(this.nbA6.Text)).ToString();
-                this.nbProjectA.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA3.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA4.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA5.Text) + Funs.GetNewDecimalOrZero(this.nbProjectA6.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbA6.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbB1_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectB1.Text = (Funs.GetNewDecimalOrZero(this.hdProjectB1.Text) + Funs.GetNewDecimalOrZero(this.nbB1.Text)).ToString();
-                this.nbB.Text = (Funs.GetNewDecimalOrZero(this.nbB1.Text) + Funs.GetNewDecimalOrZero(this.nbB2.Text) + Funs.GetNewDecimalOrZero(this.nbB3.Text)).ToString();
-                this.nbProjectB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectB1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB3.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbB1.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbB2_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectB2.Text = (Funs.GetNewDecimalOrZero(this.hdProjectB2.Text) + Funs.GetNewDecimalOrZero(this.nbB2.Text)).ToString();
-                this.nbB.Text = (Funs.GetNewDecimalOrZero(this.nbB1.Text) + Funs.GetNewDecimalOrZero(this.nbB2.Text) + Funs.GetNewDecimalOrZero(this.nbB3.Text)).ToString();
-                this.nbProjectB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectB1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB3.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbB2.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 输入框变化事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void nbB3_TextChanged(object sender, EventArgs e)
-        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
-            {
-                this.nbProjectB3.Text = (Funs.GetNewDecimalOrZero(this.hdProjectB3.Text) + Funs.GetNewDecimalOrZero(this.nbB3.Text)).ToString();
-                this.nbB.Text = (Funs.GetNewDecimalOrZero(this.nbB1.Text) + Funs.GetNewDecimalOrZero(this.nbB2.Text) + Funs.GetNewDecimalOrZero(this.nbB3.Text)).ToString();
-                this.nbProjectB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectB1.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB2.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB3.Text)).ToString();
-                this.nbAB.Text = (Funs.GetNewDecimalOrZero(this.nbA.Text) + Funs.GetNewDecimalOrZero(this.nbB.Text)).ToString();
-                this.nbProjectAB.Text = (Funs.GetNewDecimalOrZero(this.nbProjectA.Text) + Funs.GetNewDecimalOrZero(this.nbProjectB.Text)).ToString();
-            }
-            else
-            {
-                this.nbB3.Text = string.Empty;
-                Alert.ShowInTop("请先选择填报单位！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-        #endregion

        #region 单位变化事件
        /// <summary>
@@ -570,33 +204,11 @@ namespace FineUIPro.Web.HSSE.CostGoods
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
        {
-            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            if (this.drpUnit.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.txtYear.Text))
            {
-                Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
-                List<Model.CostGoods_ExpenseDetail> projectDetails = BLL.ExpenseDetailService.GetCostDetailsByUnitId(this.drpUnitId.SelectedValue, project != null ? Convert.ToDateTime(project.StartDate) : Convert.ToDateTime("2000-01-01"), Convert.ToDateTime(this.drpYear.SelectedValue + "-" + this.drpMonths.SelectedValue + "-01"));
-                this.hdProjectA1.Text = (from x in projectDetails where x.CostType == "A1" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectA2.Text = (from x in projectDetails where x.CostType == "A2" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectA3.Text = (from x in projectDetails where x.CostType == "A3" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectA4.Text = (from x in projectDetails where x.CostType == "A4" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectA5.Text = (from x in projectDetails where x.CostType == "A5" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectA6.Text = (from x in projectDetails where x.CostType == "A6" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectB1.Text = (from x in projectDetails where x.CostType == "B1" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectB2.Text = (from x in projectDetails where x.CostType == "B2" select x.CostMoney ?? 0).Sum().ToString();
-                this.hdProjectB3.Text = (from x in projectDetails where x.CostType == "B3" select x.CostMoney ?? 0).Sum().ToString();
-            }
-            else
-            {
-                this.hdProjectA1.Text = "0";
-                this.hdProjectA2.Text = "0";
-                this.hdProjectA3.Text = "0";
-                this.hdProjectA4.Text = "0";
-                this.hdProjectA5.Text = "0";
-                this.hdProjectA6.Text = "0";
-                this.hdProjectB1.Text = "0";
-                this.hdProjectB2.Text = "0";
-                this.hdProjectB3.Text = "0";
+                SetPage(Funs.DB.CostGoods_Expense.FirstOrDefault(x => x.UnitId == this.drpUnit.SelectedValue && x.Year.ToString() == this.txtYear.Text));
            }
        }
        #endregion
@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.CostGoods {
+namespace FineUIPro.Web.HSSE.CostGoods
+{


-    public partial class ExpenseEdit {
+    public partial class ExpenseEdit
+    {

        /// <summary>
        /// form1 控件。
@@ -40,40 +42,22 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Form SimpleForm1;

        /// <summary>
-        /// drpYear 控件。
+        /// drpUnit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpYear;
+        protected global::FineUIPro.DropDownList drpUnit;

        /// <summary>
-        /// drpMonths 控件。
+        /// txtYear 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpMonths;
-        
-        /// <summary>
-        /// txtExpenseCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtExpenseCode;
-        
-        /// <summary>
-        /// drpUnitId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitId;
+        protected global::FineUIPro.DatePicker txtYear;

        /// <summary>
        /// txtReportDate 控件。
@@ -85,13 +69,13 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.DatePicker txtReportDate;

        /// <summary>
-        /// Panel2 控件。
+        /// lbSortIndex 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel2;
+        protected global::FineUIPro.Label lbSortIndex;

        /// <summary>
        /// Panel1 控件。
@@ -103,643 +87,346 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Panel Panel1;

        /// <summary>
-        /// Label58 控件。
+        /// GroupPanel1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label58;
+        protected global::FineUIPro.GroupPanel GroupPanel1;

        /// <summary>
-        /// Panel3 控件。
+        /// SimpleForm2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel3;
+        protected global::FineUIPro.Form SimpleForm2;

        /// <summary>
-        /// lblAccidentType11 控件。
+        /// txtA1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label lblAccidentType11;
+        protected global::FineUIPro.NumberBox txtA1;

        /// <summary>
-        /// Panel5 控件。
+        /// txtA2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel5;
+        protected global::FineUIPro.NumberBox txtA2;

        /// <summary>
-        /// Label1 控件。
+        /// txtA3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label1;
+        protected global::FineUIPro.NumberBox txtA3;

        /// <summary>
-        /// Panel6 控件。
+        /// txtA4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel6;
+        protected global::FineUIPro.NumberBox txtA4;

        /// <summary>
-        /// Label3 控件。
+        /// txtA5 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label3;
+        protected global::FineUIPro.NumberBox txtA5;

        /// <summary>
-        /// Panel4 控件。
+        /// txtA6 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel4;
+        protected global::FineUIPro.NumberBox txtA6;

        /// <summary>
-        /// Label2 控件。
+        /// txtA7 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label2;
+        protected global::FineUIPro.NumberBox txtA7;

        /// <summary>
-        /// Label5 控件。
+        /// txtA8 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label5;
+        protected global::FineUIPro.NumberBox txtA8;

        /// <summary>
-        /// Label6 控件。
+        /// txtA9 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label6;
+        protected global::FineUIPro.NumberBox txtA9;

        /// <summary>
-        /// nbA1 控件。
+        /// txtA10 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA1;
+        protected global::FineUIPro.NumberBox txtA10;

        /// <summary>
-        /// nbProjectA1 控件。
+        /// txtA11 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA1;
+        protected global::FineUIPro.NumberBox txtA11;

        /// <summary>
-        /// txtDefA1 控件。
+        /// txtA12 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA1;
+        protected global::FineUIPro.NumberBox txtA12;

        /// <summary>
-        /// Label7 控件。
+        /// txtA13 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label7;
+        protected global::FineUIPro.NumberBox txtA13;

        /// <summary>
-        /// Label8 控件。
+        /// txtA14 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label8;
+        protected global::FineUIPro.NumberBox txtA14;

        /// <summary>
-        /// nbA2 控件。
+        /// txtA15 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA2;
+        protected global::FineUIPro.NumberBox txtA15;

        /// <summary>
-        /// nbProjectA2 控件。
+        /// txtA16 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA2;
+        protected global::FineUIPro.NumberBox txtA16;

        /// <summary>
-        /// txtDefA2 控件。
+        /// txtA17 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA2;
+        protected global::FineUIPro.NumberBox txtA17;

        /// <summary>
-        /// Label9 控件。
+        /// txtA18 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label9;
+        protected global::FineUIPro.NumberBox txtA18;

        /// <summary>
-        /// Label10 控件。
+        /// GroupPanel2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label10;
+        protected global::FineUIPro.GroupPanel GroupPanel2;

        /// <summary>
-        /// nbA3 控件。
+        /// Form2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA3;
+        protected global::FineUIPro.Form Form2;

        /// <summary>
-        /// nbProjectA3 控件。
+        /// txtB1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA3;
+        protected global::FineUIPro.NumberBox txtB1;

        /// <summary>
-        /// txtDefA3 控件。
+        /// txtB2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA3;
+        protected global::FineUIPro.NumberBox txtB2;

        /// <summary>
-        /// Label11 控件。
+        /// txtB3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label11;
+        protected global::FineUIPro.NumberBox txtB3;

        /// <summary>
-        /// Label12 控件。
+        /// GroupPanel3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label12;
+        protected global::FineUIPro.GroupPanel GroupPanel3;

        /// <summary>
-        /// nbA4 控件。
+        /// Form3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA4;
+        protected global::FineUIPro.Form Form3;

        /// <summary>
-        /// nbProjectA4 控件。
+        /// txtC1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA4;
+        protected global::FineUIPro.NumberBox txtC1;

        /// <summary>
-        /// txtDefA4 控件。
+        /// txtC2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA4;
+        protected global::FineUIPro.NumberBox txtC2;

        /// <summary>
-        /// Label13 控件。
+        /// txtC3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label13;
+        protected global::FineUIPro.NumberBox txtC3;

        /// <summary>
-        /// Label14 控件。
+        /// txtC4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label14;
+        protected global::FineUIPro.NumberBox txtC4;

        /// <summary>
-        /// nbA5 控件。
+        /// txtC5 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA5;
+        protected global::FineUIPro.NumberBox txtC5;

        /// <summary>
-        /// nbProjectA5 控件。
+        /// txtC6 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA5;
+        protected global::FineUIPro.NumberBox txtC6;

        /// <summary>
-        /// txtDefA5 控件。
+        /// GroupPanel4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA5;
+        protected global::FineUIPro.GroupPanel GroupPanel4;

        /// <summary>
-        /// Label15 控件。
+        /// Form4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label15;
+        protected global::FineUIPro.Form Form4;

        /// <summary>
-        /// Label16 控件。
+        /// txtD1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label16;
+        protected global::FineUIPro.NumberBox txtD1;

        /// <summary>
-        /// nbA6 控件。
+        /// txtD2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA6;
+        protected global::FineUIPro.NumberBox txtD2;

        /// <summary>
-        /// nbProjectA6 控件。
+        /// txtD3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA6;
-        
-        /// <summary>
-        /// txtDefA6 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA6;
-        
-        /// <summary>
-        /// Label29 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label29;
-        
-        /// <summary>
-        /// Label17 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label17;
-        
-        /// <summary>
-        /// nbA 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA;
-        
-        /// <summary>
-        /// nbProjectA 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA;
-        
-        /// <summary>
-        /// Label18 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label18;
-        
-        /// <summary>
-        /// Label19 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label19;
-        
-        /// <summary>
-        /// Label20 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label20;
-        
-        /// <summary>
-        /// nbB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB1;
-        
-        /// <summary>
-        /// nbProjectB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB1;
-        
-        /// <summary>
-        /// txtDefB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB1;
-        
-        /// <summary>
-        /// Label21 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label21;
-        
-        /// <summary>
-        /// Label22 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label22;
-        
-        /// <summary>
-        /// nbB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB2;
-        
-        /// <summary>
-        /// nbProjectB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB2;
-        
-        /// <summary>
-        /// txtDefB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB2;
-        
-        /// <summary>
-        /// Label23 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label23;
-        
-        /// <summary>
-        /// Label24 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label24;
-        
-        /// <summary>
-        /// nbB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB3;
-        
-        /// <summary>
-        /// nbProjectB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB3;
-        
-        /// <summary>
-        /// txtDefB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB3;
-        
-        /// <summary>
-        /// Label30 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label30;
-        
-        /// <summary>
-        /// Label25 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label25;
-        
-        /// <summary>
-        /// nbB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB;
-        
-        /// <summary>
-        /// nbProjectB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB;
-        
-        /// <summary>
-        /// Label26 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label26;
-        
-        /// <summary>
-        /// Label31 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label31;
-        
-        /// <summary>
-        /// Label27 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label27;
-        
-        /// <summary>
-        /// nbAB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbAB;
-        
-        /// <summary>
-        /// nbProjectAB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectAB;
-        
-        /// <summary>
-        /// Label28 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label28;
-        
-        /// <summary>
-        /// ContentPanel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
-        
-        /// <summary>
-        /// ctlAuditFlow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
+        protected global::FineUIPro.NumberBox txtD3;

        /// <summary>
        /// Toolbar1 控件。
@@ -759,96 +446,6 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        /// </remarks>
        protected global::FineUIPro.Button btnAttachUrl;

-        /// <summary>
-        /// hdProjectA1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA1;
-        
-        /// <summary>
-        /// hdProjectA2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA2;
-        
-        /// <summary>
-        /// hdProjectA3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA3;
-        
-        /// <summary>
-        /// hdProjectA4 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA4;
-        
-        /// <summary>
-        /// hdProjectA5 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA5;
-        
-        /// <summary>
-        /// hdProjectA6 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectA6;
-        
-        /// <summary>
-        /// hdProjectB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectB1;
-        
-        /// <summary>
-        /// hdProjectB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectB2;
-        
-        /// <summary>
-        /// hdProjectB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.HiddenField hdProjectB3;
-        
-        /// <summary>
-        /// ToolbarFill1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
        /// <summary>
        /// btnSave 控件。
        /// </summary>
@@ -858,15 +455,6 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        /// </remarks>
        protected global::FineUIPro.Button btnSave;

-        /// <summary>
-        /// btnSubmit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSubmit;
-        
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@@ -0,0 +1,87 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ExpenseUnit.aspx.cs"
+    Inherits="FineUIPro.Web.HSSE.CostGoods.ExpenseUnit" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>费用计划</title>
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</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="费用计划"  runat="server" BoxFlex="1"  ForceFit="true"
+                    AllowPaging="false" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true"   EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" >
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DatePicker runat="server" Required="true" DateFormatString="yyyy" EmptyText="请选择年度" AutoPostBack="true"  AutoShowClearIcon="true"
+                                    ID="txtYear" DisplayType="Year" ShowTodayButton="false" OnTextChanged="drpUnit_SelectedIndexChanged" OnClearIconClick="txtYear_ClearIconClick">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <%--  <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click">
+                                </f:Button>--%>
+                                <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
+                                    runat="server">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp" 
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+
+                    <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="Parent" EnableResize="false" runat="server" IsModal="true"
+            Width="1200px" Height="650px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true" runat="server" Text="查看">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </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;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
@@ -0,0 +1,446 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+    public partial class ExpenseUnit : PageBase
+    {
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        #region Page_Init
+
+        // 注意：动态创建的代码需要放置于Page_Init（不是Page_Load），这样每次构造页面时都会执行
+        protected void Page_Init(object sender, EventArgs e)
+        {
+            InitUnitGrid();
+        }
+
+        protected static List<Model.Base_Unit> getUnit= new List<Model.Base_Unit>();
+        protected static List<Model.Base_Unit> getSUnit = new List<Model.Base_Unit>();
+
+        #region 按年份
+        private void InitUnitGrid()
+        {
+            FineUIPro.BoundField bf;
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "Id";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "编号";
+            bf.Width = 60;
+             bf.Hidden = true;
+            Grid1.Columns.Add(bf);
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "SupCostTypeName";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "类别名称";
+            bf.Width = 90;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "CostTypeName";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "分项名称";
+            bf.Width = 120;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            this.ProjectId = this.ProjectId ?? this.CurrUser.LoginProjectId;
+            getUnit = (from x in Funs.DB.Project_ProjectUnit
+                          join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                          where x.ProjectId == this.ProjectId && x.UnitType == Const.ProjectUnitType_1
+                          select  y).ToList();
+            foreach (var item in getUnit)
+            {
+                bf = new FineUIPro.BoundField();
+                bf.DataField = item.UnitId;
+                bf.DataFormatString = "{0}";
+                bf.HeaderText = item.UnitName;
+                bf.Width = 200;
+                Grid1.Columns.Add(bf);
+            }
+            getSUnit = (from x in Funs.DB.Project_ProjectUnit
+                           join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                           where x.ProjectId == this.ProjectId && x.UnitType == Const.ProjectUnitType_2
+                           select y).ToList();
+            foreach (var item in getSUnit)
+            {
+                bf = new FineUIPro.BoundField();
+                bf.DataField = item.UnitId;
+                bf.DataFormatString = "{0}";
+                bf.HeaderText = item.UnitName;
+                bf.Width = 200;
+                Grid1.Columns.Add(bf);
+            }
+
+            bf = new FineUIPro.BoundField();
+            bf.DataField = "SumC";
+            bf.DataFormatString = "{0}";
+            bf.HeaderText = "合计";
+            bf.Width = 90;
+            bf.HeaderTextAlign = TextAlign.Center;
+            Grid1.Columns.Add(bf);
+
+            Grid1.DataKeyNames = new string[] { "Id", "CostTypeName" };
+        }
+        #endregion
+
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ////权限按钮方法
+                this.GetButtonPower();
+                this.btnNew.OnClientClick = Window1.GetShowReference("ExpenseEdit.aspx") + "return false;";             
+                LoadData();
+            }
+        }
+
+        /// <summary>
+        /// 获取数据
+        /// </summary>
+        private void LoadData()
+        {
+            DataTable tb = GetDataTable(); //this.LINQToDataTable(getData.ToList());
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetDataTable()
+        {
+            DataTable table = new DataTable();
+            table.Columns.Add(new DataColumn("Id", typeof(string)));
+            table.Columns.Add(new DataColumn("SupCostTypeName", typeof(string)));
+            table.Columns.Add(new DataColumn("CostTypeName", typeof(string)));
+            foreach (var item in getUnit)
+            {
+                table.Columns.Add(new DataColumn(item.UnitId, typeof(string)));
+            }         
+            foreach (var item in getSUnit)
+            {
+                table.Columns.Add(new DataColumn(item.UnitId, typeof(string)));
+            }
+
+            table.Columns.Add(new DataColumn("SumC", typeof(String)));
+
+            if (!string.IsNullOrEmpty(this.txtYear.Text))
+            {
+                int year = Funs.GetNewIntOrZero(this.txtYear.Text);
+                var getDetail = from x in Funs.DB.CostGoods_ExpenseDetail
+                                join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
+                                where y.ProjectId == this.ProjectId && y.Year == year 
+                                orderby y.Year, x.SupSortIndex, x.SortIndex
+                                select new { x.ExpenseDetailId, x.ExpenseId,y.UnitId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney };
+
+                foreach (var item in getDetail)
+                {
+                    DataRow row = table.NewRow();
+                    row[0] = item.ExpenseDetailId +"#" +item.ExpenseId;
+                    row[1] = item.SupCostTypeName;
+                    row[2] = item.CostTypeName;
+                    int r = 3;
+                    foreach (var uitem in getUnit)
+                    {
+                        var getD1 = getDetail.Where(x => x.UnitId == uitem.UnitId && x.CostType == item.CostType);
+                        if (getD1.Count() > 0)
+                        {
+                            row[r] = getD1.Sum(X => X.CostMoney ?? 0).ToString();
+                        }
+                        else
+                        {
+                            row[r] = 0.00;
+                        }
+
+                        r++;
+                    }
+
+                    foreach (var suitem in getSUnit)
+                    {
+                        var getD2 = getDetail.Where(x => x.UnitId == suitem.UnitId && x.CostType == item.CostType);
+                        if (getD2.Count() > 0)
+                        {
+                            row[r] = getD2.Sum(X => X.CostMoney ?? 0).ToString();
+                        }
+                        else
+                        {
+                            row[r] = 0.00;
+                        }
+                        r++;
+                    }
+
+                    row[r] = getDetail.Where(x =>x.Year==item.Year && x.CostType == item.CostType).Sum(x => x.CostMoney ?? 0);
+                    table.Rows.Add(row);
+                }
+            }
+            else
+            {
+                var getDetail = from x in Funs.DB.CostGoods_ExpenseDetail
+                                join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
+                                where y.ProjectId == this.ProjectId 
+                                orderby y.Year, x.SupSortIndex, x.SortIndex
+                                select new { x.ExpenseDetailId, x.ExpenseId,y.UnitId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney };
+
+                foreach (var item in getDetail)
+                {
+                    DataRow row = table.NewRow();
+                    row[0] = item.ExpenseDetailId + "#" + item.ExpenseId;
+                    row[1] = item.SupCostTypeName;
+                    row[2] = item.CostTypeName;
+                    int r = 3;
+                    foreach (var uitem in getUnit)
+                    {
+                        var getD1 = getDetail.Where(x => x.UnitId == uitem.UnitId && x.CostType == item.CostType);
+                        if (getD1.Count() > 0)
+                        {
+                            row[r] = getD1.Sum(X=>X.CostMoney ?? 0).ToString();
+                        }
+                        else
+                        {
+                            row[r] = 0.00;
+                        }
+                       
+                        r++;
+                    }
+
+                    foreach (var suitem in getSUnit)
+                    {
+                        var getD2 = getDetail.Where(x => x.UnitId == suitem.UnitId && x.CostType == item.CostType);
+                        if (getD2.Count() > 0)
+                        {
+                            row[r] = getD2.Sum(X => X.CostMoney ?? 0).ToString();
+                        }
+                        else
+                        {
+                            row[r] = 0.00;
+                        }
+                        r++;
+                    }
+
+                    row[r] = getDetail.Where(x => x.CostType == item.CostType).Sum(x => x.CostMoney ?? 0);
+                    table.Rows.Add(row);
+                }
+            }
+
+            return table;
+        }
+
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("费用计划" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+           
+            Response.Write(GetTableHtml(GetDataTable()));
+            Response.End();
+        }
+        #endregion
+
+        #region 分页 排序
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            LoadData();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            LoadData();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            LoadData();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 查看
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            this.EditData("view");
+        }
+
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据
+        /// </summary>
+        private void EditData(string type = null)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRow.Values[0].ToString();
+            var getID = Funs.GetStrListByStr(id, '#');
+            if (getID != null && getID.Count > 1)
+            {
+                var getEx = ExpenseService.GetExpenseById(getID[1]);
+                if (getEx != null && !string.IsNullOrEmpty(getEx.UnitId))
+                {
+                    if (this.btnMenuEdit.Hidden || type == "view")   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseView.aspx?ExpenseId={0}", id, "查看 - ")));
+                    }
+                    else
+                    {
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ExpenseEdit.aspx?ExpenseId={0}", id, "编辑 - ")));
+                    }
+                }
+            }
+        }
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getEx = ExpenseService.GetExpenseById(rowID);
+                    if (getEx != null && !string.IsNullOrEmpty(getEx.UnitId))
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getEx.ExpenseCode, getEx.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnDelete);                    
+                        BLL.ExpenseService.DeleteExpenseById(rowID);
+                    }
+                }
+
+                this.LoadData();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 单位查询事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+           this.LoadData();
+        }
+
+        #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.PersonId, BLL.Const.ProjectExpenseMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        protected void txtYear_ClearIconClick(object sender, EventArgs e)
+        {
+            this.txtYear.Text = string.Empty;
+            this.LoadData();
+        }
+    }
+}
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+    public partial class ExpenseUnit
+    {
+
+        /// <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>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtYear 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtYear;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <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>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
@@ -7,321 +7,163 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>查看安全费用计划</title>
+    <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" AutoSizePanelID="SimpleForm1"/>
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="安全费用计划" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:Label ID="txtMonths" runat="server" Label="月份" LabelWidth="100px">
-                    </f:Label>
-                    <f:TextBox ID="txtExpenseCode" runat="server" Label="编号" LabelAlign="Right" MaxLength="50"
-                        LabelWidth="230px" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="drpUnitId" runat="server" Label="填报单位" LabelAlign="Right" MaxLength="50"
-                        LabelWidth="100px" Readonly="true">
-                    </f:TextBox>
-                    <f:TextBox ID="txtReportDate" runat="server" Label="填报日期" LabelAlign="Right" MaxLength="50"
-                        LabelWidth="230px" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <%--<f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtCompileMan" runat="server" Label="编制人" Readonly="true" LabelAlign="Right" MaxLength="50" LabelWidth="200px"
-                       >
-                    </f:TextBox>
-                    <f:TextBox ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right" MaxLength="50" LabelWidth="230px"
-                        Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>--%>
-            <%-- <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtCheckMan" runat="server" Label="审核人" Readonly="true" LabelAlign="Right" MaxLength="50" LabelWidth="200px"
-                        >
-                    </f:TextBox>
-                    <f:TextBox ID="txtCheckDate" runat="server" Label="审核日期" LabelAlign="Right" MaxLength="50" LabelWidth="230px"
-                        Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtApproveMan" runat="server" Label="批准人" Readonly="true" LabelAlign="Right" MaxLength="50" LabelWidth="200px"
-                        >
-                    </f:TextBox>
-                    <f:TextBox ID="txtApproveDate" runat="server" Label="批准日期" LabelAlign="Right" MaxLength="50" LabelWidth="230px"
-                        Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>--%>
-            <f:FormRow>
-                <Items>
-                    <f:Panel ID="Panel2" runat="server" ShowBorder="false" Layout="Table" TableConfigColumns="5"
-                        ShowHeader="false" BodyPadding="1px">
-                        <Items>
-                            <f:Panel ID="Panel1" Title="Panel1" MarginRight="0" Width="100px"
-                                runat="server" BodyPadding="1px" ShowBorder="false" ShowHeader="false">
-                                <Items>
-                                    <f:Label runat="server" ID="Label58" Text="编号">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel3" Title="Panel1" runat="server" BodyPadding="1px" Width="200px"
-                                ShowBorder="false" ShowHeader="false" MarginLeft="50">
-                                <Items>
-                                    <f:Label runat="server" ID="lblAccidentType11" Text="类别">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel5" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="200px" ShowHeader="false" MarginLeft="60px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label1" Text="当期费用（元）">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel6" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="250px" ShowHeader="false" MarginLeft="115px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label3" Text="项目累计费用（元）">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                            <f:Panel ID="Panel4" Title="Panel1" runat="server" BodyPadding="1px" ShowBorder="false"
-                                Width="300px" ShowHeader="false" MarginLeft="180px">
-                                <Items>
-                                    <f:Label runat="server" ID="Label2" Text="备注">
-                                    </f:Label>
-                                </Items>
-                            </f:Panel>
-                        </Items>
-                    </f:Panel>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label5" Text="A1">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label6" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;基础管理">
-                    </f:Label>
-                    <f:NumberBox ID="nbA1" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA1" NoDecimal="false" NoNegative="false" Readonly="true"
-                        MinValue="0" runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA1" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label7" Text="A2">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label8" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;安全技术">
-                    </f:Label>
-                    <f:NumberBox ID="nbA2" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA2" NoDecimal="false" NoNegative="false" Readonly="true"
-                        MinValue="0" runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA2" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label9" Text="A3">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label10" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;职业健康">
-                    </f:Label>
-                    <f:NumberBox ID="nbA3" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA3" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA3" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label11" Text="A4">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label12" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;安全防护">
-                    </f:Label>
-                    <f:NumberBox ID="nbA4" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA4" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA4" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label13" Text="A5">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label14" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;化工试车">
-                    </f:Label>
-                    <f:NumberBox ID="nbA5" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA5" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA5" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label15" Text="A6">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label16" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;教育培训">
-                    </f:Label>
-                    <f:NumberBox ID="nbA6" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA6" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefA6" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label17" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A安全生产费用合计">
-                    </f:Label>
-                    <f:NumberBox ID="nbA" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectA" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label18" Text="">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label19" Text="B1">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label20" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;文明施工">
-                    </f:Label>
-                    <f:NumberBox ID="nbB1" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB1" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB1" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label21" Text="B2">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label22" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;临时设施">
-                    </f:Label>
-                    <f:NumberBox ID="nbB2" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB2" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB2" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label23" Text="B3">
-                    </f:Label>
-                    <f:Label runat="server" ID="Label24" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;环境保护">
-                    </f:Label>
-                    <f:NumberBox ID="nbB3" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
-                        Readonly="true" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB3" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:TextBox runat="server" ID="txtDefB3" Readonly="true">
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label25" Text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B文明施工措施费合计">
-                    </f:Label>
-                    <f:NumberBox ID="nbB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label26" Text="">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow ColumnWidths="5% 22% 25% 25% 23%">
-                <Items>
-                    <f:Label runat="server" ID="Label27" Text="A+B安全生产及文明施工措施费总计">
-                    </f:Label>
-                    <f:NumberBox ID="nbAB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbProjectAB" NoDecimal="false" NoNegative="false" MinValue="0" Readonly="true"
-                        runat="server" Label="">
-                    </f:NumberBox>
-                    <f:Label runat="server" ID="Label28" Text="">
-                    </f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
-                </Items>
-            </f:FormRow>
-        </Rows>
-        <Toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server" Margin="0 50 30 50">
-                <Items>
-                    <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
-                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
-                    </f:Button>
-                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                    </f:ToolbarFill>
-                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                </Items>
-            </f:Toolbar>
-        </Toolbars>
-    </f:Form>
-    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
+        <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"
+            Layout="VBox">
+            <Rows>
+                <f:FormRow ColumnWidths="50% 25% 20%">
+                    <Items>
+                        <f:TextBox runat="server" ID="drpUnit"  Label="单位" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox runat="server"  Label="年度"   ID="txtYear" Readonly="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtReportDate" runat="server" Label="填报日期" Readonly="true">
+                        </f:TextBox>
+                        <f:Label runat="server" ID="lbSortIndex" Hidden="true"></f:Label>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel1" IsFluid="true" BodyPadding="10" EnableCollapse="false" Title="" runat="server"  ShowHeader="false">
+                            <Items>
+                                <f:GroupPanel Title="安全施工(单位：元)" BodyPadding="10" ID="GroupPanel1" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="false" runat="server" LabelAlign="Right">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="办公用品" ID="txtA1"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="HSE培训" ID="txtA2"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="警示标识" ID="txtA3"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="检测器具" ID="txtA4"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="安全奖励" ID="txtA5"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="安全技术" ID="txtA6"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="安全用电" ID="txtA7"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="高处作业及临边孔洞" LabelWidth="150px" ID="txtA8"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="气瓶防护" ID="txtA9"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="脚手架（防护）" LabelWidth="150px" ID="txtA10"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="木工防护棚" ID="txtA11"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="钢筋加工防护棚" LabelWidth="150px" ID="txtA12"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="受限空间" ID="txtA13"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="机械设备" ID="txtA14"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="喷砂作业" ID="txtA15"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="消防" ID="txtA16"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="应急" ID="txtA17"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="化工试车" ID="txtA18"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="职业健康(单位：元)" BodyPadding="10" ID="GroupPanel2" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow ColumnWidths="50% 25% 25%">
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="临时设施(饮水间、厕所、吸烟室等)" LabelWidth="250px"
+                                                            ID="txtB1"  Readonly="true">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="防护用品" ID="txtB2"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="体检费用" ID="txtB3"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="环境保护(单位：元)" BodyPadding="10" ID="GroupPanel3" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form3" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="噪声控制"
+                                                            ID="txtC1"  Readonly="true">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="扬尘控制" ID="txtC2"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="固体废弃物清理" LabelWidth="150px" ID="txtC3"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="污水处理"
+                                                            ID="txtC4"  Readonly="true">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="高危物质控制" LabelWidth="150px" ID="txtC5"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="防辐射" ID="txtC6"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                                <f:GroupPanel Title="文明施工(单位：元)" BodyPadding="10" ID="GroupPanel4" EnableCollapse="true" runat="server">
+                                    <Items>
+                                        <f:Form ID="Form4" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TextBox runat="server" Label="场容场貌"
+                                                            ID="txtD1"  Readonly="true">
+                                                        </f:TextBox>
+                                                        <f:TextBox runat="server" Label="宣传标识" ID="txtD2"  Readonly="true"></f:TextBox>
+                                                        <f:TextBox runat="server" Label="智慧化工地" ID="txtD3"  Readonly="true"></f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server" Margin="0 50 30 50">
+                    <Items>
+                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
    </form>
 </body>
 </html>
@@ -35,141 +35,22 @@ namespace FineUIPro.Web.HSSE.CostGoods
            if (!IsPostBack)
            {
                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-
                this.ExpenseId = Request.Params["ExpenseId"];
                if (!string.IsNullOrEmpty(this.ExpenseId))
                {
-                    Model.CostGoods_Expense expense = BLL.ExpenseService.GetExpenseById(this.ExpenseId);
+                   var  expense = BLL.ExpenseService.GetExpenseById(this.ExpenseId);
                    if (expense != null)
                    {
-                        this.txtExpenseCode.Text = CodeRecordsService.ReturnCodeByDataId(this.ExpenseId);
-                        if (expense.Months != null)
+                        if (expense != null)
                        {
-                            this.txtMonths.Text = string.Format("{0:yyyy-MM}", expense.Months);
+                            this.ExpenseId = expense.ExpenseId;
+                            this.drpUnit.Text = UnitService.GetUnitNameByUnitId( expense.UnitId);
+                            this.txtYear.Text = expense.Year.ToString();
+                            this.lbSortIndex.Text = expense.SortIndex.ToString();
+                          
                        }
-                        if (!string.IsNullOrEmpty(expense.UnitId))
-                        {
-                            Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(expense.UnitId);
-                            if (unit != null)
-                            {
-                                this.drpUnitId.Text = unit.UnitName;
-                            }
-                        }
-                        if (expense.ReportDate != null)
-                        {
-                            this.txtReportDate.Text = string.Format("{0:yyyy-MM-dd}", expense.ReportDate);
-                        }
-                        //this.txtCompileMan.Text = expense.CompileMan;
-                        //if (expense.CompileDate != null)
-                        //{
-                        //    this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", expense.CompileDate);
-                        //}
-                        //this.txtCheckMan.Text = expense.CheckMan;
-                        //if (expense.CheckDate != null)
-                        //{
-                        //    this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", expense.CheckDate);
-                        //}
-                        //this.txtApproveMan.Text = expense.ApproveMan;
-                        //if (expense.ApproveDate != null)
-                        //{
-                        //    this.txtApproveDate.Text = string.Format("{0:yyyy-MM-dd}", expense.ApproveDate);
-                        //}
-                        decimal totalA = 0, totalB = 0, totalProjectA = 0, totalProjectB = 0;
-                        Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(expense.ProjectId);
-                        List<Model.CostGoods_ExpenseDetail> projectDetails = BLL.ExpenseDetailService.GetCostDetailsByUnitId(expense.UnitId, project != null ? Convert.ToDateTime(project.StartDate) : Convert.ToDateTime("2000-01-01"), Convert.ToDateTime(expense.Months));
-                        List<Model.CostGoods_ExpenseDetail> details = BLL.ExpenseDetailService.GetExpenseDetailsByExpenseId(this.ExpenseId);
-                        Model.CostGoods_ExpenseDetail a1 = details.FirstOrDefault(x => x.CostType == "A1");
-                        if (a1 != null)
-                        {
-                            this.nbA1.Text = (a1.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA1.Text);
-                            this.nbProjectA1.Text = ((from x in projectDetails where x.CostType == "A1" select x.CostMoney ?? 0).Sum() + a1.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA1.Text);
-                            this.txtDefA1.Text = a1.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a2 = details.FirstOrDefault(x => x.CostType == "A2");
-                        if (a2 != null)
-                        {
-                            this.nbA2.Text = (a2.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA2.Text);
-                            this.nbProjectA2.Text = ((from x in projectDetails where x.CostType == "A2" select x.CostMoney ?? 0).Sum() + a2.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA2.Text);
-                            this.txtDefA2.Text = a2.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a3 = details.FirstOrDefault(x => x.CostType == "A3");
-                        if (a3 != null)
-                        {
-                            this.nbA3.Text = (a3.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA3.Text);
-                            this.nbProjectA3.Text = ((from x in projectDetails where x.CostType == "A3" select x.CostMoney ?? 0).Sum() + a3.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA3.Text);
-                            this.txtDefA3.Text = a3.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a4 = details.FirstOrDefault(x => x.CostType == "A4");
-                        if (a4 != null)
-                        {
-                            this.nbA4.Text = (a4.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA4.Text);
-                            this.nbProjectA4.Text = ((from x in projectDetails where x.CostType == "A4" select x.CostMoney ?? 0).Sum() + a4.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA4.Text);
-                            this.txtDefA4.Text = a4.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a5 = details.FirstOrDefault(x => x.CostType == "A5");
-                        if (a5 != null)
-                        {
-                            this.nbA5.Text = (a5.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA5.Text);
-                            this.nbProjectA5.Text = ((from x in projectDetails where x.CostType == "A5" select x.CostMoney ?? 0).Sum() + a5.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA5.Text);
-                            this.txtDefA5.Text = a5.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail a6 = details.FirstOrDefault(x => x.CostType == "A6");
-                        if (a6 != null)
-                        {
-                            this.nbA6.Text = (a6.CostMoney ?? 0).ToString();
-                            totalA += Funs.GetNewDecimalOrZero(this.nbA6.Text);
-                            this.nbProjectA6.Text = ((from x in projectDetails where x.CostType == "A6" select x.CostMoney ?? 0).Sum() + a6.CostMoney ?? 0).ToString();
-                            totalProjectA += Funs.GetNewDecimalOrZero(this.nbProjectA6.Text);
-                            this.txtDefA6.Text = a6.CostDef;
-                        }
-                        this.nbA.Text = totalA.ToString();
-                        this.nbProjectA.Text = totalProjectA.ToString();
-                        Model.CostGoods_ExpenseDetail b1 = details.FirstOrDefault(x => x.CostType == "B1");
-                        if (b1 != null)
-                        {
-                            this.nbB1.Text = (b1.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB1.Text);
-                            this.nbProjectB1.Text = ((from x in projectDetails where x.CostType == "B1" select x.CostMoney ?? 0).Sum() + b1.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB1.Text);
-                            this.txtDefB1.Text = b1.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail b2 = details.FirstOrDefault(x => x.CostType == "B2");
-                        if (b2 != null)
-                        {
-                            this.nbB2.Text = (b2.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB2.Text);
-                            this.nbProjectB2.Text = ((from x in projectDetails where x.CostType == "B2" select x.CostMoney ?? 0).Sum() + b2.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB2.Text);
-                            this.txtDefB2.Text = b2.CostDef;
-                        }
-                        Model.CostGoods_ExpenseDetail b3 = details.FirstOrDefault(x => x.CostType == "B3");
-                        if (b3 != null)
-                        {
-                            this.nbB3.Text = (b3.CostMoney ?? 0).ToString();
-                            totalB += Funs.GetNewDecimalOrZero(this.nbB3.Text);
-                            this.nbProjectB3.Text = ((from x in projectDetails where x.CostType == "B3" select x.CostMoney ?? 0).Sum() + b3.CostMoney ?? 0).ToString();
-                            totalProjectB += Funs.GetNewDecimalOrZero(this.nbProjectB3.Text);
-                            this.txtDefB3.Text = b3.CostDef;
-                        }
-                        this.nbB.Text = totalB.ToString();
-                        this.nbProjectB.Text = totalProjectB.ToString();
-                        this.nbAB.Text = (totalA + totalB).ToString();
-                        this.nbProjectAB.Text = (totalProjectA + totalProjectB).ToString();
                    }
                }
-                ///初始化审核菜单
-                this.ctlAuditFlow.MenuId = BLL.Const.ProjectExpenseMenuId;
-                this.ctlAuditFlow.DataId = this.ExpenseId;
            }
        }
        #endregion
@@ -184,7 +65,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
        {
            if (!string.IsNullOrEmpty(this.ExpenseId))
            {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ExpenseAttachUrl&menuId={1}", ExpenseId, BLL.Const.ProjectExpenseMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&menuId={1}&type=-1", ExpenseId, BLL.Const.ProjectExpenseMenuId)));
            }
        }
        #endregion
@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.CostGoods {
+namespace FineUIPro.Web.HSSE.CostGoods
+{


-    public partial class ExpenseView {
+    public partial class ExpenseView
+    {

        /// <summary>
        /// form1 控件。
@@ -40,31 +42,22 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Form SimpleForm1;

        /// <summary>
-        /// txtMonths 控件。
+        /// drpUnit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label txtMonths;
+        protected global::FineUIPro.TextBox drpUnit;

        /// <summary>
-        /// txtExpenseCode 控件。
+        /// txtYear 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtExpenseCode;
-        
-        /// <summary>
-        /// drpUnitId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox drpUnitId;
+        protected global::FineUIPro.TextBox txtYear;

        /// <summary>
        /// txtReportDate 控件。
@@ -76,13 +69,13 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.TextBox txtReportDate;

        /// <summary>
-        /// Panel2 控件。
+        /// lbSortIndex 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel2;
+        protected global::FineUIPro.Label lbSortIndex;

        /// <summary>
        /// Panel1 控件。
@@ -94,616 +87,346 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        protected global::FineUIPro.Panel Panel1;

        /// <summary>
-        /// Label58 控件。
+        /// GroupPanel1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label58;
+        protected global::FineUIPro.GroupPanel GroupPanel1;

        /// <summary>
-        /// Panel3 控件。
+        /// SimpleForm2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel3;
+        protected global::FineUIPro.Form SimpleForm2;

        /// <summary>
-        /// lblAccidentType11 控件。
+        /// txtA1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label lblAccidentType11;
+        protected global::FineUIPro.TextBox txtA1;

        /// <summary>
-        /// Panel5 控件。
+        /// txtA2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel5;
+        protected global::FineUIPro.TextBox txtA2;

        /// <summary>
-        /// Label1 控件。
+        /// txtA3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label1;
+        protected global::FineUIPro.TextBox txtA3;

        /// <summary>
-        /// Panel6 控件。
+        /// txtA4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel6;
+        protected global::FineUIPro.TextBox txtA4;

        /// <summary>
-        /// Label3 控件。
+        /// txtA5 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label3;
+        protected global::FineUIPro.TextBox txtA5;

        /// <summary>
-        /// Panel4 控件。
+        /// txtA6 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Panel Panel4;
+        protected global::FineUIPro.TextBox txtA6;

        /// <summary>
-        /// Label2 控件。
+        /// txtA7 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label2;
+        protected global::FineUIPro.TextBox txtA7;

        /// <summary>
-        /// Label5 控件。
+        /// txtA8 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label5;
+        protected global::FineUIPro.TextBox txtA8;

        /// <summary>
-        /// Label6 控件。
+        /// txtA9 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label6;
+        protected global::FineUIPro.TextBox txtA9;

        /// <summary>
-        /// nbA1 控件。
+        /// txtA10 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA1;
+        protected global::FineUIPro.TextBox txtA10;

        /// <summary>
-        /// nbProjectA1 控件。
+        /// txtA11 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA1;
+        protected global::FineUIPro.TextBox txtA11;

        /// <summary>
-        /// txtDefA1 控件。
+        /// txtA12 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA1;
+        protected global::FineUIPro.TextBox txtA12;

        /// <summary>
-        /// Label7 控件。
+        /// txtA13 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label7;
+        protected global::FineUIPro.TextBox txtA13;

        /// <summary>
-        /// Label8 控件。
+        /// txtA14 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label8;
+        protected global::FineUIPro.TextBox txtA14;

        /// <summary>
-        /// nbA2 控件。
+        /// txtA15 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA2;
+        protected global::FineUIPro.TextBox txtA15;

        /// <summary>
-        /// nbProjectA2 控件。
+        /// txtA16 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA2;
+        protected global::FineUIPro.TextBox txtA16;

        /// <summary>
-        /// txtDefA2 控件。
+        /// txtA17 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA2;
+        protected global::FineUIPro.TextBox txtA17;

        /// <summary>
-        /// Label9 控件。
+        /// txtA18 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label9;
+        protected global::FineUIPro.TextBox txtA18;

        /// <summary>
-        /// Label10 控件。
+        /// GroupPanel2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label10;
+        protected global::FineUIPro.GroupPanel GroupPanel2;

        /// <summary>
-        /// nbA3 控件。
+        /// Form2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA3;
+        protected global::FineUIPro.Form Form2;

        /// <summary>
-        /// nbProjectA3 控件。
+        /// txtB1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA3;
+        protected global::FineUIPro.TextBox txtB1;

        /// <summary>
-        /// txtDefA3 控件。
+        /// txtB2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA3;
+        protected global::FineUIPro.TextBox txtB2;

        /// <summary>
-        /// Label11 控件。
+        /// txtB3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label11;
+        protected global::FineUIPro.TextBox txtB3;

        /// <summary>
-        /// Label12 控件。
+        /// GroupPanel3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label12;
+        protected global::FineUIPro.GroupPanel GroupPanel3;

        /// <summary>
-        /// nbA4 控件。
+        /// Form3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA4;
+        protected global::FineUIPro.Form Form3;

        /// <summary>
-        /// nbProjectA4 控件。
+        /// txtC1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA4;
+        protected global::FineUIPro.TextBox txtC1;

        /// <summary>
-        /// txtDefA4 控件。
+        /// txtC2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA4;
+        protected global::FineUIPro.TextBox txtC2;

        /// <summary>
-        /// Label13 控件。
+        /// txtC3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label13;
+        protected global::FineUIPro.TextBox txtC3;

        /// <summary>
-        /// Label14 控件。
+        /// txtC4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label14;
+        protected global::FineUIPro.TextBox txtC4;

        /// <summary>
-        /// nbA5 控件。
+        /// txtC5 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA5;
+        protected global::FineUIPro.TextBox txtC5;

        /// <summary>
-        /// nbProjectA5 控件。
+        /// txtC6 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA5;
+        protected global::FineUIPro.TextBox txtC6;

        /// <summary>
-        /// txtDefA5 控件。
+        /// GroupPanel4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA5;
+        protected global::FineUIPro.GroupPanel GroupPanel4;

        /// <summary>
-        /// Label15 控件。
+        /// Form4 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label15;
+        protected global::FineUIPro.Form Form4;

        /// <summary>
-        /// Label16 控件。
+        /// txtD1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.Label Label16;
+        protected global::FineUIPro.TextBox txtD1;

        /// <summary>
-        /// nbA6 控件。
+        /// txtD2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA6;
+        protected global::FineUIPro.TextBox txtD2;

        /// <summary>
-        /// nbProjectA6 控件。
+        /// txtD3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA6;
-        
-        /// <summary>
-        /// txtDefA6 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefA6;
-        
-        /// <summary>
-        /// Label17 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label17;
-        
-        /// <summary>
-        /// nbA 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbA;
-        
-        /// <summary>
-        /// nbProjectA 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectA;
-        
-        /// <summary>
-        /// Label18 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label18;
-        
-        /// <summary>
-        /// Label19 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label19;
-        
-        /// <summary>
-        /// Label20 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label20;
-        
-        /// <summary>
-        /// nbB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB1;
-        
-        /// <summary>
-        /// nbProjectB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB1;
-        
-        /// <summary>
-        /// txtDefB1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB1;
-        
-        /// <summary>
-        /// Label21 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label21;
-        
-        /// <summary>
-        /// Label22 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label22;
-        
-        /// <summary>
-        /// nbB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB2;
-        
-        /// <summary>
-        /// nbProjectB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB2;
-        
-        /// <summary>
-        /// txtDefB2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB2;
-        
-        /// <summary>
-        /// Label23 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label23;
-        
-        /// <summary>
-        /// Label24 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label24;
-        
-        /// <summary>
-        /// nbB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB3;
-        
-        /// <summary>
-        /// nbProjectB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB3;
-        
-        /// <summary>
-        /// txtDefB3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDefB3;
-        
-        /// <summary>
-        /// Label25 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label25;
-        
-        /// <summary>
-        /// nbB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbB;
-        
-        /// <summary>
-        /// nbProjectB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectB;
-        
-        /// <summary>
-        /// Label26 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label26;
-        
-        /// <summary>
-        /// Label27 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label27;
-        
-        /// <summary>
-        /// nbAB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbAB;
-        
-        /// <summary>
-        /// nbProjectAB 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.NumberBox nbProjectAB;
-        
-        /// <summary>
-        /// Label28 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label28;
-        
-        /// <summary>
-        /// ContentPanel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
-        
-        /// <summary>
-        /// ctlAuditFlow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
+        protected global::FineUIPro.TextBox txtD3;

        /// <summary>
        /// Toolbar1 控件。
@@ -723,15 +446,6 @@ namespace FineUIPro.Web.HSSE.CostGoods {
        /// </remarks>
        protected global::FineUIPro.Button btnAttachUrl;

-        /// <summary>
-        /// ToolbarFill1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@@ -1,5 +1,4 @@
 using BLL;
-using Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
+}
@@ -92,6 +92,9 @@ namespace Model
    partial void InsertBase_CostType(Base_CostType instance);
    partial void UpdateBase_CostType(Base_CostType instance);
    partial void DeleteBase_CostType(Base_CostType instance);
+    partial void InsertBase_CostTypeItem(Base_CostTypeItem instance);
+    partial void UpdateBase_CostTypeItem(Base_CostTypeItem instance);
+    partial void DeleteBase_CostTypeItem(Base_CostTypeItem instance);
    partial void InsertBase_CQMSTrainObject(Base_CQMSTrainObject instance);
    partial void UpdateBase_CQMSTrainObject(Base_CQMSTrainObject instance);
    partial void DeleteBase_CQMSTrainObject(Base_CQMSTrainObject instance);
@@ -1840,6 +1843,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_CostTypeItem> Base_CostTypeItem
+		{
+			get
+			{
+				return this.GetTable<Base_CostTypeItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_CQMSTrainObject> Base_CQMSTrainObject
 		{
 			get
@@ -14356,19 +14367,21 @@ namespace Model
 		
 		private string _CostTypeId;
 		
-		private string _CostTypeCode;
+		private System.Nullable<int> _CostTypeCode;
 		
 		private string _CostTypeName;
 		
 		private string _Remark;
 		
+		private EntitySet<Base_CostTypeItem> _Base_CostTypeItem;
+		
    #region 可扩展性方法定义
    partial void OnLoaded();
    partial void OnValidate(System.Data.Linq.ChangeAction action);
    partial void OnCreated();
    partial void OnCostTypeIdChanging(string value);
    partial void OnCostTypeIdChanged();
-    partial void OnCostTypeCodeChanging(string value);
+    partial void OnCostTypeCodeChanging(System.Nullable<int> value);
    partial void OnCostTypeCodeChanged();
    partial void OnCostTypeNameChanging(string value);
    partial void OnCostTypeNameChanged();
@@ -14378,6 +14391,7 @@ namespace Model
 		
 		public Base_CostType()
 		{
+			this._Base_CostTypeItem = new EntitySet<Base_CostTypeItem>(new Action<Base_CostTypeItem>(this.attach_Base_CostTypeItem), new Action<Base_CostTypeItem>(this.detach_Base_CostTypeItem));
 			OnCreated();
 		}
 		
@@ -14401,8 +14415,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostTypeCode", DbType="NVarChar(50)")]
-		public string CostTypeCode
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostTypeCode", DbType="Int")]
+		public System.Nullable<int> CostTypeCode
 		{
 			get
 			{
@@ -14461,6 +14475,230 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_CostTypeItem_Base_CostType", Storage="_Base_CostTypeItem", ThisKey="CostTypeId", OtherKey="CostTypeId", DeleteRule="NO ACTION")]
+		public EntitySet<Base_CostTypeItem> Base_CostTypeItem
+		{
+			get
+			{
+				return this._Base_CostTypeItem;
+			}
+			set
+			{
+				this._Base_CostTypeItem.Assign(value);
+			}
+		}
+		
+		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));
+			}
+		}
+		
+		private void attach_Base_CostTypeItem(Base_CostTypeItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_CostType = this;
+		}
+		
+		private void detach_Base_CostTypeItem(Base_CostTypeItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_CostType = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_CostTypeItem")]
+	public partial class Base_CostTypeItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _CostTypeItemId;
+		
+		private string _CostTypeId;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private string _CostTypeItemName;
+		
+		private string _Remark;
+		
+		private EntityRef<Base_CostType> _Base_CostType;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnCostTypeItemIdChanging(string value);
+    partial void OnCostTypeItemIdChanged();
+    partial void OnCostTypeIdChanging(string value);
+    partial void OnCostTypeIdChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnCostTypeItemNameChanging(string value);
+    partial void OnCostTypeItemNameChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Base_CostTypeItem()
+		{
+			this._Base_CostType = default(EntityRef<Base_CostType>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostTypeItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string CostTypeItemId
+		{
+			get
+			{
+				return this._CostTypeItemId;
+			}
+			set
+			{
+				if ((this._CostTypeItemId != value))
+				{
+					this.OnCostTypeItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._CostTypeItemId = value;
+					this.SendPropertyChanged("CostTypeItemId");
+					this.OnCostTypeItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostTypeId", DbType="NVarChar(50)")]
+		public string CostTypeId
+		{
+			get
+			{
+				return this._CostTypeId;
+			}
+			set
+			{
+				if ((this._CostTypeId != value))
+				{
+					if (this._Base_CostType.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnCostTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._CostTypeId = value;
+					this.SendPropertyChanged("CostTypeId");
+					this.OnCostTypeIdChanged();
+				}
+			}
+		}
+		
+		[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="_CostTypeItemName", DbType="NVarChar(50)")]
+		public string CostTypeItemName
+		{
+			get
+			{
+				return this._CostTypeItemName;
+			}
+			set
+			{
+				if ((this._CostTypeItemName != value))
+				{
+					this.OnCostTypeItemNameChanging(value);
+					this.SendPropertyChanging();
+					this._CostTypeItemName = value;
+					this.SendPropertyChanged("CostTypeItemName");
+					this.OnCostTypeItemNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		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();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_CostTypeItem_Base_CostType", Storage="_Base_CostType", ThisKey="CostTypeId", OtherKey="CostTypeId", IsForeignKey=true)]
+		public Base_CostType Base_CostType
+		{
+			get
+			{
+				return this._Base_CostType.Entity;
+			}
+			set
+			{
+				Base_CostType previousValue = this._Base_CostType.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_CostType.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_CostType.Entity = null;
+						previousValue.Base_CostTypeItem.Remove(this);
+					}
+					this._Base_CostType.Entity = value;
+					if ((value != null))
+					{
+						value.Base_CostTypeItem.Add(this);
+						this._CostTypeId = value.CostTypeId;
+					}
+					else
+					{
+						this._CostTypeId = default(string);
+					}
+					this.SendPropertyChanged("Base_CostType");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -57929,6 +58167,10 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _ApproveDate;
 		
+		private System.Nullable<int> _SortIndex;
+		
+		private System.Nullable<int> _Year;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntitySet<CostGoods_ExpenseDetail> _CostGoods_ExpenseDetail;
@@ -57971,6 +58213,10 @@ namespace Model
    partial void OnApproveManChanged();
    partial void OnApproveDateChanging(System.Nullable<System.DateTime> value);
    partial void OnApproveDateChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnYearChanging(System.Nullable<int> value);
+    partial void OnYearChanged();
    #endregion
 		
 		public CostGoods_Expense()
@@ -58025,7 +58271,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExpenseCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExpenseCode", DbType="NVarChar(50)")]
 		public string ExpenseCode
 		{
 			get
@@ -58189,7 +58435,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
 		public string CompileMan
 		{
 			get
@@ -58229,7 +58475,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckMan", DbType="NVarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckMan", DbType="NVarChar(50)")]
 		public string CheckMan
 		{
 			get
@@ -58269,7 +58515,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
 		public string ApproveMan
 		{
 			get
@@ -58309,6 +58555,46 @@ namespace Model
 			}
 		}
 		
+		[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="_Year", DbType="Int")]
+		public System.Nullable<int> Year
+		{
+			get
+			{
+				return this._Year;
+			}
+			set
+			{
+				if ((this._Year != value))
+				{
+					this.OnYearChanging(value);
+					this.SendPropertyChanging();
+					this._Year = value;
+					this.SendPropertyChanged("Year");
+					this.OnYearChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CostGoods_Expense_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -58439,6 +58725,16 @@ namespace Model
 		
 		private string _CostDef;
 		
+		private string _CostTypeName;
+		
+		private string _SupCostTypeName;
+		
+		private string _SupCostTypeId;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private System.Nullable<int> _SupSortIndex;
+		
 		private EntityRef<CostGoods_Expense> _CostGoods_Expense;
 		
    #region 可扩展性方法定义
@@ -58455,6 +58751,16 @@ namespace Model
    partial void OnCostMoneyChanged();
    partial void OnCostDefChanging(string value);
    partial void OnCostDefChanged();
+    partial void OnCostTypeNameChanging(string value);
+    partial void OnCostTypeNameChanged();
+    partial void OnSupCostTypeNameChanging(string value);
+    partial void OnSupCostTypeNameChanged();
+    partial void OnSupCostTypeIdChanging(string value);
+    partial void OnSupCostTypeIdChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnSupSortIndexChanging(System.Nullable<int> value);
+    partial void OnSupSortIndexChanged();
    #endregion
 		
 		public CostGoods_ExpenseDetail()
@@ -58527,7 +58833,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostMoney", DbType="Money")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostMoney", DbType="Decimal(18,2)")]
 		public System.Nullable<decimal> CostMoney
 		{
 			get
@@ -58567,6 +58873,106 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostTypeName", DbType="NVarChar(50)")]
+		public string CostTypeName
+		{
+			get
+			{
+				return this._CostTypeName;
+			}
+			set
+			{
+				if ((this._CostTypeName != value))
+				{
+					this.OnCostTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._CostTypeName = value;
+					this.SendPropertyChanged("CostTypeName");
+					this.OnCostTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeName", DbType="NVarChar(50)")]
+		public string SupCostTypeName
+		{
+			get
+			{
+				return this._SupCostTypeName;
+			}
+			set
+			{
+				if ((this._SupCostTypeName != value))
+				{
+					this.OnSupCostTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._SupCostTypeName = value;
+					this.SendPropertyChanged("SupCostTypeName");
+					this.OnSupCostTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupCostTypeId", DbType="NVarChar(50)")]
+		public string SupCostTypeId
+		{
+			get
+			{
+				return this._SupCostTypeId;
+			}
+			set
+			{
+				if ((this._SupCostTypeId != value))
+				{
+					this.OnSupCostTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._SupCostTypeId = value;
+					this.SendPropertyChanged("SupCostTypeId");
+					this.OnSupCostTypeIdChanged();
+				}
+			}
+		}
+		
+		[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="_SupSortIndex", DbType="Int")]
+		public System.Nullable<int> SupSortIndex
+		{
+			get
+			{
+				return this._SupSortIndex;
+			}
+			set
+			{
+				if ((this._SupSortIndex != value))
+				{
+					this.OnSupSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SupSortIndex = value;
+					this.SendPropertyChanged("SupSortIndex");
+					this.OnSupSortIndexChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CostGoods_ExpenseDetail_CostGoods_Expense", Storage="_CostGoods_Expense", ThisKey="ExpenseId", OtherKey="ExpenseId", IsForeignKey=true)]
 		public CostGoods_Expense CostGoods_Expense
 		{
@@ -171589,7 +171995,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remarks
 		{
 			get
@@ -172209,7 +172615,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="VarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="NVarChar(500)")]
 		public string PriceMethod
 		{
 			get
@@ -172349,7 +172755,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Clause
 		{
 			get
@@ -701,6 +701,7 @@ namespace WebAPI.Controllers
                                    select new
                                    {
                                        x.PersonId,
+                                        x.SitePersonId,
                                        x.PersonName,
                                        x.CardNo,
                                        x.IdentityCard,
@@ -785,6 +786,38 @@ namespace WebAPI.Controllers
            }
            return responeData;
        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="idCard"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public Model.ResponeData getUpdatePersonExchangeTime(string projectId,string idCard, string type)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getsiteperson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.IdentityCard == idCard);
+                if (getsiteperson != null)
+                {
+                    APIPersonService.getUpdatePersonExchangeTime(getsiteperson.SitePersonId, type);
+                }
+                else
+                {
+                    responeData.code = 1;
+                    responeData.message = "当前项目不存在身份证为：" + idCard.ToString() +"的人员！";
+                }
+              
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
        #endregion

        #region 获取人员信息出入场记录
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>E:\WebApi</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>DonotMerge</WDPMergeOption>
-  </PropertyGroup>
-</Project>
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
  <PropertyGroup>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
    <ExcludeApp_Data>false</ExcludeApp_Data>
    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>E:\Package\赛鼎工程有限公司\SGGLAPI</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-  </PropertyGroup>
-</Project>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\app.publish\</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-  </PropertyGroup>
-</Project>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\app.publish\</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <_TargetId>Folder</_TargetId>
-    <SiteUrlToLaunchAfterPublish />
-  </PropertyGroup>
-</Project>
@@ -271,7 +271,6 @@
    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\CollectionModelDescription.cshtml" />
    <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" />
    <Content Include="Areas\HelpPage\Views\Help\Api.cshtml" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
    <None Include="Scripts\jquery-3.3.1.intellisense.js" />
    <Content Include="Scripts\jquery-3.3.1.js" />
    <Content Include="Scripts\jquery-3.3.1.min.js" />
@@ -299,6 +298,7 @@
    <Folder Include="App_Data\" />
    <Folder Include="Images\" />
    <Folder Include="Models\" />
+    <Folder Include="Properties\PublishProfiles\" />
    <Folder Include="Views\CQMSPersonManage\" />
    <Folder Include="Views\HJGLIndex\" />
    <Folder Include="Views\Login\" />
@@ -360,7 +360,7 @@
          <AutoAssignPort>True</AutoAssignPort>
          <DevelopmentServerPort>0</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7655/</IISUrl>
+          <IISUrl>http://localhost:3305/</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>