20240308 会议管理

This commit is contained in:
毕文静 2024-03-08 23:33:50 +08:00
commit fac3c4810a
57 changed files with 6449 additions and 3470 deletions

1
.gitignore vendored
View File

@ -31,3 +31,4 @@
/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSub/DriverSub/2024-02
/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverRun
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-02
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-03

View File

@ -0,0 +1,67 @@
update Sys_Menu set MenuName='开车物资材料库',Url='TestRun/DriverGoods/GoodsModel.aspx'
where MenuId='1C6B597D-0FB7-404A-8512-6FCD53EE2552'
GO
CREATE TABLE [dbo].[DriverGoods_GoodsModel](
[GoodsModelId] [nvarchar](50) NOT NULL,
[ProjectId] [nvarchar](50) NULL,
[Code] [int] NULL,
[Description] [nvarchar](200) NULL,
[Quantity] [nvarchar](50) NULL,
[Purpose] [nvarchar](100) NULL,
[Attachment] [nvarchar](100) NULL,
[Remark] [nvarchar](200) NULL,
CONSTRAINT [PK_DriverGoods_GoodsModel] PRIMARY KEY CLUSTERED
(
[GoodsModelId] 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].[DriverGoods_GoodsModel] WITH CHECK ADD CONSTRAINT [FK_DriverGoods_GoodsModel_Base_Project] FOREIGN KEY([ProjectId])
REFERENCES [dbo].[Base_Project] ([ProjectId])
GO
ALTER TABLE [dbo].[DriverGoods_GoodsModel] CHECK CONSTRAINT [FK_DriverGoods_GoodsModel_Base_Project]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'GoodsModelId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'ProjectId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Code'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'物资材料名称及规格' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Description'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Quantity'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'用途' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Purpose'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'附件(详细清单/图纸等)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Attachment'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel', @level2type=N'COLUMN',@level2name=N'Remark'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开车物资材料库表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsModel'
GO
alter table [dbo].[DriverRun_DriverRun] add Status char(1) null
alter table [dbo].[DriverRun_DriverRun] add Priority char(1) null
GO
alter table [dbo].[Solution_TestRunConstructSolution] add System nvarchar(50) null
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('94E11762-49CB-4116-9B28-6927BDC59D31','开车方案统计','TestRun/DriverSchemeChart.aspx',20,'8EB88D36-5B13-4F41-8FE8-D66BCA08439D','Menu_TestRun',0,1,1)
GO

View File

@ -0,0 +1,73 @@
delete from Sys_ButtonToMenu where MenuId='AACD667C-5481-425D-819C-3892168DF61E'
delete from Sys_Menu where MenuId='AACD667C-5481-425D-819C-3892168DF61E'
GO
alter table [dbo].[DriverGoods_GoodsBuy] add UnitCode nvarchar(50) null
GO
CREATE TABLE [dbo].[DriverGoods_GoodsBuyItem](
[GoodsBuyItemId] [nvarchar](50) NOT NULL,
[GoodsBuyId] [nvarchar](50) NULL,
[GoodsModelId] [nvarchar](50) NULL,
[Quantity] [nvarchar](50) NULL,
[RequiredTime] [datetime] NULL,
CONSTRAINT [PK_DriverGoods_GoodsBuyItem] PRIMARY KEY CLUSTERED
(
[GoodsBuyItemId] 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].[DriverGoods_GoodsBuyItem] WITH CHECK ADD CONSTRAINT [FK_DriverGoods_GoodsBuyItem_DriverGoods_GoodsModel] FOREIGN KEY([GoodsModelId])
REFERENCES [dbo].[DriverGoods_GoodsModel] ([GoodsModelId])
GO
ALTER TABLE [dbo].[DriverGoods_GoodsBuyItem] CHECK CONSTRAINT [FK_DriverGoods_GoodsBuyItem_DriverGoods_GoodsModel]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem', @level2type=N'COLUMN',@level2name=N'GoodsBuyItemId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem', @level2type=N'COLUMN',@level2name=N'GoodsBuyId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'物资Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem', @level2type=N'COLUMN',@level2name=N'GoodsModelId'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem', @level2type=N'COLUMN',@level2name=N'Quantity'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'要求到货时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem', @level2type=N'COLUMN',@level2name=N'RequiredTime'
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'请购单明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriverGoods_GoodsBuyItem'
GO
CREATE VIEW [dbo].[View_DriverGoods_GoodsBuyItem]
/*试车请购单明细表查询列表*/
AS
SELECT Item.GoodsBuyItemId,
Item.GoodsBuyId,
Item.GoodsModelId,
Item.Quantity,
Item.RequiredTime,
Model.Code,
Model.ProjectId,
Model.Description,
Model.Purpose,
Model.Attachment,
Model.Remark
FROM dbo.DriverGoods_GoodsBuyItem AS Item
LEFT JOIN dbo.DriverGoods_GoodsModel AS Model ON Model.GoodsModelId=Item.GoodsModelId
GO

View File

@ -184,6 +184,9 @@ GO
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'CAA63693-5D41-4018-9FF7-AAB311E6D8E0','保存',4)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('94E11762-49CB-4116-9B28-6927BDC59D31','开车方案统计','TestRun/DriverSchemeChart.aspx',20,'8EB88D36-5B13-4F41-8FE8-D66BCA08439D','Menu_TestRun',0,1,1)
GO
/* ===============开车进度管理============*/
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
@ -253,7 +256,7 @@ VALUES('CA46AEF2-D058-433B-BDE3-760015337ED4','
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('1C6B597D-0FB7-404A-8512-6FCD53EE2552','开车物资计划','TestRun/DriverGoods/GoodsPlan.aspx',10,'CA46AEF2-D058-433B-BDE3-760015337ED4','Menu_TestRun',0,1,1)
VALUES('1C6B597D-0FB7-404A-8512-6FCD53EE2552','开车物资材料库','TestRun/DriverGoods/GoodsModel.aspx',10,'CA46AEF2-D058-433B-BDE3-760015337ED4','Menu_TestRun',0,1,1)
GO
/* 开车物资计划 */
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'1C6B597D-0FB7-404A-8512-6FCD53EE2552','增加',1)
@ -272,15 +275,15 @@ GO
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'1EC7978C-7800-45B2-9E80-3334644EF898','保存',4)
GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('AACD667C-5481-425D-819C-3892168DF61E','开车材料跟踪管理','TestRun/DriverGoods/MaterialTrace.aspx',30,'CA46AEF2-D058-433B-BDE3-760015337ED4','Menu_TestRun',0,1,1)
GO
/* 开车材料跟踪管理 */
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','增加',1)
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','修改',2)
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','删除',3)
INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','保存',4)
GO
--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
--VALUES('AACD667C-5481-425D-819C-3892168DF61E','开车材料跟踪管理','TestRun/DriverGoods/MaterialTrace.aspx',30,'CA46AEF2-D058-433B-BDE3-760015337ED4','Menu_TestRun',0,1,1)
--GO
-- /* 开车材料跟踪管理 */
-- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','增加',1)
-- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','修改',2)
-- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','删除',3)
-- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES(NEWID(),'AACD667C-5481-425D-819C-3892168DF61E','保存',4)
-- GO
/* ===============预试车管理 ============*/

View File

@ -727,7 +727,9 @@
<Compile Include="TaskScheduling\TimerTask\TaskJob.cs" />
<Compile Include="TaskScheduling\TimerTask\TimerTaskBase.cs" />
<Compile Include="TestRun\BeforeTestRun\BeforeTestRunService.cs" />
<Compile Include="TestRun\DriverGoods\GoodsBuyItemService.cs" />
<Compile Include="TestRun\DriverGoods\GoodsBuyService.cs" />
<Compile Include="TestRun\DriverGoods\GoodsModelService.cs" />
<Compile Include="TestRun\DriverGoods\GoodsPlanService.cs" />
<Compile Include="TestRun\DriverGoods\MaterialTraceService.cs" />
<Compile Include="TestRun\DriverHse\HseHazardService.cs" />

View File

@ -4794,14 +4794,19 @@ namespace BLL
public static string TestRunConstructSolution_Compile = "1";
/// <summary>
/// 会签
/// 审核
/// </summary>
public static string TestRunConstructSolution_Audit = "2";
/// <summary>
/// 审批完成
/// 审批
/// </summary>
public static string TestRunConstructSolution_Complete = "3";
public static string TestRunConstructSolution_Audit2 = "3";
/// <summary>
/// 发布
/// </summary>
public static string TestRunConstructSolution_Complete = "4";
#endregion
#endregion
@ -5289,6 +5294,11 @@ namespace BLL
/// </summary>
public const string RoadMapMenuId = "02866B09-CEB3-42E0-870C-B81187FB0079";
/// <summary>
/// 开车物资库
/// </summary>
public const string GoodsModelMenuId = "1C6B597D-0FB7-404A-8512-6FCD53EE2552";
/// <summary>
/// 开车物资计划
/// </summary>

View File

@ -0,0 +1,67 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 请购单明细
/// </summary>
public static class GoodsBuyItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取请购单明细
/// </summary>
/// <param name="GoodsBuyItemId"></param>
/// <returns></returns>
public static Model.DriverGoods_GoodsBuyItem GetGoodsBuyItemById(string GoodsBuyItemId)
{
return Funs.DB.DriverGoods_GoodsBuyItem.FirstOrDefault(e => e.GoodsBuyItemId == GoodsBuyItemId);
}
/// <summary>
/// 根据周报Id获取请购单明细
/// </summary>
/// <param name="GoodsBuyId"></param>
/// <returns></returns>
public static List<Model.DriverGoods_GoodsBuyItem> GetGoodsBuyItemByGoodsBuyId(string GoodsBuyId)
{
return (from x in Funs.DB.DriverGoods_GoodsBuyItem where x.GoodsBuyId == GoodsBuyId select x).ToList();
}
/// <summary>
/// 添加请购单明细
/// </summary>
/// <param name="GoodsBuyItem"></param>
public static void AddGoodsBuyItem(Model.DriverGoods_GoodsBuyItem GoodsBuyItem)
{
Model.SGGLDB db = Funs.DB;
Model.DriverGoods_GoodsBuyItem newGoodsBuyItem = new Model.DriverGoods_GoodsBuyItem();
newGoodsBuyItem.GoodsBuyItemId = GoodsBuyItem.GoodsBuyItemId;
newGoodsBuyItem.GoodsBuyId = GoodsBuyItem.GoodsBuyId;
newGoodsBuyItem.GoodsModelId = GoodsBuyItem.GoodsModelId;
newGoodsBuyItem.Quantity = GoodsBuyItem.Quantity;
newGoodsBuyItem.RequiredTime = GoodsBuyItem.RequiredTime;
db.DriverGoods_GoodsBuyItem.InsertOnSubmit(newGoodsBuyItem);
db.SubmitChanges();
}
/// <summary>
/// 根据周报Id删除所有相关明细信息
/// </summary>
/// <param name="GoodsBuyId"></param>
public static void DeleteGoodsBuyItemByGoodsBuyId(string GoodsBuyId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.DriverGoods_GoodsBuyItem where x.GoodsBuyId == GoodsBuyId select x).ToList();
if (q.Count() > 0)
{
db.DriverGoods_GoodsBuyItem.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}
}

View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
namespace BLL
{
@ -39,6 +40,7 @@ namespace BLL
newGoodsBuy.GetGoodsDate = GoodsBuy.GetGoodsDate;
newGoodsBuy.AttachUrl = GoodsBuy.AttachUrl;
newGoodsBuy.Remark = GoodsBuy.Remark;
newGoodsBuy.UnitCode = GoodsBuy.UnitCode;
Funs.DB.DriverGoods_GoodsBuy.InsertOnSubmit(newGoodsBuy);
Funs.DB.SubmitChanges();
}
@ -56,11 +58,12 @@ namespace BLL
newGoodsBuy.BuyName = GoodsBuy.BuyName;
newGoodsBuy.BuyCode = GoodsBuy.BuyCode;
//newGoodsBuy.CompileMan = GoodsBuy.CompileMan;
newGoodsBuy.ApprovalDate = GoodsBuy.ApprovalDate;
//newGoodsBuy.ApprovalDate = GoodsBuy.ApprovalDate;
newGoodsBuy.SubmitDate = GoodsBuy.SubmitDate;
newGoodsBuy.GetGoodsDate = GoodsBuy.GetGoodsDate;
newGoodsBuy.AttachUrl = GoodsBuy.AttachUrl;
newGoodsBuy.Remark = GoodsBuy.Remark;
newGoodsBuy.UnitCode = GoodsBuy.UnitCode;
Funs.DB.SubmitChanges();
}
}
@ -82,5 +85,39 @@ namespace BLL
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 获取类型信息
/// </summary>
/// <returns></returns>
public static ListItem[] GetBugType()
{
ListItem[] list = new ListItem[5];
list[0] = new ListItem("01 开车临时材料请购单", "01");
list[1] = new ListItem("02 润滑油、脂请购单", "02");
list[2] = new ListItem("03 化学品消耗清单", "03");
list[3] = new ListItem("04 开车垫片请购单", "04");
list[4] = new ListItem("05 开车其他物资", "05");
return list;
}
/// <summary>
/// 获取方案类别
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static string ConvertBugType(object solutionType)
{
if (solutionType != null)
{
ListItem[] list = GetBugType();
var item = list.FirstOrDefault(x => x.Value == solutionType.ToString());
if (item != null)
{
return item.Text.Substring(3);
}
}
return "";
}
}
}

