Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

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
+

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,6 +113,7 @@ 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();
             }

SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx

@@ -19,7 +19,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:RadioButtonList runat="server" ID="ckCycle" AutoPostBack="True" Hidden="true" Width="320px"
+                                <f:RadioButtonList runat="server" ID="ckCycle" AutoPostBack="True"  Width="320px"
                                     OnSelectedIndexChanged="ckCycle_SelectedIndexChanged">
                                     <f:RadioItem Value="1" Text="按月度" Selected="True"></f:RadioItem>
                                     <f:RadioItem Value="2" Text="按年度" ></f:RadioItem>

SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs

@@ -7,6 +7,10 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
+using FineUIPro.Web.HSSE.License;
+using Microsoft.Office.Interop.Word;
+using Model;
+using NPOI.SS.Formula.Functions;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.JDGL.Check
@@ -41,14 +45,41 @@ namespace FineUIPro.Web.JDGL.Check
         /// <param name="cNProfessionalId"></param>
         public void BindStatisc()
         {
-            DateTime months = Convert.ToDateTime(this.txtMonths.Text + "-01");
+            var cycle = this.ckCycle.SelectedValue;
             StatisticsList = new List<Model.JDGL_MonthPlan>();
             int i = 1;
             Model.SGGLDB db = Funs.DB;
-            //所有集合
+            List<JDGL_MonthPlan> totalList = new List<JDGL_MonthPlan>();
-            var totalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x;
+            List<JDGL_MonthPlan> sumTotalList = new List<JDGL_MonthPlan>();
-            //所有集合
+            if (cycle == "1")
-            var sumTotalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months <= months select x;
+            {//按月
+                DateTime months = Convert.ToDateTime(this.txtMonths.Text + "-01");
+                //所有集合
+                totalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x).ToList();
+                //所有集合
+                sumTotalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months <= months select x).ToList();
+            }
+            else if (cycle == "2")
+            {//按年（以上一年度12月份至本年度11月份为一个周期）
+                DateTime sDate = Convert.ToDateTime(this.txtYear.Text + "-12-01").AddYears(-1);
+                DateTime eDate = Convert.ToDateTime(this.txtYear.Text + "-12-01");
+                //所有集合
+                totalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months >= sDate && x.Months < eDate select x).ToList();
+                //所有集合
+                sumTotalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId  && x.Months < eDate select x).ToList();
+            }
+            else
+            {//按项目周期
+                //所有集合
+                totalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+                //所有集合
+                sumTotalList = (from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+            }
+            ////所有集合
+            //var totalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x;
+            ////所有集合
+            //var sumTotalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months <= months select x;
+
             if (this.ckType.SelectedValue == "1")  //按责任单位
             {
                 var pUnit = from x in db.Project_ProjectUnit
@@ -159,7 +190,7 @@ namespace FineUIPro.Web.JDGL.Check
                 this.txtMonths.Hidden = false;
                 this.txtYear.Hidden = true;
             }
-            else if(cycle == "2")
+            else if (cycle == "2")
             {//按年份
                 this.txtMonths.Hidden = true;
                 this.txtYear.Hidden = false;

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx

@@ -146,7 +146,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
-            Height="720px">
+            Height="880px">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs

@@ -30,7 +30,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 //紧急程度
                 QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, true);
                 //事项类别
-                GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, false);
+                GJSXTypeService.InitGJSXTypeDropDownList(this.DropGJSXTypeID, true);
                 //验收人
                 UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, true, string.Empty);
                 //接收人

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx

@@ -145,7 +145,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="关键事项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
-            Height="720px">
+            Height="880px">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx

@@ -131,7 +131,7 @@
                                             </f:Button>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow ID="rowProgressStatus" Hidden="true">
+                                    <%--<f:FormRow ID="rowProgressStatus" Hidden="true">
                                         <Items>
                                             <f:RadioButtonList ID="rblProgressStatus" runat="server" Label="进展申请" LabelWidth="110px" Width="420px"
                                                 AutoColumnWidth="true">
@@ -152,8 +152,7 @@
                                             <f:TextBox ID="txtProgressReason" runat="server" Label="说明" MaxLength="1000" LabelWidth="110px">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
-
                                 </Rows>
                             </f:Form>
                         </f:ContentPanel>
@@ -164,7 +163,7 @@
                 <f:FormRow ID="Progress_detail" Hidden="true">
                     <Items>
                         <f:ContentPanel ID="ContentPanel2" Title="关键事项进展" ShowBorder="true"
-                            BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
+                            BodyPadding="2px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
                             runat="server">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar131" Position="Top" runat="server" ToolbarAlign="Right" CssClass="Toolbar2" Hidden="true">
@@ -176,14 +175,13 @@
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>
-
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
 
                                 <Items>
                                     <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="关键事项进展" EnableCollapse="false"
                                         runat="server" BoxFlex="1" DataKeyNames="Cuid" EnableColumnLines="true" IsFluid="true"
