lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024-02-04 试车分包管理添加

This commit is contained in:
李鹏飞 2024-02-04 11:12:50 +08:00
parent fdbca52cf2
commit a43e2cde43
19 changed files with 602 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo Normal file
View File

Binary file not shown.

6
DataBase/版本日志/SGGLDB_WH_2024-02-04-lpf.sql Normal file
View File

@ -0,0 +1,6 @@
alter table DriverSub_DriverSub add DriverSubPlanId nvarchar(50);
go
alter table DriverSub_DriverSub add DriverSubContractorsId nvarchar(50);
go
alter table DriverSub_DriverSub add EvaluationData nvarchar(2000);

89
SGGL/BLL/TestRun/DriverSub/DriverSubService.cs
View File

@ -20,7 +20,17 @@ namespace BLL
{
return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubId == DriverSubId);
}
/// <summary>
/// 根据
/// </summary>
/// <param name="DriverSubPlanId"></param>
/// <param name="DriverSubContractorsId"></param>
/// <returns></returns>
public static Model.DriverSub_DriverSub GetDriverSubBySubPlanIdAndTractorsId(string DriverSubPlanId,
string DriverSubContractorsId)
{
return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId&& e.DriverSubContractorsId==DriverSubContractorsId);
}
/// <summary>
/// 添加开车分包管理信息
/// </summary>
@ -36,6 +46,9 @@ namespace BLL
newDriverSub.Instruction = DriverSub.Instruction;
newDriverSub.AttachUrl = DriverSub.AttachUrl;
newDriverSub.Remark = DriverSub.Remark;
newDriverSub.DriverSubPlanId= DriverSub.DriverSubPlanId;
newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
newDriverSub.EvaluationData = DriverSub.EvaluationData;
Funs.DB.DriverSub_DriverSub.InsertOnSubmit(newDriverSub);
Funs.DB.SubmitChanges();
}
@ -55,6 +68,9 @@ namespace BLL
newDriverSub.Instruction = DriverSub.Instruction;
newDriverSub.AttachUrl = DriverSub.AttachUrl;
newDriverSub.Remark = DriverSub.Remark;
newDriverSub.DriverSubPlanId = DriverSub.DriverSubPlanId;
newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
newDriverSub.EvaluationData = DriverSub.EvaluationData;
Funs.DB.SubmitChanges();
}
}
@ -76,5 +92,76 @@ namespace BLL
Funs.DB.SubmitChanges();
}
}
//DriverSubPlanId和DriverSubContractorsId 获取对象的EvaluationData信息，将json数据EvaluationData 转换成List<Model.DriverSubEvaluationData>
public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string DriverSubPlanId,
string DriverSubContractorsId)
{
List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
if (data != null)
{
list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.DriverSubEvaluationData>>(data.EvaluationData);
}
return list;
}
//将List<Model.DriverSubEvaluationData>转换成json数据
public static string GetDriverSubEvaluationDataJson(List<Model.DriverSubEvaluationData> list)
{
return Newtonsoft.Json.JsonConvert.SerializeObject(list);
}
//DriverSubPlanId和DriverSubContractorsId 删除数据
public static void DeleteDriverSubEvaluationData(string DriverSubPlanId, string DriverSubContractorsId)
{
Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
if (data != null)
{
data.EvaluationData = "";
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据DriverSubPlanId删除实体
/// </summary>
/// <param name="DriverSubPlanId"></param>
public static void DeleteDriverSubByDriverSubPlanId(string DriverSubPlanId)
{
var list = Funs.DB.DriverSub_DriverSub.Where(e => e.DriverSubPlanId == DriverSubPlanId).ToList();
//先删除对应附件
foreach (var item in list)
{
if (!string.IsNullOrEmpty(item.DriverSubId))
{
AttachFileService.DeleteAttachFile(Funs.RootPath, item.DriverSubId, Const.DriverSubMenuId);//删除附件
}
}
if (list.Count > 0)
{
Funs.DB.DriverSub_DriverSub.DeleteAllOnSubmit(list);
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 获取初始化数据List<Model.DriverSubEvaluationData>
/// </summary>
/// <returns></returns>
public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData()
{
List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
return list;
}
}
}

10
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1756,7 +1756,7 @@
<Content Include="TestRun\DriverSub\DriverSub.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContact.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContactEdit.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContactIn.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContactorIn.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContactorEdit.aspx" />
<Content Include="TestRun\DriverSub\DriverSubContactorList.aspx" />
<Content Include="TestRun\DriverSub\DriverSubEdit.aspx" />
@ -15823,12 +15823,12 @@
<Compile Include="TestRun\DriverSub\DriverSubContactEdit.aspx.designer.cs">
<DependentUpon>DriverSubContactEdit.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverSub\DriverSubContactIn.aspx.cs">
<DependentUpon>DriverSubContactIn.aspx</DependentUpon>
<Compile Include="TestRun\DriverSub\DriverSubContactorIn.aspx.cs">
<DependentUpon>DriverSubContactorIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TestRun\DriverSub\DriverSubContactIn.aspx.designer.cs">
<DependentUpon>DriverSubContactIn.aspx</DependentUpon>
<Compile Include="TestRun\DriverSub\DriverSubContactorIn.aspx.designer.cs">
<DependentUpon>DriverSubContactorIn.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\DriverSub\DriverSubContactorEdit.aspx.cs">
<DependentUpon>DriverSubContactorEdit.aspx</DependentUpon>

160
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx
View File

@ -8,95 +8,77 @@
<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="HBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车分包管理" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DriverSubId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSubId" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="130px" Width="400px"></f:DropDownList>
<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">
</f:RenderField>
<f:RenderField ColumnID="Implement" DataField="Implement"
FieldType="String" HeaderText="记录/报告/执行情况" HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="SubUnitName" DataField="SubUnitName"
FieldType="String" HeaderText="开车分包单位名称" HeaderTextAlign="Center" Width="250px">
</f:RenderField>
<f:RenderField ColumnID="Instruction" DataField="Instruction"
FieldType="String" HeaderText="情况说明" HeaderTextAlign="Center" Width="200px" ExpandUnusedSpace="true">
</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="80px" 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>
</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="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">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
<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="HBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车分包计划" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DriverSubPlanId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSubPlanId" AllowSorting="true" SortField="Code"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick" ForceFit="True" >
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="130px" Width="400px" Hidden="True"></f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click" Hidden="True">
</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" TextAlign="Center" Width="55px">
</f:RenderField>
<f:TemplateField HeaderText="开车分包类别" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetDriverSubName(Eval("DriverSubNames")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
--%>
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</Columns>
<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>
<f:Window ID="Window1" Title="开车分包情况" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1000px" Height="700px">
</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" Hidden="True">
<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">
</f:MenuButton>
</Items>
</f:Menu>--%>
</form>
</body>
</html>

100
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs
View File

@ -26,32 +26,51 @@ namespace FineUIPro.Web.TestRun.DriverSub
//加载列表
public void BindGrid()
{
string strSql = @"SELECT sub.DriverSubId,
sub.ProjectId,
sub.Code,
sub.SubUnitId,
sub.Implement,
sub.Instruction,
sub.AttachUrl,
sub.Remark,
Unit.UnitName AS SubUnitName"
+ @" FROM DriverSub_DriverSub AS sub"
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = sub.SubUnitId WHERE sub.ProjectId=@projectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.drpSubUnitId.SelectedValue) && this.drpSubUnitId.SelectedValue != BLL.Const._Null)
{
strSql += " AND sub.SubUnitId=@subUnitId";
listStr.Add(new SqlParameter("@subUnitId", this.drpSubUnitId.SelectedValue));
}
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);
var q = from x in Funs.DB.DriverSub_DriverSubContact
where x.ProjectId == this.CurrUser.LoginProjectId
select x.DriverSubPlanId;
var table = from x in Funs.DB.DriverSub_DriverSubPlan
where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId)
select new
{
x.DriverSubPlanId,
x.Code,
x.SubUnitId,
x.Introductions,
x.Achievement,
x.Cooperation,
x.InstallationIds,
x.InstallationNames,
x.AttachUrl,
x.Remark,
x.DriverSubNames,
};
table = table.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize);
Grid1.DataSource = table;
Grid1.DataBind();
}
public string GetDriverSubName(object str)
{
string strName = "";
if (str != null)
{
string[] strArr = str.ToString().Split(',');
foreach (string s in strArr)
{
foreach (System.Web.UI.WebControls.ListItem item in DropListService.drpDriverSubNameList())
{
if (item.Value == s)
{
strName += item.Text + ",";
}
}
}
}
return strName.TrimEnd(',');
}
#endregion
#region 分页
@ -125,6 +144,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
EditData();
}
/// <summary>
/// 编辑
/// </summary>
@ -135,7 +155,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?DriverSubPlanId={0}", Grid1.SelectedRowID, "编辑 - ")));
}
#endregion
@ -147,10 +167,10 @@ namespace FineUIPro.Web.TestRun.DriverSub
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var info = BLL.DriverSubService.GetDriverSubById(rowID);
var info = BLL.DriverSubPlanService.GetDriverSubPlanById(rowID);
if (info != null)
{
BLL.DriverSubService.DeleteDriverSub(rowID);
BLL.DriverSubPlanService.DeleteDriverSubPlanById(rowID);
}
}
BindGrid();
@ -170,7 +190,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
string id = Grid1.DataKeys[e.RowIndex][0].ToString();
if (e.CommandName == "AttachUrl")
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", id, BLL.Const.DriverSubMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSubPlan&menuId={1}", id, BLL.Const.DriverSubMenuId)));
}
}
#endregion
@ -184,19 +204,19 @@ namespace FineUIPro.Web.TestRun.DriverSub
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DriverSubMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
this.btnMenuModify.Hidden = false;
this.Grid1.EnableRowDoubleClickEvent = true;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
this.btnMenuDel.Hidden = false;
}
//if (buttonList.Contains(BLL.Const.BtnAdd))
//{
// this.btnNew.Hidden = false;
//}
//if (buttonList.Contains(BLL.Const.BtnModify))
//{
// this.btnMenuModify.Hidden = false;
// this.Grid1.EnableRowDoubleClickEvent = true;
//}
//if (buttonList.Contains(BLL.Const.BtnDelete))
//{
// this.btnMenuDel.Hidden = false;
//}
}
}
#endregion