View File

@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public static class GoodsModelService
{
/// <summary>
/// 根据主键获取开车物资库信息
/// </summary>
/// <param name="GoodsModelId"></param>
/// <returns></returns>
public static Model.DriverGoods_GoodsModel GetGoodsModelById(string GoodsModelId)
{
return Funs.DB.DriverGoods_GoodsModel.FirstOrDefault(e => e.GoodsModelId == GoodsModelId);
}
/// <summary>
/// 添加开车物资库信息
/// </summary>
/// <param name="GoodsModel"></param>
public static void AddGoodsModel(Model.DriverGoods_GoodsModel GoodsModel)
{
Model.DriverGoods_GoodsModel newGoodsModel = new Model.DriverGoods_GoodsModel();
newGoodsModel.GoodsModelId = GoodsModel.GoodsModelId;
newGoodsModel.ProjectId = GoodsModel.ProjectId;
newGoodsModel.Code = GoodsModel.Code;
newGoodsModel.Description = GoodsModel.Description;
newGoodsModel.Quantity = GoodsModel.Quantity;
newGoodsModel.Purpose = GoodsModel.Purpose;
newGoodsModel.Attachment = GoodsModel.Attachment;
newGoodsModel.Remark = GoodsModel.Remark;
Funs.DB.DriverGoods_GoodsModel.InsertOnSubmit(newGoodsModel);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改开车物资库
/// </summary>
/// <param name="GoodsModel"></param>
public static void UpdateGoodsModel(Model.DriverGoods_GoodsModel GoodsModel)
{
Model.DriverGoods_GoodsModel newGoodsModel = Funs.DB.DriverGoods_GoodsModel.FirstOrDefault(e => e.GoodsModelId == GoodsModel.GoodsModelId);
if (newGoodsModel != null)
{
newGoodsModel.Code = GoodsModel.Code;
newGoodsModel.Description = GoodsModel.Description;
newGoodsModel.Quantity = GoodsModel.Quantity;
newGoodsModel.Purpose = GoodsModel.Purpose;
newGoodsModel.Attachment = GoodsModel.Attachment;
newGoodsModel.Remark = GoodsModel.Remark;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除开车物资库
/// </summary>
/// <param name="GoodsModelId"></param>
public static void DeleteGoodsModel(string GoodsModelId)
{
Model.DriverGoods_GoodsModel GoodsModel = Funs.DB.DriverGoods_GoodsModel.FirstOrDefault(e => e.GoodsModelId == GoodsModelId);
if (GoodsModel != null)
{
BLL.CommonService.DeleteAttachFileById(GoodsModelId);
Funs.DB.DriverGoods_GoodsModel.DeleteOnSubmit(GoodsModel);
Funs.DB.SubmitChanges();
}
}
}
}

View File

@ -44,6 +44,8 @@ namespace BLL
newDriverRun.CompileDate = driverRun.CompileDate;
newDriverRun.AttachUrl = driverRun.AttachUrl;
newDriverRun.Remark = driverRun.Remark;
newDriverRun.Status = driverRun.Status;
newDriverRun.Priority = driverRun.Priority;
newDriverRun.State = driverRun.State;
Funs.DB.DriverRun_DriverRun.InsertOnSubmit(newDriverRun);
Funs.DB.SubmitChanges();
@ -68,6 +70,8 @@ namespace BLL
newDriverRun.CompileDate = driverRun.CompileDate;
newDriverRun.AttachUrl = driverRun.AttachUrl;
newDriverRun.Remark = driverRun.Remark;
newDriverRun.Status = driverRun.Status;
newDriverRun.Priority = driverRun.Priority;
newDriverRun.State = driverRun.State;
db.DriverRun_DriverRun.InsertOnSubmit(newDriverRun);

View File

@ -66,6 +66,7 @@ namespace BLL
newConstructSolution.Edition = constructSolution.Edition;
newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
newConstructSolution.Content = constructSolution.Content;
newConstructSolution.System = constructSolution.System;
db.Solution_TestRunConstructSolution.InsertOnSubmit(newConstructSolution);
db.SubmitChanges();
}
@ -88,6 +89,7 @@ namespace BLL
newConstructSolution.Edition = constructSolution.Edition;
newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
newConstructSolution.Content = constructSolution.Content;
newConstructSolution.System = constructSolution.System;
db.SubmitChanges();
}
@ -112,11 +114,15 @@ namespace BLL
}
else if (state.ToString() == BLL.Const.TestRunConstructSolution_Audit)
{
return "会签";
return "审核";
}
else if (state.ToString() == BLL.Const.TestRunConstructSolution_Audit2)
{
return "审批";
}
else if (state.ToString() == BLL.Const.TestRunConstructSolution_Complete)
{
return "审批完成";
return "发布";
}
}
return "";
@ -127,7 +133,7 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetSolutionType()
{
ListItem[] list = new ListItem[13];
ListItem[] list = new ListItem[12];
list[0] = new ListItem("01 开车文件编制计划", "01");
list[1] = new ListItem("02 单机试车方案", "02");
list[2] = new ListItem("03 冲洗吹扫方案", "03");
@ -140,7 +146,7 @@ namespace BLL
list[9] = new ListItem("10 性能考核方案", "10");
list[10] = new ListItem("11 其他方案(如:真空试验、升温还原、煮炉、预冷、预热等)", "11");
list[11] = new ListItem("12 总体试车方案", "12");
list[12] = new ListItem("13 方案审查记录", "13");
//list[12] = new ListItem("13 方案审查记录", "13");
return list;
}
@ -419,5 +425,48 @@ namespace BLL
db.SubmitChanges();
}
}
public static void Init(FineUIPro.DropDownList dropName, string state, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetDHandleTypeByState(state);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据状态选择下一步办理类型
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
public static ListItem[] GetDHandleTypeByState(string state)
{
if (state == Const.TestRunConstructSolution_Compile || state == Const.TestRunConstructSolution_ReCompile) //无是否同意
{
ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("审核", Const.TestRunConstructSolution_Audit);
return lis;
}
else if (state == Const.TestRunConstructSolution_Audit)//有是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("审批", Const.TestRunConstructSolution_Audit2);//是 加载
lis[1] = new ListItem("重新编制", Const.TestRunConstructSolution_ReCompile);//否加载
return lis;
}
else if (state == Const.TestRunConstructSolution_Audit2)//无是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("发布", Const.TestRunConstructSolution_Complete);
lis[1] = new ListItem("重新编制", Const.TestRunConstructSolution_ReCompile);
return lis;
}
else
return null;
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1712,10 +1712,14 @@
<Content Include="TestRun\BeforeTestRun\TestRunRecordUploadList.aspx" />
<Content Include="TestRun\DriverGoods\GoodsBuy.aspx" />
<Content Include="TestRun\DriverGoods\GoodsBuyEdit.aspx" />
<Content Include="TestRun\DriverGoods\GoodsModel.aspx" />
<Content Include="TestRun\DriverGoods\GoodsModelDataIn.aspx" />
<Content Include="TestRun\DriverGoods\GoodsModelEdit.aspx" />
<Content Include="TestRun\DriverGoods\GoodsPlan.aspx" />
<Content Include="TestRun\DriverGoods\GoodsPlanEdit.aspx" />
<Content Include="TestRun\DriverGoods\MaterialTrace.aspx" />
<Content Include="TestRun\DriverGoods\MaterialTraceEdit.aspx" />
<Content Include="TestRun\DriverGoods\ShowGoodsModel.aspx" />
<Content Include="TestRun\DriverHse\HseHazard.aspx" />
<Content Include="TestRun\DriverHse\HseHazardEdit.aspx" />
<Content Include="TestRun\DriverHse\HseLicense.aspx" />
@ -1756,6 +1760,7 @@
<Content Include="TestRun\DriverRun\DriverRunPlanEdit.aspx" />
<Content Include="TestRun\DriverRun\DriverRunView.aspx" />
<Content Include="TestRun\DriverScheme.aspx" />
<Content Include="TestRun\DriverSchemeChart.aspx" />
<Content Include="TestRun\DriverSchemeEdit.aspx" />
<Content Include="TestRun\DriverSchemeView.aspx" />
<Content Include="TestRun\DriverSub\DriverSub.aspx" />
@ -15497,6 +15502,27 @@
<Compile Include="TestRun\DriverGoods\GoodsBuyEdit.aspx.designer.cs">
<DependentUpon>GoodsBuyEdit.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModel.aspx.cs">
<DependentUpon>GoodsModel.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModel.aspx.designer.cs">
<DependentUpon>GoodsModel.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModelDataIn.aspx.cs">
<DependentUpon>GoodsModelDataIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModelDataIn.aspx.designer.cs">
<DependentUpon>GoodsModelDataIn.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModelEdit.aspx.cs">
<DependentUpon>GoodsModelEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsModelEdit.aspx.designer.cs">
<DependentUpon>GoodsModelEdit.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverGoods\GoodsPlan.aspx.cs">
<DependentUpon>GoodsPlan.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -15525,6 +15551,13 @@
<Compile Include="TestRun\DriverGoods\MaterialTraceEdit.aspx.designer.cs">
<DependentUpon>MaterialTraceEdit.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverGoods\ShowGoodsModel.aspx.cs">
<DependentUpon>ShowGoodsModel.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverGoods\ShowGoodsModel.aspx.designer.cs">
<DependentUpon>ShowGoodsModel.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverHse\HseHazard.aspx.cs">
<DependentUpon>HseHazard.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -15847,6 +15880,13 @@
<Compile Include="TestRun\DriverScheme.aspx.designer.cs">
<DependentUpon>DriverScheme.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverSchemeChart.aspx.cs">
<DependentUpon>DriverSchemeChart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverSchemeChart.aspx.designer.cs">
<DependentUpon>DriverSchemeChart.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverSchemeEdit.aspx.cs">
<DependentUpon>DriverSchemeEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

View File

@ -144,20 +144,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
Model.GJSX gjsx = BLL.GJSXService.GetGJSXById(ID);
List<SqlParameter> listStr = new List<SqlParameter>();
string projectId = this.CurrUser.LoginProjectId;
if (gjsx != null)
{
projectId = gjsx.ProjectId;
}
listStr.Add(new SqlParameter("@ProjectId", projectId));
string sql = "and GJSXID='" + ID + "'";
listStr.Add(new SqlParameter("@sql_where", sql));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
//List<SqlParameter> listStr = new List<SqlParameter>();
//string projectId = this.CurrUser.LoginProjectId;
//if (gjsx != null)
//{
// projectId = gjsx.ProjectId;
//}
//listStr.Add(new SqlParameter("@ProjectId", projectId));
//string sql = "and GJSXID='" + ID + "'";
//listStr.Add(new SqlParameter("@sql_where", sql));
//SqlParameter[] parameter = listStr.ToArray();
//DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
if (tb != null && tb.Rows.Count > 0)
{
//if (tb != null && tb.Rows.Count > 0)
//{
txtGJSXID.Text = gjsx.GJSXID;
DropUnitId.SelectedValue = gjsx.UnitId;
if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID))
@ -181,13 +181,24 @@ namespace FineUIPro.Web.PZHGL.GJSX
DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray();
}
// Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString();
txtDetail.Text = tb.Rows[0]["detail"].ToString();
txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
//txtDetail.Text = tb.Rows[0]["detail"].ToString();
//txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
//Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
//Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
txtDetail.Text = gjsx.Detail;
txtUserID.Text = BLL.UserService.GetUserNameByUserId(gjsx.UserID);
if (gjsx.CreateDate != null)
{
Date_CreateDate.Text = string.Format("{0:yyyy-MM-dd}",gjsx.CreateDate);
}
if (gjsx.CompleteDate != null)
{
Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate);
}
rblState.SelectedValue = gjsx.State.ToString().Trim();
}
//}
if (this.CurrUser.UserId == BLL.Const.sysglyId || this.CurrUser.UserId == BLL.Const.SystemManager)//如果当前登录人是管理员

View File