-                                        DataIDField="Cuid" SortField="Sort" AllowSorting="true"
+                                        DataIDField="Cuid" SortField="Sort" AllowSorting="false"
                                         SortDirection="asc" AllowCellEditing="true" ClicksToEdit="1" OnRowCommand="gvOperateComplianceObligations_RowCommand">
 
                                         <Columns>
@@ -199,21 +197,30 @@
                                                     </f:DropDownList>
                                                 </Editor>
                                             </f:RenderField>
-
+                                            <f:RenderField Width="150px" ColumnID="Date" DataField="Date" FieldType="Date"
-                                            <f:RenderField Width="120px" ColumnID="Date" DataField="Date" FieldType="Date"
                                                 Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期">
                                                 <Editor>
                                                     <f:DatePicker ID="DatePicker1" Required="true" runat="server">
                                                     </f:DatePicker>
                                                 </Editor>
                                             </f:RenderField>
-                                            <f:RenderField Width="200px" ColumnID="Progress_detail" DataField="Progress_detail" SortField="Progress_detail"
+                                            <f:RenderField MinWidth="200px" ColumnID="Progress_detail" DataField="Progress_detail" SortField="Progress_detail"
                                                 FieldType="String" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
                                                 <Editor>
                                                     <f:TextBox ID="tbxEditorName" Required="true" runat="server">
                                                     </f:TextBox>
                                                 </Editor>
                                             </f:RenderField>
+                                            <f:RenderField MinWidth="100px" ColumnID="ProgressStatus" DataField="ProgressStatus" 
+                                                FieldType="String" HeaderText="进展申请" HeaderTextAlign="Center" TextAlign="Left">
+                                                <Editor>
+                                                    <f:DropDownList ID="ddlProgressStatus" runat="server" >
+                                                        <f:ListItem Value="" Text="" ></f:ListItem>
+                                                        <f:ListItem Value="持续跟踪" Text="持续跟踪" Selected="true"></f:ListItem>
+                                                        <f:ListItem Value="申请关闭" Text="申请关闭"></f:ListItem>
+                                                    </f:DropDownList>
+                                                </Editor>
+                                            </f:RenderField>
                                             <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
                                                 TextAlign="Center" ToolTip="附件查看" Icon="Find" />
 
@@ -225,6 +232,36 @@
                                     </f:Grid>
                                 </Items>
                             </f:Form>
+
+                            <f:Form ID="ApproveForm" ShowBorder="false" ShowHeader="false" AutoScroll="true" Hidden="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <%--<f:FormRow ID="rowProgressStatus" Hidden="true">
+                                        <Items>
+                                            <f:DropDownList ID="ddlProgressStatus" runat="server" Label="进展申请" LabelWidth="100px">
+                                                <f:ListItem Value="0" Text="持续跟踪"></f:ListItem>
+                                                <f:ListItem Value="1" Text="申请关闭"></f:ListItem>
+                                            </f:DropDownList>
+                                        </Items>
+                                    </f:FormRow> ID="rowCloseProgressCheck"--%>
+                                    <f:FormRow  >
+                                        <Items>
+                                            <f:RadioButtonList ID="rblProgressResult" runat="server" Label="申请结果" LabelWidth="100px" Width="420px"
+                                                AutoColumnWidth="true">
+                                                <f:RadioItem Value="0" Text="同意" Selected="true" />
+                                                <f:RadioItem Value="1" Text="驳回" />
+                                            </f:RadioButtonList>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtProgressReason" runat="server" Label="说明" MaxLength="1000" LabelWidth="100px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+
+                                </Rows>
+                            </f:Form>
                         </f:ContentPanel>
                     </Items>
                 </f:FormRow>

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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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);
+                                //this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
-                                rowProgressStatus.Hidden = false;
+                                this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus;
-                                rowCloseProgressCheck.Hidden = false;
+                                //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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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);
+                                //this.rblProgressStatus.SelectedIndex = int.Parse(gjsx.ProgressStatus);
-                                rowProgressStatus.Hidden = false;
+                                this.ddlProgressStatus.SelectedValue = gjsx.ProgressStatus;
-                                rowCloseProgressCheck.Hidden = false;
+                                //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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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 = true;
-                        Grid2.AllColumns[6].Hidden = false;
+                        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 = true;
-                            Grid2.AllColumns[6].Hidden = false;
+                            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;
+            //string progressStatus = this.rblProgressStatus.SelectedValue;
-            if (!string.IsNullOrWhiteSpace(progressStatus))
+            //string progressStatus = this.ddlProgressStatus.SelectedValue;
-            {
+            //if (!string.IsNullOrWhiteSpace(progressStatus))
-                //gjsx.ProgressStatus = state == "2" ? null : progressStatus;
+            //{
-                gjsx.ProgressStatus = 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;
+                        //string progressStatus = this.rblProgressStatus.SelectedValue;
-                        if (progressStatus == "0")
+                        string progressStatus = string.Empty;
-                        {//持续跟踪
+                        OperateComplianceObligationsCSort(ref progressStatus);
-                            save("2");
+                        if (progressStatus == "申请关闭")
-                        }
-                        else if (progressStatus == "1")
                         {//申请关闭
                             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 关键事项
+
+        /// <summary>
+        /// 关键事项
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         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
         /// <summary>
         /// 关键事项进展明细
         /// </summary>
-        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;
+            //string progressStatus = this.rblProgressStatus.SelectedValue;
-            if (progressStatus == "1")
+            //string progressStatus = this.ddlProgressStatus.SelectedValue;
-            {//责任人申请关闭
+            //if (progressStatus == "1")
-                Model.GJSX_detail detail = new Model.GJSX_detail
+            //{//责任人申请关闭
-                {
+            //    Model.GJSX_detail detail = new Model.GJSX_detail
-                    Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
+            //    {
-                    GJSXID = txtGJSXID.Text,
+            //        Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
-                    Progress_user = this.CurrUser.UserId,
+            //        GJSXID = txtGJSXID.Text,
-                    Progress_detail = "申请关闭",
+            //        Progress_user = this.CurrUser.UserId,
-                    Date = DateTime.Now,
+            //        Progress_detail = "申请关闭",
-                    Sort = GJSX_detail.Count,
+            //        Date = DateTime.Now,
-                };
+            //        Sort = GJSX_detail.Count,
-                GJSXItemService.AddGJSXMX(detail);
+            //    };
-            }
+            //    GJSXItemService.AddGJSXMX(detail);
+            //}
         }
 
 
@@ -1247,6 +1268,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                     Cuid = this.Grid2.Rows[i].DataKeys[0].ToString(),
                     Progress_user = values.Value<string>("Progress_user").ToString(),
                     Progress_detail = values.Value<string>("Progress_detail").ToString(),
+                    ProgressStatus = values.Value<string>("ProgressStatus").ToString(),
                     Sort = i
                 };
                 if (!string.IsNullOrEmpty(values.Value<string>("Date").ToString()))

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs

@@ -194,51 +194,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
 
-        /// <summary>
-        /// rowProgressStatus 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FormRow rowProgressStatus;
-
-        /// <summary>
-        /// rblProgressStatus 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rblProgressStatus;
-
-        /// <summary>
-        /// rowCloseProgressCheck 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.FormRow rowCloseProgressCheck;
-
-        /// <summary>
-        /// rblProgressResult 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rblProgressResult;
-
-        /// <summary>
-        /// txtProgressReason 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtProgressReason;
-
         /// <summary>
         /// Progress_detail 控件。
         /// </summary>
@@ -329,6 +284,42 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// </remarks>
         protected global::FineUIPro.TextBox tbxEditorName;
 
+        /// <summary>
+        /// ddlProgressStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlProgressStatus;
+
+        /// <summary>
+        /// ApproveForm 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form ApproveForm;
+
+        /// <summary>
+        /// rblProgressResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblProgressResult;
+
+        /// <summary>
+        /// txtProgressReason 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProgressReason;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/Menu_PGJSX.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
   <TreeNode id="168A94C7-E37D-4B9C-8684-51DF4F8C5134" Text="关键事项（内部）" NavigateUrl="">
-    <TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="待我处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1">
+    <TreeNode id="5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680" Text="全部事项" NavigateUrl="PZHGL/GJSX/GJSXFind.aspx">
     </TreeNode>
+<TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="我创建的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=0"></TreeNode>
+<TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="待我处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1"></TreeNode>
 <TreeNode id="BEF7850D-1BA5-45F9-BD40-E52F6D813E7C" Text="我已处理" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=2"></TreeNode>
 <TreeNode id="3C129205-F6A9-480D-B36C-E35DED5D7CEC" Text="我参与的" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=3"></TreeNode>
 </TreeNode>

SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx

@@ -179,6 +179,15 @@
         </div>
         <div class="bottom-wrap flex1">
             <div class="top flex">
+                <div class="item flex1 iteml">
+                    <div class="bw-b-bottom">
+                        <div class="bw-b-bottom-up">
+                            <div class="bw-item-content">
+                                <div id='four' style="width: 100%; height: 100%;"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="item flex1 iteml">
                     <div class="bw-b-bottom">
                         <div class="bw-b-bottom-up">
@@ -210,15 +219,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="item flex1 iteml">
-                    <div class="bw-b-bottom">
-                        <div class="bw-b-bottom-up">
-                            <div class="bw-item-content">
-                                <div id='four' style="width: 100%; height: 100%;"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -756,7 +756,7 @@
             },
             tooltip: {},
             legend: {
-                data: ['关键事项超期平均时间'],
+                data: ['关键事项超期平均时间（单位：天）'],
                 left: '3%',
                 show: true,
                 selectedMode: false,

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