72
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverSub {
public partial class DriverSub {
namespace FineUIPro.Web.TestRun.DriverSub
{
public partial class DriverSub
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpSubUnitId 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitId;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -83,7 +85,16 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -92,7 +103,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -101,7 +112,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -110,7 +121,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@ -128,32 +139,5 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </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;
}
}

9
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs
View File

@ -33,6 +33,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId)
select new
{
x.DriverSubPlanId,
x.Code,
x.SubUnitId,
@ -165,11 +166,9 @@ namespace FineUIPro.Web.TestRun.DriverSub
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var info = BLL.DriverSubContactService.GetDriverSubContactById(rowID);
if (info != null)
{
BLL.DriverSubContactService.DeleteDriverSubContactById(rowID);
}
BLL.DriverSubContactService.DeleteDriverSubContactByDriverSubPlanId(rowID);
BLL.DriverSubService.DeleteDriverSubByDriverSubPlanId(rowID); //删除分包管理打分信息
}
BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);

2
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx → SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactIn" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactorIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactorIn" %>
<!DOCTYPE html>

2
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.cs → SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.cs
View File

@ -11,7 +11,7 @@ using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.DriverSub
{
public partial class DriverSubContactIn : PageBase
public partial class DriverSubContactorIn : PageBase
{
public string ContractId
{

2
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.designer.cs → SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.designer.cs generated
View File

@ -11,7 +11,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
{
public partial class DriverSubContactIn
public partial class DriverSubContactorIn
{
/// <summary>

2
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs
View File

@ -250,7 +250,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
protected void btnImport_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactIn.aspx", "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactorIn.aspx", "编辑 - ")));
}
#endregion

123
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx
View File

@ -4,88 +4,75 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>开车分包管理</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
</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">
<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="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="False" Width="250px" Title="WBS目录"
ShowBorder="true" Layout="VBox" ShowHeader="False" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="650px" Title="开车分包商" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true" AutoScroll="True"
EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" >
</f:Tree>
</Items>
</f:Panel>
<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" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="Number" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
EnableColumnLines="true" DataIDField="Number" Height="450px">
<Columns>
<f:RenderField ColumnID="Number" DataField="Number" FieldType="String" Width="5px"
HeaderText="序号" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Matter" DataField="Matter" FieldType="String" Width="50px"
HeaderText="事项" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Grade" DataField="Grade" FieldType="String"
HeaderText="打分" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtGrade" runat="server"></f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" ValidateForms="SimpleForm1" Size="Medium"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
</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" 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:DropDownList ID="drpImplement" runat="server" Label="记录/报告/执行情况" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpImplement_SelectedIndexChanged"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCode" runat="server" Label="序号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInstruction" runat="server" Label="情况说明" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" 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">
<Items>
<f:Label ID="lblAttach" runat="server" Label="上传附件"
LabelWidth="150px">
</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:Panel>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
</body>
</html>

203
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs
View File

@ -1,10 +1,37 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
namespace FineUIPro.Web.TestRun.DriverSub
{
public partial class DriverSubEdit :PageBase
{
public string DriverSubPlanId {
get
{
return (string)ViewState["DriverSubPlanId"];
}
set
{
ViewState["DriverSubPlanId"] = value;
}
}
public string DriverSubId
{
get
{
return (string)ViewState["DriverSubId"];
}
set
{
ViewState["DriverSubId"] = value;
}
}
#region 加载
/// <summary>
/// 页面加载
@ -15,37 +42,76 @@ namespace FineUIPro.Web.TestRun.DriverSub
{
if (!IsPostBack)
{
BLL.UnitService.InitUnitDownList(this.drpSubUnitId, this.CurrUser.LoginProjectId, true);
this.drpImplement.DataTextField = "Text";
this.drpImplement.DataValueField = "Value";
this.drpImplement.DataSource = BLL.DropListService.drpImplementItemList();
this.drpImplement.DataBind();
Funs.FineUIPleaseSelect(this.drpImplement);
string id = Request.Params["id"];
if (!string.IsNullOrEmpty(id))
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
DriverSubPlanId = Request.Params["DriverSubPlanId"];
if (!string.IsNullOrEmpty(DriverSubPlanId))
{
Model.DriverSub_DriverSub data = BLL.DriverSubService.GetDriverSubById(id);
if (data != null)
{
this.hdId.Text = id;
this.txtCode.Text = data.Code;
if (!string.IsNullOrEmpty(data.SubUnitId))
{
this.drpSubUnitId.SelectedValue = data.SubUnitId;
}
if (!string.IsNullOrEmpty(data.Code))
{
this.drpImplement.SelectedValue = data.Code;
}
this.txtInstruction.Text = data.Instruction;
this.txtRemark.Text = data.Remark;
}
InitTreeMenu();
}
}
}
#endregion
void InitTreeMenu()
{
this.tvControlItem.Nodes.Clear();
var subPlanModel= DriverSubPlanService.GetDriverSubPlanById(DriverSubPlanId);
if (subPlanModel != null)
{
foreach (var item in subPlanModel.DriverSubNames.Split(','))
{
var name = DropListService.drpDriverSubNameList().Where(x => x.Value == item) .First().Text;
FineUIPro.TreeNode node = new FineUIPro.TreeNode();
node.NodeID = item;
node.Text = name;
node.CommandName = name;
node.Expanded = true;
this.tvControlItem.Nodes.Add(node);
BindNode(node, item);
}
}
}
void BindNode(TreeNode node,string type )
{
var SubContractorsList= DriverSubContactService.GetDriverSubContactByDriverSubPlanId(DriverSubPlanId)
.Where(x => x.SubcontractingType == type).Select(x => x.DriverSubContractorsId).ToArray();
foreach (var item in SubContractorsList)
{
string unitName= BLL.DriversubcontractorsService.GetDriverSub_DriverSubContractorsById(item).SubUnitName;
FineUIPro.TreeNode node1 = new FineUIPro.TreeNode();
node1.NodeID = item;
node1.Text = unitName;
node1.CommandName = node1.Text;
node1.EnableClickEvent=true;
node.Nodes.Add(node1);
}
}
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
var list= BLL.DriverSubService.GetDriverSubEvaluationData(DriverSubPlanId, tvControlItem.SelectedNodeID);
var model= BLL.DriverSubService.GetDriverSubBySubPlanIdAndTractorsId(DriverSubPlanId,tvControlItem.SelectedNodeID);
if (model!=null)
{
DriverSubId = model.DriverSubId;
}
else
{
DriverSubId = "";
}
if (list.Count>0 )
{
Grid1.DataSource = list;
Grid1.DataBind();
}
else
{
Grid1.DataSource = BLL.DriverSubService.GetDriverSubEvaluationData();
Grid1.DataBind();
}
}
#region 附件上传
/// <summary>
/// 附件上传
@ -54,11 +120,8 @@ namespace FineUIPro.Web.TestRun.DriverSub
/// <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.DriverSub_DriverSub));
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", this.hdId.Text, BLL.Const.DriverSubMenuId)));
Save();
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", DriverSubId, BLL.Const.DriverSubMenuId)));
}
#endregion
@ -70,65 +133,49 @@ namespace FineUIPro.Web.TestRun.DriverSub
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpImplement.SelectedValue==BLL.Const._Null)
Save();
tvControlItem_NodeCommand(null,null);
ShowNotify("保存成功！", MessageBoxIcon.Success);
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
void Save()
{
JArray EditorArr = Grid1.GetMergedData();
//JArray 转换成List<Model.DriverSubEvaluationData>
List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
foreach (JObject item in EditorArr)
{
Alert.ShowInTop("请选择开车分包单位！", MessageBoxIcon.Warning);
return;
Model.DriverSubEvaluationData data = new Model.DriverSubEvaluationData();
data.Number = Convert.ToInt32(item["values"]["Number"]);
data.Matter = item["values"]["Matter"].ToString();
data.Grade = item["values"]["Grade"].ToString();
list.Add(data);
}
if (this.drpSubUnitId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择记录/报告/执行情况！", MessageBoxIcon.Warning);
return;
}
string id = Request.Params["id"];
//list转换成json数据
string json = BLL.DriverSubService.GetDriverSubEvaluationDataJson(list);
Model.DriverSub_DriverSub newData = new Model.DriverSub_DriverSub();
newData.Code = this.txtCode.Text.Trim();
if (this.drpSubUnitId.SelectedValue != BLL.Const._Null)
{
newData.SubUnitId = this.drpSubUnitId.SelectedValue;
}
if (this.drpImplement.SelectedValue!=BLL.Const._Null)
{
newData.Implement = this.drpImplement.SelectedItem.Text;
}
newData.Instruction = this.txtInstruction.Text.Trim();
newData.Remark = this.txtRemark.Text.Trim();
newData.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(id))
newData.DriverSubPlanId = DriverSubPlanId;
newData.DriverSubContractorsId = tvControlItem.SelectedNodeID;
newData.EvaluationData = json;
if (string.IsNullOrEmpty(DriverSubId))
{
newData.DriverSubId = id;
BLL.DriverSubService.UpdateDriverSub(newData);
newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub));
DriverSubId= newData.DriverSubId;
DriverSubService.AddDriverSub(newData);
}
else
{
if (!string.IsNullOrEmpty(this.hdId.Text))
{
newData.DriverSubId = this.hdId.Text.Trim();
}
else
{
newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub));
this.hdId.Text = newData.DriverSubId;
}
BLL.DriverSubService.AddDriverSub(newData);
newData.DriverSubId = DriverSubId;
DriverSubService.UpdateDriverSub(newData);
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
#region DropDownList下拉选择事件
protected void drpImplement_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpImplement.SelectedValue == BLL.Const._Null)
{
this.txtCode.Text = string.Empty;
}
else
{
this.txtCode.Text = this.drpImplement.SelectedValue;
}
}
#endregion
}
}