@ -9,78 +9,83 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车物资请购管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GoodsBuyId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="GoodsBuyId" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtBuyName" runat="server" Label="请购单" LabelAlign="Right"></f:TextBox>
<f:TextBox ID="txtBuyCode" runat="server" Label="请购单号" LabelAlign="Right"></f:TextBox>
<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="Code" DataField="Code"
FieldType="String" HeaderText="序号" HeaderTextAlign="Center" Width="55px" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="BuyName" DataField="BuyName"
FieldType="String" HeaderText="请购单" HeaderTextAlign="Center" Width="220px">
</f:RenderField>
<f:RenderField ColumnID="BuyCode" DataField="BuyCode"
FieldType="String" HeaderText="请购单号" HeaderTextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField ColumnID="CompileManName" DataField="CompileManName"
FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate"
FieldType="Date" Renderer="Date" HeaderText="批准时间" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
FieldType="Date" Renderer="Date" HeaderText="提交请购时间" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="GetGoodsDate" DataField="GetGoodsDate"
FieldType="Date" Renderer="Date" HeaderText="到货时间" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="120px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
<f:Panel runat="server" ID="Panel2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
Width="300px" Title="资料库" ShowBorder="true" ShowHeader="false" Layout="Region"
BodyPadding="1px">
<Items>
<f:Tree ID="tvDataTypeInit" EnableCollapse="true" ShowHeader="false" ShowBorder="true"
OnNodeCommand="tvDataTypeInit_NodeCommand" AutoLeafIdentification="true"
runat="server">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="Panel4" RegionPosition="Center" Layout="Fit"
Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车物资管理" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="GoodsBuyId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="GoodsBuyId" AllowSorting="true" SortField="Code"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" OnClick="btnNew_Click" runat="server" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="Code" DataField="Code" Width="70px"
FieldType="String" HeaderText="编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="UnitCode" DataField="UnitCode" Width="130px"
FieldType="String" HeaderText="装置" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="CompileManName" Width="70px" DataField="CompileManName"
FieldType="String" HeaderText="编制人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ApprovalDate" DataField="ApprovalDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="开车物资请购管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="开车物资请购" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="600px">
Width="1300px" Height="660px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@ -88,9 +93,9 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据?"
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据?" Hidden="true"
OnClick="btnMenuDel_Click">
</f:MenuButton>
</Items>
@ -104,6 +109,7 @@
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}

View File

@ -9,52 +9,109 @@ namespace FineUIPro.Web.TestRun.DriverGoods
{
public partial class GoodsBuy : PageBase
{
#region
#region
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
GetButtonPower();
BindGrid();
btnNew.OnClientClick = Window1.GetShowReference("GoodsBuyEdit.aspx") + "return false;";
InitTree();//加载类别树
}
}
#region
/// <summary>
/// 绑定方案树节点
/// </summary>
private void InitTree()
{
this.tvDataTypeInit.Nodes.Clear();
TreeNode node = new TreeNode();
node.Text = "开车物资材料管理";
node.NodeID = "0";
node.Expanded = true;
this.tvDataTypeInit.Nodes.Add(node);
var types = BLL.GoodsBuyService.GetBugType();
foreach (var q in types)
{
TreeNode newNode = new TreeNode();
newNode.ToolTip = q.Text;
newNode.Text = q.Text;
newNode.NodeID = q.Value;
newNode.EnableExpandEvent = true;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
}
/// <summary>
/// 展开树
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
//protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
//{
// e.Node.Nodes.Clear();
// var types = from x in Funs.DB.DriverPrepare_DriverDataType
// where x.ProjectId == this.CurrUser.LoginProjectId && x.ParentId == e.Node.NodeID
// select x;
// if (types.Count() > 0)
// {
// foreach (var type in types)
// {
// TreeNode newNode = new TreeNode();
// newNode.ToolTip = type.DriverDataTypeName;
// newNode.Text = type.DriverDataTypeName;
// newNode.NodeID = type.DriverDataTypeId;
// newNode.EnableExpandEvent = true;
// newNode.EnableClickEvent = true;
// e.Node.Nodes.Add(newNode);
// var childTypes = from x in Funs.DB.DriverPrepare_DriverDataType where x.ParentId == type.DriverDataTypeId select x;
// if (childTypes.Count() > 0)
// {
// TreeNode temp = new TreeNode();
// temp.Text = "";
// temp.NodeID = "";
// newNode.Nodes.Add(temp);
// }
// }
// }
//}
#endregion
#endregion
#region
/// <summary>
/// 资料库类别树点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void tvDataTypeInit_NodeCommand(object sender, TreeCommandEventArgs e)
{
BindGrid();
}
#endregion
#region
//加载列表
/// <summary>
/// 数据绑定
/// </summary>
public void BindGrid()
{
string strSql = @"SELECT buy.GoodsBuyId,
buy.ProjectId,
buy.Code,
buy.BuyName,
buy.BuyCode,
buy.CompileMan,
buy.ApprovalDate,
buy.SubmitDate,
buy.GetGoodsDate,
buy.Remark,
U.UserName AS CompileManName"
+ @" FROM DriverGoods_GoodsBuy AS buy "
+ @" LEFT JOIN Sys_User AS U ON U.UserId = buy.CompileMan WHERE buy.ProjectId=@projectId";
string strSql = @"SELECT chec.GoodsBuyId,chec.ProjectId,chec.Code,chec.BuyName,chec.BuyCode,"
+ @" chec.CompileMan,chec.ApprovalDate,chec.UnitCode,"
+ @" u.userName as CompileManName"
+ @" FROM DriverGoods_GoodsBuy chec "
+ @" left join sys_User u on u.userId = chec.CompileMan"
+ @" where chec.ProjectId=@ProjectId and chec.BuyCode=@BuyCode";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.txtBuyName.Text.Trim()))
{
strSql += " AND buy.BuyName LIKE @BuyName";
listStr.Add(new SqlParameter("@BuyName", "%" + this.txtBuyName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtBuyCode.Text.Trim()))
{
strSql += " AND buy.BuyCode LIKE @BuyCode";
listStr.Add(new SqlParameter("@BuyCode", "%" + this.txtBuyCode.Text.Trim() + "%"));
}
listStr.Add(new SqlParameter("@BuyCode", this.tvDataTypeInit.SelectedNodeID));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
@ -95,8 +152,12 @@ namespace FineUIPro.Web.TestRun.DriverGoods
}
#endregion
#region
//搜索按钮事件
#region
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSearch_Click(object sender, EventArgs e)
{
BindGrid();
@ -111,10 +172,38 @@ namespace FineUIPro.Web.TestRun.DriverGoods
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
InitTree();
BindGrid();
}
#endregion
#region
/// <summary>
/// 增加
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (this.tvDataTypeInit.SelectedNode != null)
{
//if (this.trWBS.SelectedNode.Nodes.Count == 0) //末级节点
if (this.tvDataTypeInit.SelectedNodeID != "0")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GoodsBuyEdit.aspx?BuyCode={0}", this.tvDataTypeInit.SelectedNode.NodeID, "新增 - ")));
}
else
{
Alert.ShowInTop("请选择请购单类别!", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("请选择树节点!", MessageBoxIcon.Warning);
}
}
#endregion
#region
protected void btnMenuModify_Click(object sender, EventArgs e)
{
@ -141,11 +230,16 @@ namespace FineUIPro.Web.TestRun.DriverGoods
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GoodsBuyEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GoodsBuyEdit.aspx?GoodsBuyId={0}", Grid1.SelectedRowID, "编辑 - ")));
}
#endregion
#region
/// <summary>
/// 右键删除
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuDel_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length > 0)
@ -153,11 +247,8 @@ namespace FineUIPro.Web.TestRun.DriverGoods
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var info = BLL.GoodsBuyService.GetGoodsBuyById(rowID);
if (info != null)
{
BLL.GoodsBuyService.DeleteGoodsBuy(rowID);
}
BLL.GoodsBuyItemService.DeleteGoodsBuyItemByGoodsBuyId(rowID);
BLL.GoodsBuyService.DeleteGoodsBuy(rowID);
}
BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);

View File

@ -39,6 +39,33 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// tvDataTypeInit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvDataTypeInit;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -57,33 +84,6 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// txtBuyName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBuyName;
/// <summary>
/// txtBuyCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBuyCode;
/// <summary>
/// btnSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -93,6 +93,15 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑开车物资请购管理</title>
</head>
<body>
@ -15,6 +15,9 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<%--<f:HiddenField ID="hdItemsString" runat="server"></f:HiddenField>--%>
<f:TextBox runat="server" ID="hdItemsString" Hidden="true"></f:TextBox>
<f:HiddenField ID="hdBuyCode" runat="server"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
@ -36,48 +39,13 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtCode" runat="server" Label="号" LabelAlign="Right" LabelWidth="120px" MaxLength="50" Required="true" ShowRedStar="true">
<f:TextBox ID="txtCode" runat="server" Label="号" LabelAlign="Right" LabelWidth="120px" MaxLength="50" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtBuyName" runat="server" Label="请购单" LabelAlign="Right" LabelWidth="120px" MaxLength="100" Required="true" ShowRedStar="true">
<f:Label runat="server" ID="txtBuyName" Label="请购单类型" LabelAlign="Right" LabelWidth="120px"></f:Label>
<f:TextBox ID="txtUnitCode" runat="server" Label="装置" MaxLength="100" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtBuyCode" runat="server" Label="请购单号" LabelAlign="Right" LabelWidth="120px" MaxLength="50" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtApprovalDate" runat="server" Label="批准时间" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtSubmitDate" runat="server" Label="提交请购时间" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtGetGoodsDate" runat="server" Label="到货时间" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="120px" MaxLength="500">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
@ -91,6 +59,53 @@
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="请购单明细" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="GoodsModelId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="1" DataIDField="GoodsModelId" OnRowCommand="Grid1_RowCommand" AllowSorting="true" SortField="Code"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar4" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnNew" OnClick="btnNew_Click" Icon="Add" EnablePostBack="true" runat="server" ToolTip="选择物资材料">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="用途" ColumnID="Purpose" DataField="Purpose" Width="120px"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="设备(材料)名称及规格" ColumnID="Description" DataField="Description" Width="320px"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Quantity" DataField="Quantity"
FieldType="String" HeaderText="数量" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox runat="server" ID="txtQuantity"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="附件(详细清单/图纸等)" ColumnID="Attachment" DataField="Attachment" Width="180px"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="139px" ColumnID="RequiredTime" DataField="RequiredTime" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="要求到货时间" HeaderTextAlign="Center">
<Editor>
<f:DatePicker ID="txtRequiredTime" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" Width="180px"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:LinkButtonField ColumnID="Del" HeaderText="删除" HeaderTextAlign="Center" TextAlign="Center" Width="50px" CommandName="delete"
Icon="Delete" />
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
@ -102,6 +117,10 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1200px" Height="620px" OnClose="Window1_Close">
</f:Window>
</form>
</body>
</html>

View File

