diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql new file mode 100644 index 00000000..61de85e9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql @@ -0,0 +1,89 @@ + + +--ؼȫ˵ +update Sys_Menu set SuperMenu='168A94C7-E37D-4B9C-8684-51DF4F8C5134',SortIndex=1,IsUsed=1,MenuName='ȫ' where MenuId='5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680'; +GO + +--2 +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'GJSX_detail' AND COLUMN_NAME = 'ProgressStatus') +BEGIN + ALTER TABLE GJSX_detail ADD ProgressStatus nvarchar(20); +END +GO + + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +ALTER PROCEDURE [dbo].[Sp_GJSX_getlist] + -- Add the parameters for the stored procedure here + @ProjectId nvarchar(max), + @sql_where varchar(max) +AS +BEGIN + IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List')) + BEGIN + DROP TABLE #GJSX_List + END + DECLARE @Sql NVARCHAR(max) + select * into #GJSX_List + from( + select + a.GJSXID + ,a.ProjectId + ,a.detail + ,b.username + ,a.createDate + ,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'') + , CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,Base_Project.ProjectName + ,Base_Unit.unitname + ,a.CloseDate + ,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state + ,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') + ,a.IsManypeople + ,a.CompleteDate + ,a.AttachUrl + ,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'') + from GJSX as a left join Sys_User as b on a.UserId=b.UserId + left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId + left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId + --left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID + --left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID + where a.ProjectId=@ProjectId + ) as a + + set @Sql ='select * from #GJSX_List where 1=1 ' +@sql_where + + exec(@Sql) + + + --select + --a.GJSXID + --,a.ProjectId + --,a.detail + --,b.username + --,a.createDate + --,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'') + --, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'') + --,Base_Project.ProjectName + --,Base_Unit.unitname + --,a.CloseDate + --,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state + --,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'') + --,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') + --,a.IsManypeople + --,a.CompleteDate + --,a.AttachUrl + --,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'') + --from GJSX as a left join Sys_User as b on a.UserId=b.UserId + --left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId + --left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId + ----left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID + ----left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID + --where a.ProjectId=@ProjectId +END +GO + diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs index c206c13c..cc17cf6c 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs @@ -1,4 +1,5 @@ -using System; +using Model; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -61,6 +62,7 @@ namespace BLL newGJSXMX.Date = gjsxmx.Date; newGJSXMX.Sort = gjsxmx.Sort; newGJSXMX.FilePath = gjsxmx.FilePath; + newGJSXMX.ProgressStatus = gjsxmx.ProgressStatus; db.GJSX_detail.InsertOnSubmit(newGJSXMX); db.SubmitChanges(); @@ -111,7 +113,8 @@ namespace BLL newGJSX_detail.Progress_detail = _GJSX_detail.Progress_detail; newGJSX_detail.Sort = _GJSX_detail.Sort; newGJSX_detail.FilePath = _GJSX_detail.FilePath; - + newGJSX_detail.ProgressStatus = newGJSX_detail.ProgressStatus; + db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx index 9524b60c..070d1263 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx @@ -19,7 +19,7 @@ - - --%> @@ -164,7 +163,7 @@ - @@ -199,21 +197,30 @@ - - - + + + + + + + + + @@ -225,6 +232,36 @@ + + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index 46319a18..4c3813fc 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -158,6 +158,7 @@ namespace FineUIPro.Web.PZHGL.GJSX //事项进展负责人 UserService.InitUserDropDownList(DropProgress_user, CurrUser.LoginProjectId, false, string.Empty); + //DropProgress_user.SelectedValue = this.CurrUser.UserId; ////下一接受人 //UserService.InitUserDropDownList(DropNextRecipient, CurrUser.LoginProjectId, false, string.Empty); @@ -228,7 +229,6 @@ namespace FineUIPro.Web.PZHGL.GJSX //if (tb != null && tb.Rows.Count > 0) //{ - if (!string.IsNullOrEmpty(gjsx.CsUsers)) { drpCsUsers.Values = gjsx.CsUsers.Split(','); @@ -317,16 +317,17 @@ namespace FineUIPro.Web.PZHGL.GJSX Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } else { if (EditType == "Edit" && state == "3" && !string.IsNullOrWhiteSpace(gjsx.ProgressStatus) && gjsx.ProgressStatus == "1")//gjsx.ProgressStatus.Trim() == "1" {//负责人申请关闭 - this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); - rowProgressStatus.Hidden = false; - rowCloseProgressCheck.Hidden = false; + //this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); + this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus; + //rowProgressStatus.Hidden = false; + ApproveForm.Hidden = false; } else { @@ -338,8 +339,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } if (state == "0") @@ -352,10 +353,11 @@ namespace FineUIPro.Web.PZHGL.GJSX {//如果当前登录人为责任人 if (state == "2") { - rowProgressStatus.Hidden = false; + //rowProgressStatus.Hidden = false; if (!string.IsNullOrWhiteSpace(gjsx.ProgressStatus)) { - this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); + //this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); + this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus; } Toolbar131.Hidden = false; @@ -366,8 +368,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } else { @@ -382,8 +384,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Progress_detail.Hidden = false; Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } } else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId)) @@ -391,8 +393,8 @@ namespace FineUIPro.Web.PZHGL.GJSX if (state == "0") { Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; Grid2Binging(); Button1.Hidden = true; } @@ -400,9 +402,10 @@ namespace FineUIPro.Web.PZHGL.GJSX { if (EditType == "Edit" && !string.IsNullOrWhiteSpace(gjsx.ProgressStatus) && gjsx.ProgressStatus == "1")//gjsx.ProgressStatus.Trim() == "1" {//负责人申请关闭 - this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); - rowProgressStatus.Hidden = false; - rowCloseProgressCheck.Hidden = false; + //this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus); + this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus; + //rowProgressStatus.Hidden = false; + ApproveForm.Hidden = false; } else { @@ -415,8 +418,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } else { @@ -446,8 +449,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Button1.Hidden = true; Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId) @@ -474,8 +477,8 @@ namespace FineUIPro.Web.PZHGL.GJSX Progress_detail.Hidden = false; Grid2Binging(); Grid2.AllColumns[0].Hidden = true; - Grid2.AllColumns[5].Hidden = true; - Grid2.AllColumns[6].Hidden = false; + Grid2.AllColumns[6].Hidden = true; + Grid2.AllColumns[7].Hidden = false; } } @@ -594,6 +597,8 @@ namespace FineUIPro.Web.PZHGL.GJSX { // 姓名 UpdateDataRow("Progress_detail", rowDict, rowData); + // 姓名 + UpdateDataRow("ProgressStatus", rowDict, rowData); } private DataRow FindRowByID(string rowID) @@ -628,6 +633,7 @@ namespace FineUIPro.Web.PZHGL.GJSX _Detail.Progress_user = Table.Rows[i]["Progress_user"].ToString(); _Detail.Date = DateTime.Parse(Table.Rows[i]["Date"].ToString()); _Detail.Progress_detail = Table.Rows[i]["Progress_detail"].ToString(); + _Detail.ProgressStatus = Table.Rows[i]["ProgressStatus"].ToString(); Model.GJSX_detail isExit_detail = BLL.GJSXItemService.GetGJSXMXById(_Detail.Cuid); @@ -635,7 +641,6 @@ namespace FineUIPro.Web.PZHGL.GJSX if (isExit_detail == null) { BLL.GJSXItemService.AddGJSXMX(_Detail); - } else { @@ -664,13 +669,14 @@ namespace FineUIPro.Web.PZHGL.GJSX gjsx.CompleteDate = DateTime.Parse(Date_CompleteDate.Text); gjsx.AttachUrl = ""; } - string progressStatus = this.rblProgressStatus.SelectedValue; - if (!string.IsNullOrWhiteSpace(progressStatus)) - { - //gjsx.ProgressStatus = state == "2" ? null : progressStatus; - gjsx.ProgressStatus = progressStatus; - } - + //string progressStatus = this.rblProgressStatus.SelectedValue; + //string progressStatus = this.ddlProgressStatus.SelectedValue; + //if (!string.IsNullOrWhiteSpace(progressStatus)) + //{ + // //gjsx.ProgressStatus = state == "2" ? null : progressStatus; + // gjsx.ProgressStatus = progressStatus; + //} + gjsx.ProgressStatus = state == "3" ? "1" : "0"; //抄送人 string sendUserIds = string.Empty; if (!string.IsNullOrEmpty(drpCsUsers.Value)) @@ -891,17 +897,19 @@ namespace FineUIPro.Web.PZHGL.GJSX if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) {//责任人的时候保存关键事项 //进展状态 - string progressStatus = this.rblProgressStatus.SelectedValue; - if (progressStatus == "0") - {//持续跟踪 - save("2"); - } - else if (progressStatus == "1") + //string progressStatus = this.rblProgressStatus.SelectedValue; + string progressStatus = string.Empty; + OperateComplianceObligationsCSort(ref progressStatus); + if (progressStatus == "申请关闭") {//申请关闭 save("3"); } + else if (progressStatus == "持续跟踪") + {//持续跟踪 + save("2"); + } + //save("3"); - OperateComplianceObligationsCSort(); } else if (gjsx.UserID.Contains(this.CurrUser.UserId) || gjsx.User_ReceiveID.Contains(this.CurrUser.UserId)) {//提出人、跟踪人审批责任人提出申请关闭请求 @@ -925,6 +933,7 @@ namespace FineUIPro.Web.PZHGL.GJSX Progress_detail = $"{(progressResult == "0" ? "同意" : "驳回")}申请关闭{(!string.IsNullOrWhiteSpace(progressReason) ? "：" : "")}{progressReason}", Date = DateTime.Now, Sort = GJSX_detail.Count, + ProgressStatus = "", }; GJSXItemService.AddGJSXMX(detail); } @@ -1157,12 +1166,20 @@ namespace FineUIPro.Web.PZHGL.GJSX #endregion #region 关键事项 + + /// + /// 关键事项 + /// + /// + /// protected void btnNew_Click(object sender, EventArgs e) { jerqueSaveComplianceObligationsCList(); Model.GJSX_detail complianceObligationsC = new Model.GJSX_detail { - Cuid = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove_Item)) + Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)), + Progress_user = this.CurrUser.UserId, + ProgressStatus = "持续跟踪" }; GJSX_detail.Add(complianceObligationsC); this.Grid2.DataSource = GJSX_detail; @@ -1202,7 +1219,7 @@ namespace FineUIPro.Web.PZHGL.GJSX /// /// 关键事项进展明细 /// - private void OperateComplianceObligationsCSort() + private void OperateComplianceObligationsCSort(ref string progressStatus) { var list = Funs.DB.GJSX_detail.Where(x => x.GJSXID == txtGJSXID.Text).ToList(); if (list.Count > 0) @@ -1211,25 +1228,29 @@ namespace FineUIPro.Web.PZHGL.GJSX Funs.DB.SubmitChanges(); } jerqueSaveComplianceObligationsCList(); + foreach (Model.GJSX_detail coc in GJSX_detail) { coc.GJSXID = txtGJSXID.Text; BLL.GJSXItemService.AddGJSXMX(coc); + progressStatus = coc.ProgressStatus;//== "持续跟踪" ? "0" : "1" + } - string progressStatus = this.rblProgressStatus.SelectedValue; - if (progressStatus == "1") - {//责任人申请关闭 - Model.GJSX_detail detail = new Model.GJSX_detail - { - Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)), - GJSXID = txtGJSXID.Text, - Progress_user = this.CurrUser.UserId, - Progress_detail = "申请关闭", - Date = DateTime.Now, - Sort = GJSX_detail.Count, - }; - GJSXItemService.AddGJSXMX(detail); - } + //string progressStatus = this.rblProgressStatus.SelectedValue; + //string progressStatus = this.ddlProgressStatus.SelectedValue; + //if (progressStatus == "1") + //{//责任人申请关闭 + // Model.GJSX_detail detail = new Model.GJSX_detail + // { + // Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)), + // GJSXID = txtGJSXID.Text, + // Progress_user = this.CurrUser.UserId, + // Progress_detail = "申请关闭", + // Date = DateTime.Now, + // Sort = GJSX_detail.Count, + // }; + // GJSXItemService.AddGJSXMX(detail); + //} } @@ -1247,6 +1268,7 @@ namespace FineUIPro.Web.PZHGL.GJSX Cuid = this.Grid2.Rows[i].DataKeys[0].ToString(), Progress_user = values.Value("Progress_user").ToString(), Progress_detail = values.Value("Progress_detail").ToString(), + ProgressStatus = values.Value("ProgressStatus").ToString(), Sort = i }; if (!string.IsNullOrEmpty(values.Value("Date").ToString())) diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs index cc630340..77309b1e 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs @@ -194,51 +194,6 @@ namespace FineUIPro.Web.PZHGL.GJSX /// protected global::FineUIPro.Button btnAttachUrl; - /// - /// rowProgressStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow rowProgressStatus; - - /// - /// rblProgressStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblProgressStatus; - - /// - /// rowCloseProgressCheck 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow rowCloseProgressCheck; - - /// - /// rblProgressResult 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblProgressResult; - - /// - /// txtProgressReason 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProgressReason; - /// /// Progress_detail 控件。 /// @@ -329,6 +284,42 @@ namespace FineUIPro.Web.PZHGL.GJSX /// protected global::FineUIPro.TextBox tbxEditorName; + /// + /// ddlProgressStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProgressStatus; + + /// + /// ApproveForm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form ApproveForm; + + /// + /// rblProgressResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblProgressResult; + + /// + /// txtProgressReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProgressReason; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml index d3beefd2..3499608b 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml @@ -1,8 +1,10 @@  - + + + diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx index 98ec808f..e0e6b76c 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx @@ -179,6 +179,15 @@
+
+
+
+
+
+
+
+
+
@@ -210,15 +219,6 @@
-
-
-
-
-
-
-
-
-
@@ -756,7 +756,7 @@ }, tooltip: {}, legend: { - data: ['关键事项超期平均时间'], + data: ['关键事项超期平均时间（单位：天）'], left: '3%', show: true, selectedMode: false, diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5ebcfeab..d07bf154 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -158378,6 +158378,8 @@ namespace Model private string _FilePath; + private string _ProgressStatus; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -158396,6 +158398,8 @@ namespace Model partial void OnSortChanged(); partial void OnFilePathChanging(string value); partial void OnFilePathChanged(); + partial void OnProgressStatusChanging(string value); + partial void OnProgressStatusChanged(); #endregion public GJSX_detail() @@ -158543,6 +158547,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProgressStatus", DbType="Char(1)")] + public string ProgressStatus + { + get + { + return this._ProgressStatus; + } + set + { + if ((this._ProgressStatus != value)) + { + this.OnProgressStatusChanging(value); + this.SendPropertyChanging(); + this._ProgressStatus = value; + this.SendPropertyChanged("ProgressStatus"); + this.OnProgressStatusChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -217348,7 +217372,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceName", DbType="NChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceName", DbType="NVarChar(500)")] public string InterFaceName { get @@ -217388,7 +217412,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceMehtod", DbType="NChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InterFaceMehtod", DbType="NVarChar(200)")] public string InterFaceMehtod { get @@ -218096,7 +218120,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Frequency", DbType="NChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Frequency", DbType="NVarChar(50)")] public string Frequency { get