162
SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.DriverSub {
public partial class DriverSubEdit {
namespace FineUIPro.Web.TestRun.DriverSub
{
public partial class DriverSubEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,142 +31,61 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Toolbar1 控件。
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ToolbarFill1 控件。
/// tvControlItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// btnSave 控件。
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// hdAttachUrl 控件。
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// hdId 控件。
/// txtGrade 控件。
/// </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>
/// drpImplement 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpImplement;
/// <summary>
/// txtCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCode;
/// <summary>
/// drpSubUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitId;
/// <summary>
/// txtInstruction 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtInstruction;
/// <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;
protected global::FineUIPro.TextBox txtGrade;
/// <summary>
/// btnAttach 控件。
/// </summary>
@ -173,7 +94,34 @@ namespace FineUIPro.Web.TestRun.DriverSub {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>

2
SGGL/FineUIPro.Web/Web.config
View File

@ -76,7 +76,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

88
SGGL/Model/Model.cs
View File

@ -128285,6 +128285,12 @@ namespace Model
private string _Remark;
private string _DriverSubPlanId;
private string _DriverSubContractorsId;
private string _EvaluationData;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -128309,6 +128315,12 @@ namespace Model
partial void OnAttachUrlChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnDriverSubPlanIdChanging(string value);
partial void OnDriverSubPlanIdChanged();
partial void OnDriverSubContractorsIdChanging(string value);
partial void OnDriverSubContractorsIdChanged();
partial void OnEvaluationDataChanging(string value);
partial void OnEvaluationDataChanged();
#endregion
public DriverSub_DriverSub()
@ -128486,6 +128498,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubPlanId", DbType="NVarChar(50)")]
public string DriverSubPlanId
{
get
{
return this._DriverSubPlanId;
}
set
{
if ((this._DriverSubPlanId != value))
{
this.OnDriverSubPlanIdChanging(value);
this.SendPropertyChanging();
this._DriverSubPlanId = value;
this.SendPropertyChanged("DriverSubPlanId");
this.OnDriverSubPlanIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubContractorsId", DbType="NVarChar(50)")]
public string DriverSubContractorsId
{
get
{
return this._DriverSubContractorsId;
}
set
{
if ((this._DriverSubContractorsId != value))
{
this.OnDriverSubContractorsIdChanging(value);
this.SendPropertyChanging();
this._DriverSubContractorsId = value;
this.SendPropertyChanged("DriverSubContractorsId");
this.OnDriverSubContractorsIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationData", DbType="NVarChar(2000)")]
public string EvaluationData
{
get
{
return this._EvaluationData;
}
set
{
if ((this._EvaluationData != value))
{
this.OnEvaluationDataChanging(value);
this.SendPropertyChanging();
this._EvaluationData = value;
this.SendPropertyChanged("EvaluationData");
this.OnEvaluationDataChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSub_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -129140,7 +129212,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(500)")]
public string SubUnitName
{
get
@ -129160,7 +129232,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(500)")]
public string EnterpriseNature
{
get
@ -129180,7 +129252,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(500)")]
public string SubcontractingType
{
get
@ -129200,7 +129272,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(500)")]
public string CollCropCode
{
get
@ -129220,7 +129292,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(500)")]
public string SafetyProductionLicense
{
get
@ -129240,7 +129312,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(500)")]
public string QualificationCertificateNumber
{
get
@ -129260,7 +129332,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(500)")]
public string QualificationType
{
get
@ -129280,7 +129352,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(500)")]
public string QualificationLevel
{
get

2
SGGL/Model/Model.csproj
View File

@ -218,12 +218,14 @@
<Compile Include="SpSysUserItem.cs" />
<Compile Include="APIItem\ResponeData.cs" />
<Compile Include="SpTDesktopItem.cs" />
<Compile Include="TestRun\DriverSub\DriverSubEvaluationData.cs" />
<Compile Include="TokenItem.cs" />
<Compile Include="ZHGL\DataSync\CQMSDataItem.cs" />
<Compile Include="ZHGL\DataSync\HJGLDataItem.cs" />
<Compile Include="ZHGL\DataSync\HSSEDataItem.cs" />
<Compile Include="ZHGL\DataSync\SYHSEDataItem.cs" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

18
SGGL/Model/TestRun/DriverSub/DriverSubEvaluationData.cs Normal file
View File

@ -0,0 +1,18 @@
namespace Model
{
public class DriverSubEvaluationData
{
/// <summary>
/// 序号
/// </summary>
public int Number { get; set; }
/// <summary>
/// 事项
/// </summary>
public string Matter { get; set; }
/// <summary>
/// 分数
/// </summary>
public string Grade { get; set; }
}
}