@ -1,5 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
namespace FineUIPro.Web.TestRun.DriverGoods
{
@ -15,9 +18,7 @@ namespace FineUIPro.Web.TestRun.DriverGoods
{
if (!IsPostBack)
{
BLL.UserService.InitUserDropDownList(this.drpCompileMan, this.CurrUser.LoginProjectId, true);
string id = Request.Params["id"];
string id = Request.Params["GoodsBuyId"];
if (!string.IsNullOrEmpty(id))
{
Model.DriverGoods_GoodsBuy data = BLL.GoodsBuyService.GetGoodsBuyById(id);
@ -25,18 +26,27 @@ namespace FineUIPro.Web.TestRun.DriverGoods
{
this.hdId.Text = id;
this.txtCode.Text = data.Code;
this.txtBuyName.Text = data.BuyName;
this.txtBuyCode.Text = data.BuyCode;
if (!string.IsNullOrEmpty(data.CompileMan))
if (!string.IsNullOrEmpty(data.BuyCode))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
this.hdBuyCode.Text = data.BuyCode;
this.txtBuyName.Text = GoodsBuyService.ConvertBugType(data.BuyCode);
}
this.txtUnitCode.Text = data.UnitCode;
var list = from x in Funs.DB.View_DriverGoods_GoodsBuyItem where x.GoodsBuyId == id orderby x.Code select x;
this.Grid1.DataSource = list;
this.Grid1.DataBind();
if (list.Count() > 0)
{
var ids = list.Select(x => x.GoodsModelId).ToArray();
this.hdItemsString.Text = Funs.GetStringByArray(ids);
}
this.txtApprovalDate.Text = data.ApprovalDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.ApprovalDate) : "";
this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
this.txtGetGoodsDate.Text = data.GetGoodsDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.GetGoodsDate) : "";
this.txtRemark.Text = data.Remark;
}
}
else
{
this.hdBuyCode.Text = Request.Params["BuyCode"];
this.txtBuyName.Text = GoodsBuyService.ConvertBugType(this.hdBuyCode.Text);
}
}
}
#endregion
@ -65,19 +75,14 @@ namespace FineUIPro.Web.TestRun.DriverGoods
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
string id = Request.Params["id"];
string id = Request.Params["GoodsBuyId"];
Model.DriverGoods_GoodsBuy newData = new Model.DriverGoods_GoodsBuy();
newData.Code = this.txtCode.Text.Trim();
newData.BuyName = this.txtBuyName.Text.Trim();
newData.BuyCode = this.txtBuyCode.Text.Trim();
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
newData.CompileMan = this.drpCompileMan.SelectedValue;
}
newData.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text.Trim());
newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
newData.GetGoodsDate = Funs.GetNewDateTime(this.txtGetGoodsDate.Text.Trim());
newData.Remark = this.txtRemark.Text.Trim();
newData.BuyCode = this.hdBuyCode.Text.Trim();
newData.UnitCode = this.txtUnitCode.Text.Trim();
newData.CompileMan = this.CurrUser.UserId;
newData.ApprovalDate = DateTime.Now;
newData.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(id))
{
@ -97,9 +102,122 @@ namespace FineUIPro.Web.TestRun.DriverGoods
}
BLL.GoodsBuyService.AddGoodsBuy(newData);
}
BLL.GoodsBuyItemService.DeleteGoodsBuyItemByGoodsBuyId(newData.GoodsBuyId);
var details = jerqueSaveList();
foreach (var detail in details)
{
Model.DriverGoods_GoodsBuyItem item = new Model.DriverGoods_GoodsBuyItem();
item.GoodsBuyItemId = SQLHelper.GetNewID();
item.GoodsBuyId = newData.GoodsBuyId;
item.GoodsModelId = detail.GoodsModelId;
item.Quantity = detail.Quantity;
item.RequiredTime = detail.RequiredTime;
BLL.GoodsBuyItemService.AddGoodsBuyItem(item);
}
ShowNotify("保存成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
#region
/// <summary>
/// 搜索
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
string window = String.Format("ShowGoodsModel.aspx?Ids={0}", hdItemsString.Text, "查找 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
}
#endregion
#region Grid集合
/// <summary>
/// 检查并保存集合
/// </summary>
private List<Model.View_DriverGoods_GoodsBuyItem> jerqueSaveList()
{
var models = from x in Funs.DB.DriverGoods_GoodsModel where x.ProjectId == this.CurrUser.LoginProjectId select x;
List<Model.View_DriverGoods_GoodsBuyItem> details = new List<Model.View_DriverGoods_GoodsBuyItem>();
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
Model.View_DriverGoods_GoodsBuyItem detail = new Model.View_DriverGoods_GoodsBuyItem();
detail.GoodsModelId = this.Grid1.Rows[i].RowID;
Model.DriverGoods_GoodsModel model = models.FirstOrDefault(x => x.GoodsModelId == detail.GoodsModelId);
detail.Purpose = model.Purpose;
detail.Description = model.Description;
detail.Attachment = model.Attachment;
detail.Remark = model.Remark;
detail.Quantity = values.Value<string>("Quantity");
string requiredTime = values.Value<string>("RequiredTime");
if (!string.IsNullOrEmpty(requiredTime))
{
detail.RequiredTime = Convert.ToDateTime(requiredTime);
}
details.Add(detail);
}
return details;
}
#endregion
#region
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
if (!string.IsNullOrEmpty(hdItemsString.Text))
{
string[] ids = hdItemsString.Text.Split(',');
var details = jerqueSaveList();
var models = from x in Funs.DB.DriverGoods_GoodsModel where x.ProjectId == this.CurrUser.LoginProjectId select x;
foreach (var id in ids)
{
var oldDetail = details.FirstOrDefault(x => x.GoodsModelId == id);
if (oldDetail == null) //添加集合没有的新纪录
{
Model.DriverGoods_GoodsModel model = models.FirstOrDefault(x => x.GoodsModelId == id);
if (model != null)
{
Model.View_DriverGoods_GoodsBuyItem detail = new Model.View_DriverGoods_GoodsBuyItem();
detail.GoodsModelId = model.GoodsModelId;
detail.Purpose = model.Purpose;
detail.Description = model.Description;
detail.Attachment = model.Attachment;
detail.Remark = model.Remark;
details.Add(detail);
}
}
}
this.Grid1.DataSource = details;
this.Grid1.DataBind();
}
}
#endregion
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
List<Model.View_DriverGoods_GoodsBuyItem> details = jerqueSaveList();
if (e.CommandName == "delete")
{
foreach (Model.View_DriverGoods_GoodsBuyItem detail in details)
{
if (detail.GoodsModelId == itemId)
{
details.Remove(detail);
break;
}
}
Grid1.DataSource = details;
Grid1.DataBind();
}
}
}
}

View File

@ -48,6 +48,24 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdItemsString 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdItemsString;
/// <summary>
/// hdBuyCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdBuyCode;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -118,61 +136,16 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBuyName;
protected global::FineUIPro.Label txtBuyName;
/// <summary>
/// txtBuyCode 控件。
/// txtUnitCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBuyCode;
/// <summary>
/// drpCompileMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCompileMan;
/// <summary>
/// txtApprovalDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtApprovalDate;
/// <summary>
/// txtSubmitDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSubmitDate;
/// <summary>
/// txtGetGoodsDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtGetGoodsDate;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
protected global::FineUIPro.TextBox txtUnitCode;
/// <summary>
/// Panel3 控件。
@ -201,6 +174,51 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// txtQuantity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtQuantity;
/// <summary>
/// txtRequiredTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRequiredTime;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@ -209,5 +227,14 @@ namespace FineUIPro.Web.TestRun.DriverGoods {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

View File

@ -0,0 +1,105 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GoodsModel.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverGoods.GoodsModel" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="物资材料库" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="GoodsModelId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="GoodsModelId" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="true">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtDescription" Label="设备(材料)名称及规格" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
</f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="Code" DataField="Code" FieldType="String" HeaderText="序号" TextAlign="Center"
HeaderTextAlign="Center" Width="55px">
</f:RenderField>
<f:RenderField ColumnID="Purpose" DataField="Purpose" FieldType="String" HeaderText="用途" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Description" DataField="Description" FieldType="String" HeaderText="设备(材料)名称及规格" TextAlign="Center"
HeaderTextAlign="Center" Width="300px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="Quantity" DataField="Quantity" FieldType="String" HeaderText="数量" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="Attachment" DataField="Attachment" FieldType="String" HeaderText="附件(详细清单/图纸等)" TextAlign="Center"
HeaderTextAlign="Center" Width="180px">
</f:RenderField>
<f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</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" OnClose="Window1_Close"
Width="900px" Height="520px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="700px" 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">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据?"
OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,168 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverGoods {
public partial class GoodsModel {
/// <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>
/// ToolSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// txtDescription 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescription;
/// <summary>
/// btnSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <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>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDel;
}
}

View File

@ -0,0 +1,68 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GoodsModelDataIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverGoods.GoodsModelDataIn" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdFileName" runat="server">
</f:HiddenField>
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
OnClick="btnAudit_Click">
</f:Button>
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
</f:Button>
<f:HiddenField ID="hdCheckResult" runat="server">
</f:HiddenField>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
LabelWidth="150px">
</f:FileUpload>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="人员报验" EnableCollapse="true"
runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField DataField="Row" HeaderText="错误行号">
</f:BoundField>
<f:BoundField DataField="Column" HeaderText="错误列">
</f:BoundField>
<f:BoundField DataField="Reason" HeaderText="错误类型">
</f:BoundField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>

View File

@ -0,0 +1,399 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.DriverGoods
{
public partial class GoodsModelDataIn : PageBase
{
#region
/// <summary>
/// 上传预设的虚拟路径
/// </summary>
private string initPath = Const.ExcelUrl;
/// <summary>
/// 错误集合
/// </summary>
public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
#endregion
#region
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.hdCheckResult.Text = string.Empty;
this.hdFileName.Text = string.Empty;
if (errorInfos != null)
{
errorInfos.Clear();
}
}
}
#endregion
#region
/// <summary>
/// 审核
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAudit_Click(object sender, EventArgs e)
{
try
{
if (this.fuAttachUrl.HasFile == false)
{
ShowNotify("请您选择Excel文件", MessageBoxIcon.Warning);
return;
}
string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
if (IsXls != ".xls")
{
ShowNotify("只可以选择Excel文件", MessageBoxIcon.Warning);
return;
}
if (errorInfos != null)
{
errorInfos.Clear();
}
string rootPath = Server.MapPath("~/");
string initFullPath = rootPath + initPath;
if (!Directory.Exists(initFullPath))
{
Directory.CreateDirectory(initFullPath);
}
this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
string filePath = initFullPath + this.hdFileName.Text;
this.fuAttachUrl.PostedFile.SaveAs(filePath);
ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
}
catch (Exception ex)
{
ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
}
}
#region Excel提取数据
/// <summary>
/// 从Excel提取数据--》Dataset
/// </summary>
/// <param name="filename">Excel文件路径名</param>
private void ImportXlsToData(string fileName)
{
try
{
string oleDBConnString = String.Empty;
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source=";
oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;";
OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable();
DataSet ds = new DataSet();
oleDBConn = new OleDbConnection(oleDBConnString);
oleDBConn.Open();
m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
if (m_tableName != null && m_tableName.Rows.Count > 0)
{
m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
}
string sqlMaster;
sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]";
oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
oleAdMaster.Fill(ds, "m_tableName");
oleAdMaster.Dispose();
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 6);
hdCheckResult.Text = "1";
}
catch (Exception exc)
{
Response.Write(exc);
//return null;
// return dt;
}
finally
{
}
}
#endregion
#region Dataset的数据导入数据库
/// <summary>
/// 将Dataset的数据导入数据库
/// </summary>
/// <param name="pds">数据集</param>
/// <param name="Cols">数据集行数</param>
/// <returns></returns>
private bool AddDatasetToSQL(DataTable pds, int Cols)
{
string result = string.Empty;
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
{
ShowNotify("导入Excel格式错误Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
return false;
}
ir = pds.Rows.Count;
if (pds != null && ir > 0)
{
for (int i = 0; i < ir; i++)
{
string row0 = pds.Rows[i][0].ToString();
if (!string.IsNullOrEmpty(row0))
{
try
{
Int32 num = Convert.ToInt32(row0.Trim());
}
catch (Exception)
{
result += (i + 3).ToString() + "," + "序号" + "," + "[" + row0 + "]错误!不是数字格式!" + "|";
}
}
else
{
result += (i + 3).ToString() + "," + "序号为必填项,不能为空!" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
result = result.Substring(0, result.LastIndexOf("|"));
}
errorInfos.Clear();
if (!string.IsNullOrEmpty(result))
{
string results = result;
List<string> errorInfoList = results.Split('|').ToList();
foreach (var item in errorInfoList)
{
string[] errors = item.Split(',');
Model.ErrorInfo errorInfo = new Model.ErrorInfo();
errorInfo.Row = errors[0];
errorInfo.Column = errors[1];
errorInfo.Reason = errors[2];
errorInfos.Add(errorInfo);
}
if (errorInfos.Count > 0)
{
this.gvErrorInfo.DataSource = errorInfos;
this.gvErrorInfo.DataBind();
}
}
else
{
ShowNotify("审核完成,请点击导入!", MessageBoxIcon.Success);
}
}
else
{
ShowNotify("导入数据为空!", MessageBoxIcon.Warning);
}
return true;
}
#endregion
#endregion
#region
/// <summary>
/// 导入
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnImport_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(hdCheckResult.Text))
{
if (errorInfos.Count <= 0)
{
string rootPath = Server.MapPath("~/");
ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
hdCheckResult.Text = string.Empty;
ShowNotify("导入成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
else
{
ShowNotify("请先将错误数据修正,再重新导入提交!", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请先审核要导入的文件!", MessageBoxIcon.Warning);
}
}
#region Excel提取数据
/// <summary>
/// 从Excel提取数据--》Dataset
/// </summary>
/// <param name="filename">Excel文件路径名</param>
private void ImportXlsToData2(string fileName)
{
try
{
string oleDBConnString = String.Empty;
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source=";
oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;";
OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable();
DataSet ds = new DataSet();
oleDBConn = new OleDbConnection(oleDBConnString);
oleDBConn.Open();
m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
if (m_tableName != null && m_tableName.Rows.Count > 0)
{
m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
}
string sqlMaster;
sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]";
oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
oleAdMaster.Fill(ds, "m_tableName");
oleAdMaster.Dispose();
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 6);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region Dataset的数据导入数据库
/// <summary>
/// 将Dataset的数据导入数据库
/// </summary>
/// <param name="pds">数据集</param>
/// <param name="Cols">数据集列数</param>
/// <returns></returns>
private bool AddDatasetToSQL2(DataTable pds, int Cols)
{
int ic, ir;
ic = pds.Columns.Count;
if (ic < Cols)
{
ShowNotify("导入Excel格式错误Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
}
var goodsModels = from x in Funs.DB.DriverGoods_GoodsModel where x.ProjectId == this.CurrUser.LoginProjectId select x;
string result = string.Empty;
ir = pds.Rows.Count;
if (pds != null && ir > 0)
{
List<Model.DriverGoods_GoodsModel> list = new List<Model.DriverGoods_GoodsModel>();
for (int i = 0; i < ir; i++)
{
//查询第一列,没查到的情况下作导入处理
var modelOnly = goodsModels.FirstOrDefault(x => x.Code == Funs.GetNewIntOrZero(pds.Rows[i][0].ToString().Trim()));
if (modelOnly == null)
{
Model.DriverGoods_GoodsModel model = new Model.DriverGoods_GoodsModel();
model.GoodsModelId = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Code = Convert.ToInt32(pds.Rows[i][0].ToString().Trim());
model.Purpose = pds.Rows[i][1].ToString().Trim();
model.Description = pds.Rows[i][2].ToString().Trim();
model.Quantity = pds.Rows[i][3].ToString().Trim();
model.Attachment = pds.Rows[i][4].ToString().Trim();
model.Remark = pds.Rows[i][5].ToString().Trim();
list.Add(model);
}
else
{
//修改
modelOnly.Purpose = pds.Rows[i][1].ToString().Trim();
modelOnly.Description = pds.Rows[i][2].ToString().Trim();
modelOnly.Quantity = pds.Rows[i][3].ToString().Trim();
modelOnly.Attachment = pds.Rows[i][4].ToString().Trim();
modelOnly.Remark = pds.Rows[i][5].ToString().Trim();
Funs.DB.SubmitChanges();
}
}
if (list.Count > 0)
{
Funs.DB.DriverGoods_GoodsModel.InsertAllOnSubmit(list);
Funs.DB.SubmitChanges();
}
}
else
{
ShowNotify("导入数据为空!", MessageBoxIcon.Warning);
}
return true;
}
#endregion
#endregion
#region
/// <summary>
/// 下载模板按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnDownLoad_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗?", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
}
/// <summary>
/// 下载导入模板
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
{
if (e.EventArgument == "Confirm_OK")
{
string rootPath = Server.MapPath("~/");
string uploadfilepath = rootPath + "File\\Excel\\TestRun\\试车物资材料库导入模板.xls";
string filePath = "File\\Excel\\DataIn\\试车物资材料库导入模板.xls";
string fileName = Path.GetFileName(filePath);
FileInfo info = new FileInfo(uploadfilepath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(uploadfilepath, 0, fileSize);
Response.End();
}
}
#endregion
}
}

View File

@ -0,0 +1,123 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverGoods {
public partial class GoodsModelDataIn {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdFileName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// btnAudit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// hdCheckResult 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdCheckResult;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// gvErrorInfo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvErrorInfo;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
}
}

View File

@ -0,0 +1,98 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GoodsModelEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverGoods.GoodsModelEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
</f:Button>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:HiddenField ID="hdId" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel2" Title="开车物资库" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtCode" NoDecimal="true" ShowRedStar="true" Required="true" NoNegative="true" Label="序号" LabelAlign="Right" LabelWidth="130px"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPurpose" runat="server" Label="用途" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescription" runat="server" Label="设备(材料)名称及规格" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtQuantity" runat="server" Label="数量" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAttachment" runat="server" Label="附件(详细清单/图纸等)" LabelAlign="Right" LabelWidth="130px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="130px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="lblAttach" runat="server" Label="上传附件"
LabelWidth="130px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
</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>

View File

@ -0,0 +1,100 @@
using BLL;
using System;
namespace FineUIPro.Web.TestRun.DriverGoods
{
public partial class GoodsModelEdit : PageBase
{
#region
/// <summary>
/// 页面加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
string id = Request.Params["GoodsModelId"];
if (!string.IsNullOrEmpty(id))
{
Model.DriverGoods_GoodsModel goodsModel = BLL.GoodsModelService.GetGoodsModelById(id);
if (goodsModel != null)
{
this.hdId.Text = id;
if (goodsModel.Code != null)
{
this.txtCode.Text = goodsModel.Code.ToString();
}
this.txtPurpose.Text = goodsModel.Purpose;
this.txtDescription.Text = goodsModel.Description;
this.txtQuantity.Text = goodsModel.Quantity;
this.txtAttachment.Text = goodsModel.Attachment;
this.txtRemark.Text = goodsModel.Remark;
}
}
else
{
}
}
}
#endregion
#region
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdId.Text)) //新增记录
{
this.hdId.Text = SQLHelper.GetNewID(typeof(Model.DriverGoods_GoodsModel));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverGoods/GoodsModel&menuId={1}", this.hdId.Text, BLL.Const.GoodsModelMenuId)));
}
#endregion
#region
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
string id = Request.Params["GoodsModelId"];
Model.DriverGoods_GoodsModel newgoodsModel = new Model.DriverGoods_GoodsModel();
newgoodsModel.Code = Funs.GetNewInt(this.txtCode.Text.Trim());
newgoodsModel.Purpose = this.txtPurpose.Text.Trim();
newgoodsModel.Description = this.txtDescription.Text.Trim();
newgoodsModel.Quantity = this.txtQuantity.Text.Trim();
newgoodsModel.Attachment = this.txtAttachment.Text.Trim();
newgoodsModel.Remark = this.txtRemark.Text.Trim();
newgoodsModel.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(id))
{
newgoodsModel.GoodsModelId = id;
BLL.GoodsModelService.UpdateGoodsModel(newgoodsModel);
}
else
{
if (!string.IsNullOrEmpty(this.hdId.Text))
{
newgoodsModel.GoodsModelId = this.hdId.Text.Trim();
}
else
{
newgoodsModel.GoodsModelId = SQLHelper.GetNewID(typeof(Model.DriverGoods_GoodsModel));
this.hdId.Text = newgoodsModel.GoodsModelId;
}
BLL.GoodsModelService.AddGoodsModel(newgoodsModel);
}
ShowNotify("保存成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
}
}

View File

@ -0,0 +1,195 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverGoods {
public partial class GoodsModelEdit {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// hdId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdId;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCode;
/// <summary>
/// txtPurpose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPurpose;
/// <summary>
/// txtDescription 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescription;
/// <summary>
/// txtQuantity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtQuantity;
/// <summary>
/// txtAttachment 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAttachment;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// lblAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblAttach;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
}

View File

@ -0,0 +1,64 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShowGoodsModel.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverGoods.ShowGoodsModel" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
TitleToolTip="焊口信息" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1"
DataKeyNames="GoodsModelId" AllowColumnLocking="true" EnableColumnLines="true"
DataIDField="GoodsModelId" EnableTextSelection="True" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
PageSize="10000" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:HiddenField runat="server" ID="hdIds"></f:HiddenField>
<f:Button ID="btnAccept" Icon="Accept" runat="server" Text="确定" ToolTip="确定"
OnClick="btnAccept_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField ColumnID="Code" DataField="Code" FieldType="String" HeaderText="序号" TextAlign="Center"
HeaderTextAlign="Center" Width="55px">
</f:RenderField>
<f:RenderField ColumnID="Purpose" DataField="Purpose" FieldType="String" HeaderText="用途" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Description" DataField="Description" FieldType="String" HeaderText="设备(材料)名称及规格" TextAlign="Center"
HeaderTextAlign="Center" Width="300px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="Quantity" DataField="Quantity" FieldType="String" HeaderText="数量" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="Attachment" DataField="Attachment" FieldType="String" HeaderText="附件(详细清单/图纸等)" TextAlign="Center"
HeaderTextAlign="Center" Width="180px">
</f:RenderField>
<f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
</html>

View File

@ -0,0 +1,100 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.TestRun.DriverGoods
{
public partial class ShowGoodsModel : PageBase
{
#region
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.BindGrid();
}
}
#endregion
#region
/// <summary>
/// 数据绑定
/// </summary>
private void BindGrid()
{
//string[] selectRowId = Grid1.SelectedRowIDArray;
//foreach (GridRow row in Grid1.Rows)
//{
// if (selectRowId.Contains(row.RowID))
// {
// hdIds.Text += row.DataKeys[1].ToString() + ",";
// }
//}
string strSql = @"SELECT *
FROM dbo.DriverGoods_GoodsModel C
where C.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
string id = Request.Params["Ids"];
List<string> ids = new List<string>();
foreach (GridRow row in Grid1.Rows)
{
if (id.Contains(row.DataKeys[0].ToString()))
{
ids.Add(row.RowID);
}
}
this.Grid1.SelectedRowIDArray = ids.ToArray();
}
#endregion
#region
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
this.BindGrid();
}
#endregion
#region
/// <summary>
/// 确定按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAccept_Click(object sender, EventArgs e)
{
string ids = string.Empty;
foreach (string id in Grid1.SelectedRowIDArray)
{
ids += id + ",";
}
if (!string.IsNullOrEmpty(ids))
{
ids = ids.Substring(0, ids.LastIndexOf(","));
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(ids)
+ ActiveWindow.GetHidePostBackReference());
}
#endregion
}
}

View File

@ -0,0 +1,96 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverGoods {
public partial class ShowGoodsModel {
/// <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>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// hdIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdIds;
/// <summary>
/// btnAccept 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAccept;
}
}

View File

@ -6,10 +6,25 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>开车保运管理</title>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow {
background-color: yellow;
background-image: none;
}
.f-grid-row.red {
background-color: red;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1"/>
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<Items>
@ -21,6 +36,8 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位名称" LabelAlign="Right" LabelWidth="130px" Width="400px"></f:DropDownList>
<f:DropDownList ID="drpStatus" runat="server" Label="实施状态" LabelAlign="Right" LabelWidth="100px"></f:DropDownList>
<f:DropDownList ID="drpPriority" runat="server" Label="优先级" LabelAlign="Right" LabelWidth="100px"></f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
</f:Button>
@ -44,7 +61,7 @@
FieldType="String" HeaderText="内容" HeaderTextAlign="Center" Width="300px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField ColumnID="Objective" DataField="Objective"
FieldType="String" HeaderText="目的" HeaderTextAlign="Center" Width="200px" >
FieldType="String" HeaderText="目的" HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="NeedCompletedDate" DataField="NeedCompletedDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="需完成时间" TextAlign="Center" HeaderTextAlign="Center">
@ -52,6 +69,12 @@
<f:RenderField Width="120px" ColumnID="RealCompletedDate" DataField="RealCompletedDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实际完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status"
FieldType="String" HeaderText="实施状态" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="Priority" DataField="Priority"
FieldType="String" HeaderText="优先级" HeaderTextAlign="Center" Width="80px">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="150px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
@ -88,7 +111,7 @@
</f:Panel>
<f:Window ID="Window1" Title="开车保运管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="620px">
Width="900px" Height="650px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"

View File

@ -18,6 +18,24 @@ namespace FineUIPro.Web.TestRun.DriverRun
BindGrid();
btnNew.OnClientClick = Window1.GetShowReference("DriverRunEdit.aspx") + "return false;";
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
ListItem[] list1 = new ListItem[3];
list1[0] = new ListItem("未开始", "1");
list1[1] = new ListItem("进行中", "2");
list1[2] = new ListItem("已完成", "3");
this.drpStatus.DataTextField = "Text";
this.drpStatus.DataValueField = "Value";
this.drpStatus.DataSource = list1;
this.drpStatus.DataBind();
Funs.FineUIPleaseSelect(this.drpStatus);
ListItem[] list2 = new ListItem[3];
list2[0] = new ListItem("低", "1");
list2[1] = new ListItem("中", "2");
list2[2] = new ListItem("高", "3");
this.drpPriority.DataTextField = "Text";
this.drpPriority.DataValueField = "Value";
this.drpPriority.DataSource = list2;
this.drpPriority.DataBind();
Funs.FineUIPleaseSelect(this.drpPriority);
}
}
#endregion
@ -39,6 +57,8 @@ namespace FineUIPro.Web.TestRun.DriverRun
driverRun.Objective,
driverRun.NeedCompletedDate,
driverRun.RealCompletedDate,
case driverRun.Status when '1' then '' when '2' then '' when '3' then '' else '' end as Status,
case driverRun.Priority when '1' then '低' when '2' then '中' when '3' then '高' else '' end as Priority,
driverRun.Remark,
Unit.UnitName AS UnitName"
+ @" FROM DriverRun_DriverRun AS driverRun"
@ -50,6 +70,16 @@ namespace FineUIPro.Web.TestRun.DriverRun
strSql += " AND driverRun.UnitId=@unitId";
listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
}
if (!string.IsNullOrEmpty(this.drpStatus.SelectedValue) && this.drpStatus.SelectedValue != BLL.Const._Null)
{
strSql += " AND driverRun.Status=@Status";
listStr.Add(new SqlParameter("@Status", this.drpStatus.SelectedValue));
}
if (!string.IsNullOrEmpty(this.drpPriority.SelectedValue) && this.drpPriority.SelectedValue != BLL.Const._Null)
{
strSql += " AND driverRun.Priority=@Priority";
listStr.Add(new SqlParameter("@Priority", this.drpPriority.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@ -57,6 +87,21 @@ namespace FineUIPro.Web.TestRun.DriverRun
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
Model.DriverRun_DriverRun driverRun = BLL.DriverRunService.GetDriverRunById(Grid1.Rows[i].DataKeys[0].ToString());
if (driverRun != null)
{
if (driverRun.Priority == "2")
{
Grid1.Rows[i].RowCssClass = "yellow";
}
else if (driverRun.Priority == "3")
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
}
#endregion

View File

@ -66,6 +66,24 @@ namespace FineUIPro.Web.TestRun.DriverRun {
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStatus;
/// <summary>
/// drpPriority 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPriority;
/// <summary>
/// btnSearch 控件。
/// </summary>

View File

@ -64,6 +64,12 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpStatus" runat="server" Label="实施状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true"></f:DropDownList>
<f:DropDownList ID="drpPriority" runat="server" Label="优先级" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtNeedCompletedDate" ShowRedStar="true" runat="server" Label="需完成时间" LabelWidth="150px" Required="true" LabelAlign="Right"
@ -74,7 +80,7 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow runat="server" Hidden="true">
<f:FormRow runat="server">
<Items>
<f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>

View File

@ -31,6 +31,24 @@ namespace FineUIPro.Web.TestRun.DriverRun
if (!IsPostBack)
{
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
ListItem[] list1 = new ListItem[3];
list1[0]= new ListItem("未开始","1");
list1[1] = new ListItem("进行中", "2");
list1[2] = new ListItem("已完成", "3");
this.drpStatus.DataTextField = "Text";
this.drpStatus.DataValueField = "Value";
this.drpStatus.DataSource = list1;
this.drpStatus.DataBind();
Funs.FineUIPleaseSelect(this.drpStatus);
ListItem[] list2 = new ListItem[3];
list2[0] = new ListItem("低", "1");
list2[1] = new ListItem("中", "2");
list2[2] = new ListItem("高", "3");
this.drpPriority.DataTextField = "Text";
this.drpPriority.DataValueField = "Value";
this.drpPriority.DataSource = list2;
this.drpPriority.DataBind();
Funs.FineUIPleaseSelect(this.drpPriority);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, true);
plApprove1.Hidden = true;
plApprove2.Hidden = true;
@ -63,6 +81,14 @@ namespace FineUIPro.Web.TestRun.DriverRun
{
this.txtRealCompletedDate.Text = string.Format("{0:yyyy-MM-dd}", data.RealCompletedDate);
}
if (!string.IsNullOrEmpty(data.Status))
{
this.drpStatus.SelectedValue = data.Status;
}
if (!string.IsNullOrEmpty(data.Priority))
{
this.drpPriority.SelectedValue = data.Priority;
}
if (!string.IsNullOrEmpty(data.State))
{
State = data.State;
@ -167,6 +193,16 @@ namespace FineUIPro.Web.TestRun.DriverRun
Alert.ShowInTop("请选择区域!", MessageBoxIcon.Warning);
return;
}
if (this.drpStatus.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择实施状态!", MessageBoxIcon.Warning);
return;
}
if (this.drpPriority.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择优先级!", MessageBoxIcon.Warning);
return;
}
if (State == BLL.Const.DriverRun_Audit4 && string.IsNullOrEmpty(this.txtRealCompletedDate.Text.Trim()))
{
Alert.ShowInTop("请选择实际完成时间!", MessageBoxIcon.Warning);
@ -189,6 +225,16 @@ namespace FineUIPro.Web.TestRun.DriverRun
Alert.ShowInTop("请选择区域!", MessageBoxIcon.Warning);
return;
}
if (this.drpStatus.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择实施状态!", MessageBoxIcon.Warning);
return;
}
if (this.drpPriority.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择优先级!", MessageBoxIcon.Warning);
return;
}
if (State == BLL.Const.DriverRun_Audit4 && string.IsNullOrEmpty(this.txtRealCompletedDate.Text.Trim()))
{
Alert.ShowInTop("请选择实际完成时间!", MessageBoxIcon.Warning);
@ -227,6 +273,14 @@ namespace FineUIPro.Web.TestRun.DriverRun
}
newData.Descriptions = this.txtDescriptions.Text.Trim();
newData.Objective = this.txtObjective.Text.Trim();
if (this.drpStatus.SelectedValue != BLL.Const._Null)
{
newData.Status = this.drpStatus.SelectedValue;
}
if (this.drpPriority.SelectedValue != BLL.Const._Null)
{
newData.Priority = this.drpPriority.SelectedValue;
}
newData.NeedCompletedDate = Funs.GetNewDateTime(this.txtNeedCompletedDate.Text.Trim());
newData.ProjectId = this.CurrUser.LoginProjectId;
newData.RealCompletedDate = Funs.GetNewDateTime(this.txtRealCompletedDate.Text.Trim());

View File

@ -156,6 +156,24 @@ namespace FineUIPro.Web.TestRun.DriverRun {
/// </remarks>
protected global::FineUIPro.TextArea txtObjective;
/// <summary>
/// drpStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStatus;
/// <summary>
/// drpPriority 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPriority;
/// <summary>
/// txtNeedCompletedDate 控件。
/// </summary>

View File

@ -60,6 +60,12 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpStatus" runat="server" Label="实施状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" Readonly="true"></f:DropDownList>
<f:DropDownList ID="drpPriority" runat="server" Label="优先级" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" Readonly="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtNeedCompletedDate" ShowRedStar="true" runat="server" Label="需完成时间" Readonly="true" LabelWidth="150px" Required="true" LabelAlign="Right"
@ -70,7 +76,7 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow runat="server" Hidden="true">
<f:FormRow runat="server">
<Items>
<f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>

View File

@ -31,6 +31,24 @@ namespace FineUIPro.Web.TestRun.DriverRun
if (!IsPostBack)
{
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
ListItem[] list1 = new ListItem[3];
list1[0] = new ListItem("未开始", "1");
list1[1] = new ListItem("进行中", "2");
list1[2] = new ListItem("已完成", "3");
this.drpStatus.DataTextField = "Text";
this.drpStatus.DataValueField = "Value";
this.drpStatus.DataSource = list1;
this.drpStatus.DataBind();
Funs.FineUIPleaseSelect(this.drpStatus);
ListItem[] list2 = new ListItem[3];
list2[0] = new ListItem("低", "1");
list2[1] = new ListItem("中", "2");
list2[2] = new ListItem("高", "3");
this.drpPriority.DataTextField = "Text";
this.drpPriority.DataValueField = "Value";
this.drpPriority.DataSource = list2;
this.drpPriority.DataBind();
Funs.FineUIPleaseSelect(this.drpPriority);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, true);
string id = Request.Params["id"];
if (!string.IsNullOrEmpty(id))
@ -58,6 +76,14 @@ namespace FineUIPro.Web.TestRun.DriverRun
{
this.txtRealCompletedDate.Text = string.Format("{0:yyyy-MM-dd}", data.RealCompletedDate);
}
if (!string.IsNullOrEmpty(data.Status))
{
this.drpStatus.SelectedValue = data.Status;
}
if (!string.IsNullOrEmpty(data.Priority))
{
this.drpPriority.SelectedValue = data.Priority;
}
if (!string.IsNullOrEmpty(data.State))
{
State = data.State;

View File

@ -138,6 +138,24 @@ namespace FineUIPro.Web.TestRun.DriverRun {
/// </remarks>
protected global::FineUIPro.TextArea txtObjective;
/// <summary>
/// drpStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStatus;
/// <summary>
/// drpPriority 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPriority;
/// <summary>
/// txtNeedCompletedDate 控件。
/// </summary>

View File

@ -55,15 +55,15 @@
</f:RenderField>
<f:RenderField ColumnID="UnitName" DataField="UnitName" Width="160px"
FieldType="String" HeaderText="施工单位" TextAlign="Center"
FieldType="String" HeaderText="编制单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="UnitWorkIds" Width="120px" DataField="UnitWorkIds"
FieldType="String" HeaderText="单位工程" TextAlign="Center"
FieldType="String" HeaderText="装置" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="CNProfessionalCodes" DataField="CNProfessionalCodes"
FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField Width="70px" ColumnID="System" DataField="System"
FieldType="String" HeaderText="系统" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<%--<f:TemplateField ColumnID="SolutionTempleteTypeName" Width="120px" HeaderText="方案类别" HeaderTextAlign="Center" TextAlign="Center"

View File

@ -100,7 +100,7 @@ namespace FineUIPro.Web.TestRun
{
string strSql = @"SELECT chec.ConstructSolutionId,chec.ProjectId,chec.UnitId,chec.UnitWorkIds,chec.CNProfessionalCodes,"
+ @" chec.CompileMan,chec.CompileDate,chec.code,chec.state,chec.SolutionType,chec.SolutionName,"
+ @" unit.UnitName,u.userName as CompileManName,chec.SpecialSchemeTypeId,"
+ @" unit.UnitName,u.userName as CompileManName,chec.SpecialSchemeTypeId,chec.System,"
+ @" t.SpecialSchemeTypeName"
+ @" FROM Solution_TestRunConstructSolution chec "
+ @" left join Base_Unit unit on unit.unitId=chec.UnitId "
@ -113,30 +113,43 @@ namespace FineUIPro.Web.TestRun
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var CNProfessional = CNProfessionalService.GetList();
var uniWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
if (tb.Rows.Count > 0)
{
for (int i = 0; i < tb.Rows.Count; i++)
{
if (tb.Rows[i]["CNProfessionalCodes"] != null)
{
var code = tb.Rows[i]["CNProfessionalCodes"].ToString().Split(',');
var listf = CNProfessional.Where(p => code.Contains(p.CNProfessionalId)).Select(p => p.ProfessionalName).ToArray();
tb.Rows[i]["CNProfessionalCodes"] = string.Join(",", listf);
}
if (tb.Rows[i]["UnitWorkIds"] != null)
{
var code = tb.Rows[i]["UnitWorkIds"].ToString().Split(',');
var workid = uniWork.Where(p => code.Contains(p.UnitWorkId)).Select(p => p.UnitWorkName + BLL.UnitWorkService.GetProjectType(p.ProjectType)).ToArray();
tb.Rows[i]["UnitWorkIds"] = string.Join(",", workid);
}
}
}
//var CNProfessional = CNProfessionalService.GetList();
//var uniWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
//if (tb.Rows.Count > 0)
//{
// for (int i = 0; i < tb.Rows.Count; i++)
// {
// if (tb.Rows[i]["CNProfessionalCodes"] != null)
// {
// var code = tb.Rows[i]["CNProfessionalCodes"].ToString().Split(',');
// var listf = CNProfessional.Where(p => code.Contains(p.CNProfessionalId)).Select(p => p.ProfessionalName).ToArray();
// tb.Rows[i]["CNProfessionalCodes"] = string.Join(",", listf);
// }
// if (tb.Rows[i]["UnitWorkIds"] != null)
// {
// var code = tb.Rows[i]["UnitWorkIds"].ToString().Split(',');
// var workid = uniWork.Where(p => code.Contains(p.UnitWorkId)).Select(p => p.UnitWorkName + BLL.UnitWorkService.GetProjectType(p.ProjectType)).ToArray();
// tb.Rows[i]["UnitWorkIds"] = string.Join(",", workid);
// }
// }
//}
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
if (this.tvDataTypeInit.SelectedNodeID.Length > 1)
{
if (this.tvDataTypeInit.SelectedNodeID == "12")
{
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = true;
}
else
{
this.Grid1.Columns[4].Hidden = false;
this.Grid1.Columns[5].Hidden = false;
}
}
}
#endregion
@ -257,7 +270,7 @@ namespace FineUIPro.Web.TestRun
Model.Solution_TestRunConstructSolution constructSolution = TestRunConstructSolutionService.GetConstructSolutionByConstructSolutionId(id);
if (constructSolution.State == Const.TestRunConstructSolution_Complete)
{
Alert.ShowInTop("该方案已经审批完成,无法操作,请右键查看!", MessageBoxIcon.Warning);
Alert.ShowInTop("该方案已经发布,无法操作,请右键查看!", MessageBoxIcon.Warning);
return;
}
else if (constructSolution.State == Const.TestRunConstructSolution_Compile)
@ -273,7 +286,7 @@ namespace FineUIPro.Web.TestRun
return;
}
}
else if (constructSolution.State == Const.TestRunConstructSolution_Audit || constructSolution.State == Const.TestRunConstructSolution_ReCompile)
else if (constructSolution.State == Const.TestRunConstructSolution_Audit || constructSolution.State == Const.TestRunConstructSolution_ReCompile || constructSolution.State == Const.TestRunConstructSolution_Audit2)
{
var approve = TestRunConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
if (approve != null && approve.ApproveMan == this.CurrUser.UserId)

View File

@ -0,0 +1,72 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSchemeChart.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSchemeChart" %>
<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
<f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
<Rows>
<f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
<Items>
<f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至" Width="5px">
</f:Label>
<f:DatePicker ID="txtEndTime" runat="server">
</f:DatePicker>
<f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
<f:ListItem Value="Column" Text="柱形图"></f:ListItem>
<f:ListItem Value="Line" Text="折线图"></f:ListItem>
<f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
<f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
<f:ListItem Value="Spline" Text="样条图"></f:ListItem>
<f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
<f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
<f:ListItem Value="Stock" Text="股价图"></f:ListItem>
<f:ListItem Value="Radar" Text="雷达图"></f:ListItem>
</f:DropDownList>
<f:CheckBox ID="ckbShow" runat="server" LabelWidth="80px" Label="三维效果" AutoPostBack="true"
OnCheckedChanged="ckbShow_CheckedChanged" Width="110px">
</f:CheckBox>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab2" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="图形">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
<div id="divAccidentTime">
<uc1:ChartControl ID="ChartAccidentTime" runat="server" />
</div>
</f:ContentPanel>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</form>
</body>
</html>

View File

@ -0,0 +1,128 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using BLL;
namespace FineUIPro.Web.TestRun
{
public partial class DriverSchemeChart : PageBase
{
#region
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
}
}
#endregion
#region
/// <summary>
/// 统计分析
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
this.AnalyseData();
}
/// <summary>
/// 统计方法
/// </summary>
private void AnalyseData()
{
var forms = from x in Funs.DB.Solution_TestRunConstructSolution
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
{
forms = forms.Where(x => x.CompileDate >= Funs.GetNewDateTime(this.txtStartTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
forms = forms.Where(x => x.CompileDate <= Funs.GetNewDateTime(this.txtEndTime.Text.Trim()));
}
#region
if (this.drpChartType.SelectedValue != "Pie") //非饼形图
{
DataTable dtTime = new DataTable();
dtTime.Columns.Add("状态", typeof(string));
dtTime.Columns.Add("数量", typeof(string));
DataRow rowTime1 = dtTime.NewRow();
rowTime1["状态"] = "编制";
rowTime1["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Compile).Count();
dtTime.Rows.Add(rowTime1);
DataRow rowTime2 = dtTime.NewRow();
rowTime2["状态"] = "审核";
rowTime2["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Audit).Count();
dtTime.Rows.Add(rowTime2);
DataRow rowTime3 = dtTime.NewRow();
rowTime3["状态"] = "审批";
rowTime3["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Audit2).Count();
dtTime.Rows.Add(rowTime3);
DataRow rowTime4 = dtTime.NewRow();
rowTime4["状态"] = "发布";
rowTime4["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Complete).Count();
dtTime.Rows.Add(rowTime4);
DataRow rowTime5 = dtTime.NewRow();
rowTime5["状态"] = "重报";
rowTime5["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_ReCompile).Count();
dtTime.Rows.Add(rowTime5);
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "试车方案统计", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
else //饼形图
{
DataTable dtTime = new DataTable();
dtTime.Columns.Add("状态", typeof(string));
dtTime.Columns.Add("数量", typeof(string));
DataRow rowTime1 = dtTime.NewRow();
rowTime1["状态"] = "编制";
rowTime1["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Compile).Count();
dtTime.Rows.Add(rowTime1);
DataRow rowTime2 = dtTime.NewRow();
rowTime2["状态"] = "审核";
rowTime2["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Audit).Count();
dtTime.Rows.Add(rowTime2);
DataRow rowTime3 = dtTime.NewRow();
rowTime3["状态"] = "审批";
rowTime3["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Audit2).Count();
dtTime.Rows.Add(rowTime3);
DataRow rowTime4 = dtTime.NewRow();
rowTime4["状态"] = "发布";
rowTime4["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_Complete).Count();
dtTime.Rows.Add(rowTime4);
DataRow rowTime5 = dtTime.NewRow();
rowTime5["状态"] = "重报";
rowTime5["数量"] = forms.Where(x => x.State == Const.TestRunConstructSolution_ReCompile).Count();
dtTime.Rows.Add(rowTime5);
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "试车方案统计", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
#endregion
}
#endregion
#region
/// <summary>
/// 图形变换
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
{
this.AnalyseData();
}
protected void ckbShow_CheckedChanged(object sender, CheckedEventArgs e)
{
this.AnalyseData();
}
#endregion
}
}

View File

@ -0,0 +1,150 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun {
public partial class DriverSchemeChart {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// drpChartType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpChartType;
/// <summary>
/// ckbShow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbShow;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Tab2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab2;
/// <summary>
/// cpAccidentTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel cpAccidentTime;
/// <summary>
/// ChartAccidentTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartAccidentTime;
}
}

View File

@ -36,7 +36,7 @@
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel2" Title="施工方案" ShowBorder="true"
<f:ContentPanel ID="ContentPanel2" Title="试车方案" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
@ -58,54 +58,21 @@
<f:FormRow ColumnWidths="25% 25% 25% 25%">
<Items>
<f:DropDownList ID="drpUnit" ShowRedStar="true" LabelWidth="120px"
runat="server" Required="true" Label="施工单位" EmptyText="--请选择--" AutoSelectFirstItem="false" LabelAlign="Right" EnableEdit="true">
runat="server" Required="true" Label="编制单位" EmptyText="--请选择--" AutoSelectFirstItem="false" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:Label runat="server" ID="txtSolutionType" Label="方案类别" LabelWidth="120px" LabelAlign="Right"></f:Label>
<f:DropDownBox runat="server" Label="单位工程" ShowRedStar="true" LabelWidth="120px"
Required="true" ID="txtUnitWork" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="gvUnitWork" DataIDField="UnitWorkId" DataTextField="UnitWorkName" DataKeyNames="UnitWorkId"
EnableMultiSelect="true" KeepCurrentSelection="true" Height="300px" Hidden="true"
ShowBorder="true" ShowHeader="false" ForceFit="true"
runat="server" EnableCheckBoxSelect="true">
<Columns>
<f:BoundField Width="100px" DataField="UnitWorkId" SortField="UnitWorkId" DataFormatString="{0}" Hidden="true" />
<f:BoundField Width="100px" DataField="UnitWorkName" SortField="UnitWorkName" DataFormatString="{0}"
HeaderText="工程名称" />
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>
<f:DropDownList ID="drpSpecialType" EmptyText="--请选择--" AutoSelectFirstItem="false" ShowRedStar="true" runat="server" Width="350px" Label="分部分项工程" LabelAlign="Right" EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
<f:TextBox ID="txtCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
</f:TextBox>
<f:NumberBox ID="txtEdition" Label="版次" runat="server" NoDecimal="true" Readonly="true" NoNegative="true" ShowRedStar="true" MaxLength="3" Required="true" LabelWidth="120px">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 25%">
<Items>
<f:TextBox ID="txtCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
<f:TextBox ID="txtUnitWork" runat="server" Label="装置" LabelAlign="Right" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtSystem" runat="server" Label="系统" LabelAlign="Right" LabelWidth="120px">
</f:TextBox>
<f:NumberBox ID="txtEdition" Label="版次" runat="server" NoDecimal="true" Readonly="true" NoNegative="true" ShowRedStar="true" MaxLength="3" Required="true" LabelWidth="120px">
</f:NumberBox>
<f:DropDownBox runat="server" Label="专业" ShowRedStar="true" Required="true" ID="txtCNProfessional" EmptyText="--请选择--" DataControlID="txtCNProfessional" EnableMultiSelect="true" MatchFieldWidth="true" LabelWidth="120px">
<PopPanel>
<f:Grid ID="gvCNPro" BoxFlex="1"
DataIDField="CNProfessionalId" DataTextField="ProfessionalName" EnableMultiSelect="true" KeepCurrentSelection="true"
ShowBorder="true" ShowHeader="false" ForceFit="true"
runat="server" EnableCheckBoxSelect="true" DataKeyNames="CNProfessionalId" Hidden="true">
<Columns>
<%--<f:RowNumberField />--%>
<f:BoundField Width="100px" DataField="CNProfessionalId" SortField="CNProfessionalId" DataFormatString="{0}" Hidden="true" />
<f:BoundField Width="100px" DataField="ProfessionalName" SortField="ProfessionalName" DataFormatString="{0}"
HeaderText="名称" />
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtCompileDate" ShowRedStar="true" Required="true" runat="server" Label="编制时间" LabelAlign="Right" EnableEdit="true" LabelWidth="120px">
</f:DatePicker>
</Items>
@ -148,81 +115,34 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="总包会签人员" Readonly="True" Enabled="False"/>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" AutoScroll="true" ShowBorder="true"
Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
<Items>
<f:Panel ID="Panel1" Title="Panel1" Width="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Height="200px">
<Items>
<f:Tree runat="server" ID="trOne" ShowHeader="false" AutoScroll="true" ShowBorder="false" OnNodeCheck="trOne_NodeCheck" EnableArrows="true">
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Hidden="True">
<Items>
<f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false" OnNodeCheck="trThree_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFive_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow ID="agree">
<Items>
<f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true">
<f:RadioItem Text="同意" Value="true" Selected="true" />
<f:RadioItem Text="不同意" Value="false" />
</f:RadioButtonList>
<f:Label runat="server" CssStyle="display:none"></f:Label>
<f:ContentPanel ID="ContentPanel5" Title="试车方案审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"
BodyPadding="0px">
<f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="rblIsAgree_SelectedIndexChanged">
<f:RadioItem Text="同意" Value="true" Selected="true" />
<f:RadioItem Text="不同意" Value="false" />
</f:RadioButtonList>
<f:Label runat="server" CssStyle="display:none"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" Readonly="true"
AutoPostBack="true" runat="server" Label="办理步骤" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpHandleMan" runat="server" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow ID="options">
@ -251,7 +171,7 @@
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
DataKeyNames="ConstructSolutionApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="ConstructSolutionApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand">
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
@ -273,7 +193,7 @@
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
<f:BoundField Width="380px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" ExpandUnusedSpace="true" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
</Columns>
</f:Grid>

File diff suppressed because it is too large Load Diff

View File

@ -93,33 +93,6 @@ namespace FineUIPro.Web.TestRun {
/// </remarks>
protected global::FineUIPro.Label txtSolutionType;
/// <summary>
/// txtUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox txtUnitWork;
/// <summary>
/// gvUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvUnitWork;
/// <summary>
/// drpSpecialType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSpecialType;
/// <summary>
/// txtCode 控件。
/// </summary>
@ -139,22 +112,22 @@ namespace FineUIPro.Web.TestRun {
protected global::FineUIPro.NumberBox txtEdition;
/// <summary>
/// txtCNProfessional 控件。
/// txtUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox txtCNProfessional;
protected global::FineUIPro.TextBox txtUnitWork;
/// <summary>
/// gvCNPro 控件。
/// txtSystem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvCNPro;
protected global::FineUIPro.TextBox txtSystem;
/// <summary>
/// txtCompileDate 控件。
@ -193,85 +166,22 @@ namespace FineUIPro.Web.TestRun {
protected global::FineUIPro.HtmlEditor txtDocContent;
/// <summary>
/// txtCopyMan 控件。
/// ContentPanel5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCopyMan;
protected global::FineUIPro.ContentPanel ContentPanel5;
/// <summary>
/// Panel2 控件。
/// Form5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// trOne 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trOne;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// trThree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trThree;
/// <summary>
/// Panel6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// trFive 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trFive;
/// <summary>
/// agree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
protected global::FineUIPro.Form Form5;
/// <summary>
/// rblIsAgree 控件。
@ -282,6 +192,24 @@ namespace FineUIPro.Web.TestRun {
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
/// <summary>
/// drpHandleType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHandleType;
/// <summary>
/// drpHandleMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHandleMan;
/// <summary>
/// options 控件。
/// </summary>

View File

@ -35,7 +35,7 @@
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel2" Title="施工方案" ShowBorder="true"
<f:ContentPanel ID="ContentPanel2" Title="试车方案" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
@ -55,7 +55,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="drpUnit" runat="server" Readonly="true" Label="施工单位" LabelAlign="Right"
<f:TextBox ID="drpUnit" runat="server" Readonly="true" Label="编制单位" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtSolutionName" runat="server" ShowRedStar="true" Readonly="true" Required="true" Label="方案名称" LabelAlign="Right"
@ -63,7 +63,7 @@
</f:TextBox>
<%-- <f:DropDownList ID="drpUnit" ShowRedStar="true"
runat="server" Required="true" Label="施工单位" LabelAlign="Right" EnableEdit="true">
runat="server" Required="true" Label="编制单位" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpModelType" ShowRedStar="true" Required="true" runat="server" Width="350px" Label="方案类别" LabelAlign="Right" EnableEdit="true">
@ -79,7 +79,10 @@
<f:TextBox ID="drpModelType" runat="server" Readonly="true" Label="方案类别" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtSpecialType" runat="server" Readonly="true" Label="分部分项工程" LabelAlign="Right"
<f:TextBox ID="txtUnitWork" runat="server" Readonly="true" Label="装置" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtSystem" runat="server" Readonly="true" Label="系统" LabelAlign="Right"
MaxLength="50" LabelWidth="120px">
</f:TextBox>
@ -99,51 +102,6 @@
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCNProfessional" runat="server" Readonly="true" Label="专业" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<%-- <f:DropDownBox runat="server" Label="专业" ShowRedStar="true" Required="true" ID="txtCNProfessional" EmptyText="--请选择--" DataControlID="txtCNProfessional" EnableMultiSelect="true" MatchFieldWidth="true">
<PopPanel>
<f:Grid ID="gvCNPro" BoxFlex="1"
DataIDField="CNProfessionalCode" DataTextField="ProfessionalName" EnableMultiSelect="true" KeepCurrentSelection="true"
ShowBorder="true" ShowHeader="false"
runat="server" EnableCheckBoxSelect="true" DataKeyNames="CNProfessionalCode" Hidden="true">
<Columns>
<f:RowNumberField />
<f:BoundField Width="100px" DataField="CNProfessionalCode" SortField="CNProfessionalCode" DataFormatString="{0}" Hidden="true" />
<f:BoundField Width="100px" DataField="ProfessionalName" SortField="ProfessionalName" DataFormatString="{0}"
ExpandUnusedSpace="true" HeaderText="名称" />
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtUnitWork" runat="server" Readonly="true" Label="单位工程" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<%-- <f:DropDownBox runat="server" Label="单位工程" ShowRedStar="true"
Required="true" ID="txtUnitWork" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="gvUnitWork" DataIDField="UnitWorkId" DataTextField="UnitWorkName" DataKeyNames="UnitWorkId"
EnableMultiSelect="true" KeepCurrentSelection="true" Height="300px" Hidden="true"
ShowBorder="true" ShowHeader="false"
runat="server" EnableCheckBoxSelect="true">
<Columns>
<f:BoundField Width="100px" DataField="UnitWorkId" SortField="UnitWorkId" DataFormatString="{0}" Hidden="true" />
<f:BoundField Width="100px" DataField="UnitWorkName" SortField="UnitWorkName" DataFormatString="{0}"
ExpandUnusedSpace="true" HeaderText="工程名称" />
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>--%>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="500px" ShowBorder="true" TabPosition="Top"
@ -187,68 +145,6 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" AutoScroll="true" ShowBorder="true"
Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
<Items>
<f:Panel ID="Panel1" Title="Panel1" Width="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Height="200px">
<Items>
<f:Tree runat="server" ID="trOne" ShowHeader="false" AutoScroll="true" ShowBorder="false" EnableArrows="true">
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Hidden="True">
<Items>
<f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
<Items>
@ -256,7 +152,7 @@
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Grid ID="gvApprove" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
DataKeyNames="ConstructSolutionApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand" ForceFit="true">
DataKeyNames="ConstructSolutionApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand">
<Columns>
<f:RowNumberField Width="40px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField ColumnID="ApproveType" Width="150px" HeaderText="办理类型" HeaderTextAlign="Center" TextAlign="Center"
@ -278,7 +174,7 @@
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
<f:BoundField Width="380px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" ExpandUnusedSpace="true" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
</Columns>
</f:Grid>

View File

@ -48,10 +48,12 @@ namespace FineUIPro.Web.TestRun
{
drpModelType.Text = TestRunConstructSolutionService.ConvertSolutionType(constructSolution.SolutionType);
}
if (!string.IsNullOrEmpty(constructSolution.SpecialSchemeTypeId))
if (constructSolution.SolutionType == "12")
{
txtSpecialType.Text = BLL.SpecialSchemeTypeService.GetSpecialSchemeTypeById(constructSolution.SpecialSchemeTypeId).SpecialSchemeTypeName;
this.txtUnitWork.Hidden = true;
this.txtSystem.Hidden = true;
}
txtSystem.Text = constructSolution.System;
if (constructSolution.CompileDate != null)
{
txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructSolution.CompileDate);
@ -59,13 +61,9 @@ namespace FineUIPro.Web.TestRun
txtSolutionName.Text = constructSolution.SolutionName;
if (!string.IsNullOrWhiteSpace(constructSolution.UnitWorkIds))
{
txtUnitWork.Text = UnitWorkService.GetUnitWorkName(constructSolution.UnitWorkIds);
txtUnitWork.Text = constructSolution.UnitWorkIds;
}
if (!string.IsNullOrWhiteSpace(constructSolution.CNProfessionalCodes))
{
txtCNProfessional.Text = TestRunConstructSolutionService.GetProfessionalName(constructSolution.CNProfessionalCodes);
}
if (constructSolution.Edition != null)
{
txtEdition.Text = constructSolution.Edition.ToString();
@ -73,25 +71,7 @@ namespace FineUIPro.Web.TestRun
txtDocContent.Text = HttpUtility.HtmlDecode(constructSolution.Content);
bindApprove();
BindZYRole();
BindAQRole();
BindSGRole();
//BindXMRole();
var zyUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY");
if (zyUserIds.Count > 0)
{
SetCheck(trOne, zyUserIds);
}
var aqUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ");
if (aqUserIds.Count > 0)
{
SetCheck(trThree, aqUserIds);
}
var sgUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG");
if (sgUserIds.Count > 0)
{
SetCheck(trFive, sgUserIds);
}
//var xmUserIds = TestRunConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "XM");
//if (xmUserIds.Count > 0)
//{
@ -130,41 +110,6 @@ namespace FineUIPro.Web.TestRun
}
}
/// 加载角色树:动态加载
/// </summary>
private void BindZYRole()
{
TreeNode rootNode = new TreeNode();//定义根节点
rootNode.Text = "专业工程师";
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.EnableCheckEvent = true;
trOne.Nodes.Add(rootNode);
trOne.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where p.RoleId.Contains(Const.ZBCNEngineer)
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
select x;
//var ss = LINQToDataTable(userList);
foreach (var u in userList)
{
TreeNode Node = new TreeNode();
Node.Text = u.UserName;
Node.NodeID = u.UserId;
Node.EnableCheckEvent = true;
rootNode.Nodes.Add(Node);
}
}
}
/// <summary>
/// 判断是否有选择
/// </summary>
@ -187,67 +132,6 @@ namespace FineUIPro.Web.TestRun
return res;
}
private void BindAQRole()
{
TreeNode rootNode = new TreeNode();//定义根节点
rootNode.Text = "HSE组";
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.EnableCheckEvent = true;
trThree.Nodes.Add(rootNode);
trThree.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where (p.RoleId.Contains(Const.HSSEManager) || p.RoleId.Contains(Const.HSSEEngineer))
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
orderby x.UserCode
select x;
foreach (var u in userList)
{
TreeNode roleNode = new TreeNode();
roleNode.Text = u.UserName;
roleNode.NodeID = u.UserId;
rootNode.Nodes.Add(roleNode);
}
}
}
private void BindSGRole()
{
TreeNode rootNode = new TreeNode();//定义根节点
rootNode.Text = "施工经理";
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.EnableCheckEvent = true;
trFive.Nodes.Add(rootNode);
trFive.EnableCheckBox = true;
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where (p.RoleId.Contains(Const.ConstructionManager) || p.RoleId.Contains(Const.ConstructionAssistantManager))
&& y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
orderby x.UserCode
select x;
foreach (var u in userList)
{
TreeNode roleNode = new TreeNode();
roleNode.Text = u.UserName;
roleNode.NodeID = u.UserId;
rootNode.Nodes.Add(roleNode);
}
}
}
//private void BindXMRole()
//{

View File

@ -103,13 +103,22 @@ namespace FineUIPro.Web.TestRun {
protected global::FineUIPro.TextBox drpModelType;
/// <summary>
/// txtSpecialType 控件。
/// txtUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecialType;
protected global::FineUIPro.TextBox txtUnitWork;
/// <summary>
/// txtSystem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSystem;
/// <summary>
/// txtCompileDate 控件。
@ -129,24 +138,6 @@ namespace FineUIPro.Web.TestRun {
/// </remarks>
protected global::FineUIPro.NumberBox txtEdition;
/// <summary>
/// txtCNProfessional 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCNProfessional;
/// <summary>
/// txtUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitWork;
/// <summary>
/// TabStrip1 控件。
/// </summary>
@ -174,69 +165,6 @@ namespace FineUIPro.Web.TestRun {
/// </remarks>
protected global::FineUIPro.HtmlEditor txtDocContent;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// trOne 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trOne;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// trThree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trThree;
/// <summary>
/// Panel6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// trFive 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trFive;
/// <summary>
/// plApprove2 控件。
/// </summary>

View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

View File

@ -22,6 +22,7 @@
<TreeNode id="D4E9A4EB-6C5A-42B7-AB59-EB510FB020A3" Text="开车保运管理" NavigateUrl="TestRun/DriverRun/DriverRun.aspx"></TreeNode>
</TreeNode>
<TreeNode id="8EB88D36-5B13-4F41-8FE8-D66BCA08439D" Text="开车方案管理" NavigateUrl=""><TreeNode id="CAA63693-5D41-4018-9FF7-AAB311E6D8E0" Text="开车方案管理" NavigateUrl="TestRun/DriverScheme.aspx"></TreeNode>
<TreeNode id="94E11762-49CB-4116-9B28-6927BDC59D31" Text="开车方案统计" NavigateUrl="TestRun/DriverSchemeChart.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2BF9C16D-536F-4F89-AA59-49ED1A1A164C" Text="开车进度管理" NavigateUrl=""><TreeNode id="EE7E37CA-384F-41B3-BAEE-89CBD9954AB3" Text="预试车进度" NavigateUrl="TestRun/Report/PreRunSchedule.aspx"></TreeNode>
<TreeNode id="9ACDF513-BD63-48F5-BFA3-B9B1B7FA19E1" Text="试车进度" NavigateUrl="TestRun/Report/TestRunSchedule.aspx"></TreeNode>
@ -33,9 +34,8 @@
<TreeNode id="18F5914D-A5DF-44F9-BE04-9EA8908BA3C8" Text="施工开车交叉期间作业许可" NavigateUrl="TestRun/DriverHse/HseLicense.aspx"></TreeNode>
<TreeNode id="02866B09-CEB3-42E0-870C-B81187FB0079" Text="开车安全线路图" NavigateUrl="TestRun/DriverHse/RoadMap.aspx"></TreeNode>
</TreeNode>
<TreeNode id="CA46AEF2-D058-433B-BDE3-760015337ED4" Text="开车物资材料管理" NavigateUrl=""><TreeNode id="1C6B597D-0FB7-404A-8512-6FCD53EE2552" Text="开车物资计划" NavigateUrl="TestRun/DriverGoods/GoodsPlan.aspx"></TreeNode>
<TreeNode id="CA46AEF2-D058-433B-BDE3-760015337ED4" Text="开车物资材料管理" NavigateUrl=""><TreeNode id="1C6B597D-0FB7-404A-8512-6FCD53EE2552" Text="开车物资材料库" NavigateUrl="TestRun/DriverGoods/GoodsModel.aspx"></TreeNode>
<TreeNode id="1EC7978C-7800-45B2-9E80-3334644EF898" Text="开车物资请购管理" NavigateUrl="TestRun/DriverGoods/GoodsBuy.aspx"></TreeNode>
<TreeNode id="AACD667C-5481-425D-819C-3892168DF61E" Text="开车材料跟踪管理" NavigateUrl="TestRun/DriverGoods/MaterialTrace.aspx"></TreeNode>
</TreeNode>
<TreeNode id="AD6E08B6-5571-4FFB-BDBE-9E6811770BD6" Text="预试车管理" NavigateUrl=""><TreeNode id="5C07E135-C3AB-4CE4-97A2-C79970640272" Text="系统划分" NavigateUrl="TestRun/BeforeTestRun/DeviceRun.aspx"></TreeNode>
<TreeNode id="B4702BFB-8CEB-46AD-BDC0-751D146FE228" Text="工作包设置" NavigateUrl="TestRun/BeforeTestRun/SetWorkPackage.aspx"></TreeNode>
@ -45,12 +45,12 @@
<TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
<TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
<TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
<TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
<TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@ -68,9 +68,11 @@
<TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
<TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
<TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
<TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
<TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
<TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
<TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
<TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
<TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>

View File

@ -1,3 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
</TreeNode>
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
</TreeNode>
</Tree>

File diff suppressed because it is too large Load Diff