Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2023-11-21 16:14:59 +08:00
parent 89af71fd68 5b9fe9d91e
commit bcc72eae50
41 changed files with 1589 additions and 1326 deletions
@@ -1465,6 +1465,7 @@
    <Content Include="res\assets\js\swiper.min.js" />
    <Content Include="res\assets\js\video-7.15.0.min.js" />
    <Content Include="res\assets\js\world.js" />
+    <Content Include="res\DataInTable.js" />
    <Content Include="res\HJGL\InfoQuery\css\Chart.css" />
    <Content Include="res\images\idcard.png" />
    <Content Include="res\images\Signature0.png" />
@@ -1556,6 +1557,7 @@
    <Content Include="res\indexv1\js\old\draw-circle.js" />
    <Content Include="res\indexv1\js\video-7.15.0.min.js" />
    <Content Include="res\indexv1\js\world.js" />
+    <Content Include="res\js\jquery-3.3.1.min.js" />
    <Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" />
    <Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
    <Content Include="SmartSite\SoftManage.aspx" />
@@ -355,10 +355,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
        }
        protected void btnPrint_Click(object sender, EventArgs e)
        {
-            Print(Grid1.SelectedRowIDArray);
-            HJGL_PipelineComponentService.UpdateIsPrint(Grid1.SelectedRowIDArray); //打印后修改打印状态
+            if (Print(Grid1.SelectedRowIDArray))
+            {
+
+                HJGL_PipelineComponentService.UpdateIsPrint(Grid1.SelectedRowIDArray); //打印后修改打印状态
+            } 
        }
-        private void Print(string[] PipelineComponentId)
+        private bool Print(string[] PipelineComponentId)
        { 
            BLL.FastReportService.ResetData();

@@ -370,8 +373,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
            }
            else
            {
-                ShowNotify("请查看组件是否上传二维码！", MessageBoxIcon.Question);
-                return;
+                ShowNotify("请查看组件是否上传二维码！", MessageBoxIcon.Question); 
+                return false;
            }
            BLL.FastReportService.AddFastreportTable(tb);
            string initTemplatePath = "";
@@ -382,7 +385,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
            {
                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));

-            } 
+            }
+
+            return true;
        }

        /// <summary>
@@ -418,7 +418,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        if (pds[i].B != null && !string.IsNullOrEmpty(pds[i].B.ToString()))
                        {
                            item.PrefabricatedComponents = pds[i].B.ToString();
-
+                            if (!item.PrefabricatedComponents.Contains("-")) //预制组件关联的有图纸，图纸名称又是根据组件名称截取的
+                            {
+                                result.Add((i + 2) + "Line, [预制组件] 不合规</br>");
+                            } 
                        }
                        else
                        {
@@ -189,7 +189,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            TreeNode rootNode2 = new TreeNode();
            rootNode2.NodeID = BLL.PipelineService.PipeArea_FIELD;
            rootNode2.Text = "现场安装";
-            rootNode2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
+            rootNode2.CommandName = 1 + "|" + Funs.GetEndPageNumber(b, pageSize);
            rootNode2.EnableClickEvent = true;
            rootNode2.EnableExpandEvent = true;
            this.tvControlItem.Nodes.Add(rootNode2);
@@ -8,7 +8,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Web.UI.DataVisualization.Charting;
-
+using System.Threading.Tasks;
 namespace FineUIPro.Web.WeldingProcess.WeldingManage
 {
    public partial class WeldReportEdit : PageBase
@@ -253,7 +253,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                }
                //dt = this.LINQToDataTable(task);
            }
-            
+
+            task = task.OrderBy(x => x.PipelineCode).ThenBy(x => x.WeldJointNum).ToList();
            Grid1.RecordCount = task.Count; 
            Grid1.DataSource = task;
            Grid1.DataBind();
@@ -322,33 +323,23 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
            return StateName;
        }
        #region 焊接日报 提交事件
-        /// <summary>
-        /// 编辑焊接日报
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSave_Click(object sender, EventArgs e)
+        // 检查用户权限
+        private bool HasPermission()
+        {
+            return CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_WeldTaskMenuId, Const.BtnSave);
+        }
+        // 获取焊接信息
+        private List<Model.View_HJGL_WeldJoint> GetWeldJointView()
+        {
+            return Funs.DB.View_HJGL_WeldJoint
+                .Where(x => x.WeldingDailyId == WeldingDailyId)
+                .OrderBy(x => x.PipelineCode)
+                .ThenBy(x => x.WeldJointCode)
+                .ToList();
+        }
+        // 创建新的焊接日报
+        private Model.HJGL_WeldingDaily CreateNewWeldingDaily()
        {
-            if (!CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.PersonId,
-                    Const.HJGL_WeldTaskMenuId, Const.BtnSave))
-            {
-                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-                return;
-            }
-            if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text,
-                    !string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
-            {
-                ShowNotify("日报编号已存在，请重新录入", MessageBoxIcon.Warning);
-                return;
-            }
-
-            if (string.IsNullOrEmpty(this.txtWeldingDate.Text) ||
-                string.IsNullOrEmpty(this.txtWeldingDailyCode.Text.Trim()))
-            {
-                ShowNotify("日报告号、焊接日期不能为空", MessageBoxIcon.Warning);
-                return;
-            }
-
            Model.HJGL_WeldingDaily newWeldingDaily = new Model.HJGL_WeldingDaily
            {
                WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim(),
@@ -364,14 +355,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
            {
                newWeldingDaily.UnitWorkId = this.drpUnitWork.SelectedValue;
            }
-
-            //List<Model.SpWeldingDailyItem> GetWeldingDailyItem = this.CollectGridJointInfo();
-            string errlog = string.Empty;
-            var weldJointView = (from x in BLL.Funs.DB.View_HJGL_WeldJoint  where x.WeldingDailyId == this.WeldingDailyId  orderby x.PipelineCode, x.WeldJointCode
-                select x).ToList();
-
-            string eventArg = string.Empty;
-
+            return newWeldingDaily;
+        }
+        //焊工资质判断
+        private void CheckWelderQualification()
+        {
            #region 焊工资质判断这里取消

            //foreach (var item in GetWeldingDailyItem)
@@ -464,7 +452,43 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
            //}

            #endregion
+        }

+        /// <summary>
+        /// 编辑焊接日报
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!HasPermission())
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text,
+                    !string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
+            {
+                ShowNotify("日报编号已存在，请重新录入", MessageBoxIcon.Warning);
+                return;
+            }
+
+            if (string.IsNullOrEmpty(this.txtWeldingDate.Text) ||
+                string.IsNullOrEmpty(this.txtWeldingDailyCode.Text.Trim()))
+            {
+                ShowNotify("日报告号、焊接日期不能为空", MessageBoxIcon.Warning);
+                return;
+            }
+            // 创建新的焊接日报
+            var newWeldingDaily = CreateNewWeldingDaily();
+            // 获取焊接信息
+            var weldJointView = GetWeldJointView();
+
+            string errlog = string.Empty;
+            string eventArg = string.Empty;
+            // 焊工资质判断
+            // CheckWelderQualification(weldJointView);
+            
            if (eventArg == string.Empty) //焊工焊接的所有焊口资质都符合要求）
            {
                if (!string.IsNullOrEmpty(this.WeldingDailyId))
@@ -646,9 +670,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage

                #endregion

-                ChanggeState(); //更新焊口属性
-
-                //更新焊口属性
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    ChanggeState();
+                });
+                 
                if (string.IsNullOrEmpty(errlog))
                {
                    ShowNotify("保存成功！", MessageBoxIcon.Success);
@@ -57,57 +57,62 @@ namespace FineUIPro.Web.HSSE.Check
        /// </summary>
        private void BindGrid()
        {
-            string strSql = @"SELECT CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode,"
-                          + @" CheckItemSet.CheckItemName,CheckSpecial.CheckTime,(CASE WHEN CheckSpecial.CheckType ='1' THEN '联合检查' ELSE '专项检查' END) AS CheckTypeName"
-                          + @" ,(CASE WHEN CheckSpecial.States='2' THEN '已完成' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName"
-                          + @" FROM Check_CheckSpecial AS CheckSpecial "
-                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckSpecial.CheckSpecialId=CodeRecords.DataId "
-                          + @" LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId = CheckSpecial.CheckItemSetId where 1=1";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            strSql += " AND CheckSpecial.ProjectId = @ProjectId";
-            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            //string strSql = @"SELECT CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode,"
+            //              + @" CheckItemSet.CheckItemName,CheckSpecial.CheckTime,(CASE WHEN CheckSpecial.CheckType ='1' THEN '联合检查' ELSE '专项检查' END) AS CheckTypeName"
+            //              + @" ,(CASE WHEN CheckSpecial.States='2' THEN '已完成' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName"
+            //              + @" FROM Check_CheckSpecial AS CheckSpecial "
+            //              + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckSpecial.CheckSpecialId=CodeRecords.DataId "
+            //              + @" LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId = CheckSpecial.CheckItemSetId where 1=1";
+            //List<SqlParameter> listStr = new List<SqlParameter>();
+            //strSql += " AND CheckSpecial.ProjectId = @ProjectId";
+            //listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));

-            if (this.rbStates.SelectedValue != "-1")
-            {
-                strSql += " AND CheckSpecial.States = @States";
-                listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
-            }
-            if (this.rbType.SelectedValue != "-1")
-            {
-                if (this.rbType.SelectedValue == "1")
-                {
-                    strSql += " AND CheckSpecial.CheckType = @CheckType";
-                    listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
-                }
-                else
-                {
-                    strSql += " AND (CheckSpecial.CheckType = @CheckType OR CheckSpecial.CheckType IS NULL) ";
-                    listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
-                }
-            }
-            if (this.drpSupCheckItemSet.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND CheckSpecial.CheckItemSetId = @CheckItemSetId";
-                listStr.Add(new SqlParameter("@CheckItemSetId", this.drpSupCheckItemSet.SelectedValue));
-            }
-            if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
-            {
-                strSql += " AND CheckSpecial.CheckTime >= @StartTime";
-                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
-            }
-            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
-            {
-                strSql += " AND CheckSpecial.CheckTime <= @EndTime";
-                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
-            }
+            //if (this.rbStates.SelectedValue != "-1")
+            //{
+            //    strSql += " AND CheckSpecial.States = @States";
+            //    listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
+            //}
+            //if (this.rbType.SelectedValue != "-1")
+            //{
+            //    if (this.rbType.SelectedValue == "1")
+            //    {
+            //        strSql += " AND CheckSpecial.CheckType = @CheckType";
+            //        listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
+            //    }
+            //    else
+            //    {
+            //        strSql += " AND (CheckSpecial.CheckType = @CheckType OR CheckSpecial.CheckType IS NULL) ";
+            //        listStr.Add(new SqlParameter("@CheckType", this.rbType.SelectedValue));
+            //    }
+            //}
+            //if (this.drpSupCheckItemSet.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND CheckSpecial.CheckItemSetId = @CheckItemSetId";
+            //    listStr.Add(new SqlParameter("@CheckItemSetId", this.drpSupCheckItemSet.SelectedValue));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
+            //{
+            //    strSql += " AND CheckSpecial.CheckTime >= @StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND CheckSpecial.CheckTime <= @EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            //}

-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            //SqlParameter[] parameter = listStr.ToArray();
+            //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            //Grid1.RecordCount = tb.Rows.Count;
+            //var table = this.GetPagedDataTable(Grid1, tb);
+            //Grid1.DataSource = table;
+            //Grid1.DataBind();

-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);

-            Grid1.DataSource = table;
+            var getData = Check_CheckSpecialService.getListData(this.ProjectId, this.rbStates.SelectedValue, this.rbType.SelectedValue, this.drpSupCheckItemSet.SelectedValue,
+                Funs.GetNewDateTime(txtStartTime.Text.Trim()), Funs.GetNewDateTime(this.txtEndTime.Text.Trim()), Grid1);
+            Grid1.RecordCount = Check_CheckSpecialService.count;
+            Grid1.DataSource = getData;
            Grid1.DataBind();
        }
        #endregion
@@ -137,7 +137,6 @@
        </div>
    </form>
     <script type="text/javascript">
-        debugger
        var imgID = '<%=Grid1.ClientID %>';
         F.ready(function () {
                var $wrap = $("#" + imgID)
@@ -8,100 +8,91 @@
 </head>
 <body>
    <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="体检管理" EnableCollapse="true"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="FileId"  DataIDField="FileId" AllowSorting="true"
-                SortField="ProjectCode,FileCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtFileCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="名称" ID="txtFileName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                LabelAlign="right">
-                            </f:TextBox>              
-                            <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>             
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
-                                runat="server">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="100px" ColumnID="FileCode" DataField="FileCode"
-                        SortField="FileCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="380px" ColumnID="ProjectName" DataField="ProjectName"  
-                        SortField="ProjectName" FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="FileName" DataField="FileName" 
-                        SortField="FileName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                    
-                     <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>             
-                     <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="140px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                      
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="编辑体检管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1024px" Height="600px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="体检管理" EnableCollapse="true"
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="SitePersonId"
+                    DataIDField="SitePersonId" AllowSorting="true"
+                    SortField="CardNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox runat="server" Label="姓名" ID="txtPersonName" EmptyText="输入查询条件"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                    LabelAlign="right">
+                                </f:TextBox>
+                                <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true"
+                                    Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="CardNo" DataField="CardNo"
+                            FieldType="String" HeaderText="卡号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName" ExpandUnusedSpace="true"
+                            FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="PersonName" DataField="PersonName"
+                            FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="150px" HeaderText="体检" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("PersonId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+        </f:Menu>
+
+        <div id="imgID1" style="position: absolute; left: 0; top: 0; width: 200px; height: 200px; z-index: 99999999;">
+            <img src="" alt="Alternate Text" style="width: 100%; height: auto;" />
+        </div>
    </form>
    <script type="text/javascript">
        var menuID = '<%= Menu1.ClientID %>';
@@ -115,5 +106,21 @@
            __doPostBack(null, 'reloadGrid');
        }
    </script>
+    <script type="text/javascript">         
+        var imgID = '<%=Grid1.ClientID %>';
+        F.ready(function () {
+            var $wrap = $("#" + imgID)
+            $wrap.find('img').hover(function (e) {
+                console.log($(this).offset())
+                var top = $(this).offset().top;
+                var left = $(this).offset().left - 200;
+                var src = $(this).attr('src')
+                console.log('src', src, top, left)
+                $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
+            }, function () {
+                $('#imgID1').hide()
+            })
+        })
+    </script>
 </body>
 </html>
@@ -1,10 +1,8 @@
 using BLL;
 using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+using System.Web;
 using AspNet = System.Web.UI.WebControls;

 namespace FineUIPro.Web.HSSE.OccupationHealth
@@ -24,7 +22,6 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
                Funs.DropDownPageSize(this.ddlPageSize);
                ////权限按钮方法
                this.GetButtonPower();
-                this.btnNew.OnClientClick = Window1.GetShowReference("PhysicalExaminationEdit.aspx") + "return false;";

                // 绑定表格
                this.BindGrid();
@@ -38,47 +35,9 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
        /// </summary>
        private void BindGrid()
        {
-            string strSql = @"SELECT PhysicalExamination.FileId,PhysicalExamination.FileCode,PhysicalExamination.FileName,CompileManPerson.PersonName AS CompileManName,PhysicalExamination.CompileDate,Project.ProjectName,Project.ProjectCode"
-                          + @" ,(CASE WHEN PhysicalExamination.States = " + BLL.Const.State_0 + " OR PhysicalExamination.States IS NULL THEN '待['+OperatePerson.PersonName+']提交' WHEN PhysicalExamination.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperatePerson.PersonName+']办理' END) AS  FlowOperateName"
-                          + @" FROM OccupationHealth_PhysicalExamination AS PhysicalExamination"
-                          + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON PhysicalExamination.FileId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
-                          + @" LEFT JOIN Person_Persons AS OperatePerson ON FlowOperate.OperaterId=OperatePerson.PersonId "
-                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON PhysicalExamination.FileId=CodeRecords.DataId "
-                          + @" LEFT JOIN Base_Project AS Project ON PhysicalExamination.ProjectId=Project.ProjectId "
-                          + @" LEFT JOIN Person_Persons AS CompileManPerson ON PhysicalExamination.CompileMan =CompileManPerson.PersonId WHERE 1=1 ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))  ///总部查看
-            {
-                strSql += " AND PhysicalExamination.States = @States";  ///状态为已完成
-                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
-                if (this.drpProject.SelectedValue != null && this.drpProject.SelectedValue != BLL.Const._Null)
-                {
-                    strSql += " AND PhysicalExamination.ProjectId = @ProjectId";
-                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
-                }
-            }
-            else  //现场查看
-            {
-                strSql += " AND PhysicalExamination.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            }
-            if (!string.IsNullOrEmpty(this.txtFileCode.Text.Trim()))
-            {
-                strSql += " AND FileCode LIKE @FileCode";
-                listStr.Add(new SqlParameter("@FileCode", "%" + this.txtFileCode.Text.Trim() + "%"));
-            }
-            if (!string.IsNullOrEmpty(this.txtFileName.Text.Trim()))
-            {
-                strSql += " AND PhysicalExamination.FileName LIKE @FileName";
-                listStr.Add(new SqlParameter("@FileName", "%" + this.txtFileName.Text.Trim() + "%"));
-            }
-
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
+            var getData = PhysicalExaminationService.getListData(this.CurrUser.LoginProjectId, this.txtPersonName.Text.Trim(), Grid1);
+            Grid1.RecordCount = PhysicalExaminationService.count;
+            Grid1.DataSource = getData;
            Grid1.DataBind();
        }

@@ -160,47 +119,12 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
                return;
            }
            string id = Grid1.SelectedRowID;
-            var OccupationHealth = BLL.PhysicalExaminationService.GetPhysicalExaminationById(id);
-            if (OccupationHealth != null)
+            if (!this.btnMenuEdit.Hidden)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
            {
-                if (this.btnMenuEdit.Hidden || OccupationHealth.States == BLL.Const.State_2)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
-                {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PhysicalExaminationView.aspx?FileId={0}", id, "查看 - ")));
-                }
-                else
-                {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PhysicalExaminationEdit.aspx?FileId={0}", id, "编辑 - ")));
-                }
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("PhysicalExaminationEdit.aspx?SitePersonId={0}", id, "编辑 - ")));
            }
        }
-        #endregion
-
-        #region 删除
-        /// <summary>
-        /// 右键删除事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuDelete_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length > 0)
-            {
-                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
-                {
-                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var getD = BLL.PhysicalExaminationService.GetPhysicalExaminationById(rowID);
-                    if (getD != null)
-                    {
-                        BLL.LogService.AddSys_Log(this.CurrUser, getD.FileCode, getD.FileId, BLL.Const.ServerPhysicalExaminationMenuId, BLL.Const.BtnDelete);
-                        BLL.PhysicalExaminationService.DeletePhysicalExaminationById(rowID);
-                    }
-                }
-
-                this.BindGrid();
-                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
-            }
-        }
-        #endregion
+        #endregion        

        #region 获取按钮权限
        /// <summary>
@@ -221,19 +145,11 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
            }
            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, menuId);
            if (buttonList.Count() > 0)
-            {
-                if (buttonList.Contains(BLL.Const.BtnAdd))
-                {
-                    this.btnNew.Hidden = false;
-                }
+            {               
                if (buttonList.Contains(BLL.Const.BtnModify))
                {
                    this.btnMenuEdit.Hidden = false;
                }
-                if (buttonList.Contains(BLL.Const.BtnDelete))
-                {
-                    this.btnMenuDelete.Hidden = false;
-                }
            }
            else
            {
@@ -299,6 +215,26 @@ namespace FineUIPro.Web.HSSE.OccupationHealth

            return sb.ToString();
        }
-        #endregion        
+        #endregion
+
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="registrationId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object personId)
+        {
+            string url = string.Empty;
+            if (personId != null)
+            {
+                var attach = BLL.AttachFileService.GetAttachFile(personId.ToString() + "#3", BLL.Const.PersonListMenuId);
+                if (attach != null)
+                {
+                    url = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", attach.AttachUrl));
+                }
+            }
+            return url;
+        }
    }
 }
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.OccupationHealth {
-    
-    
-    public partial class PhysicalExamination {
-        
+namespace FineUIPro.Web.HSSE.OccupationHealth
+{
+
+
+    public partial class PhysicalExamination
+    {
+
        /// <summary>
        /// Head1 控件。
        /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-        
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-        
+
        /// <summary>
        /// Toolbar2 控件。
        /// </summary>
@@ -65,25 +67,16 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar2;
-        
+
        /// <summary>
-        /// txtFileCode 控件。
+        /// txtPersonName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtFileCode;
-        
-        /// <summary>
-        /// txtFileName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtFileName;
-        
+        protected global::FineUIPro.TextBox txtPersonName;
+
        /// <summary>
        /// drpProject 控件。
        /// </summary>
@@ -92,7 +85,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpProject;
-        
+
        /// <summary>
        /// ToolbarFill1 控件。
        /// </summary>
@@ -101,16 +94,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
-        /// <summary>
-        /// btnNew 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnNew;
-        
+
        /// <summary>
        /// btnOut 控件。
        /// </summary>
@@ -119,7 +103,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnOut;
-        
+
        /// <summary>
        /// lblNumber 控件。
        /// </summary>
@@ -128,7 +112,16 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
+        /// <summary>
+        /// lbImageUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl;
+
        /// <summary>
        /// ToolbarSeparator1 控件。
        /// </summary>
@@ -137,7 +130,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
        /// <summary>
        /// ToolbarText1 控件。
        /// </summary>
@@ -146,7 +139,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
        /// <summary>
        /// ddlPageSize 控件。
        /// </summary>
@@ -155,16 +148,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList ddlPageSize;
-        
-        /// <summary>
-        /// Window1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window1;
-        
+
        /// <summary>
        /// WindowAtt 控件。
        /// </summary>
@@ -173,7 +157,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window WindowAtt;
-        
+
        /// <summary>
        /// Menu1 控件。
        /// </summary>
@@ -182,7 +166,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Menu Menu1;
-        
+
        /// <summary>
        /// btnMenuEdit 控件。
        /// </summary>
@@ -191,14 +175,5 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuEdit;
-        
-        /// <summary>
-        /// btnMenuDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDelete;
    }
 }
@@ -14,40 +14,26 @@
    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="体检管理" AutoScroll="true"
        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
        <Rows>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtFileCode" runat="server" Label="编号" LabelAlign="Right" Readonly="true" Required="true" ShowRedStar="true" FocusOnPageLoad="true"
-                        MaxLength="50">
-                    </f:TextBox>
-                    <f:TextBox ID="txtFileName" runat="server" Label="名称" Required="true" ShowRedStar="true"
-                        LabelAlign="Right" MaxLength="200" >
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>                                  
-            <f:FormRow>
-                <Items>
-                    <f:HtmlEditor runat="server" Label="内容" ID="txtFileContent" ShowLabel="false"
-                        Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Basic" Height="250px" LabelAlign="Right">
-                    </f:HtmlEditor>
-                </Items>
-            </f:FormRow>
              <f:FormRow>
-                <Items>                   
-                    <f:DropDownList ID="drpCompileMan" runat="server" Label="整理人" EnableEdit="true" LabelAlign="Right">
-                    </f:DropDownList>
-                     <f:DatePicker ID="txtCompileDate" runat="server" Label="整理时间" LabelAlign="Right"
-                        EnableEdit="true">
-                    </f:DatePicker>  
+                <Items>
+                    <f:TextBox ID="txtProjectName" runat="server" Label="项目" LabelAlign="Right" Readonly="true" >
+                    </f:TextBox>
                </Items>
-            </f:FormRow>   
+            </f:FormRow>     
+               <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtUnitName" runat="server" Label="单位名称" LabelAlign="Right" Readonly="true" >
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>  
            <f:FormRow>
                <Items>
-                    <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
-                        BodyPadding="0px">
-                        <uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
-                    </f:ContentPanel>
+                    <f:TextBox ID="txtCardNo" runat="server" Label="卡号" LabelAlign="Right" Readonly="true" >
+                    </f:TextBox>
+                    <f:TextBox ID="txtPersonName" runat="server" Label="姓名"  LabelAlign="Right">
+                    </f:TextBox>
                </Items>
-            </f:FormRow>               
+            </f:FormRow>              
        </Rows>
        <Toolbars>
            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@@ -55,13 +41,7 @@
                    <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
                    </f:Button>
-                    <f:ToolbarFill runat="server"> </f:ToolbarFill>
-                     <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
-                        OnClick="btnSave_Click">
-                    </f:Button>                    
-                    <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
-                        OnClick="btnSubmit_Click">
-                    </f:Button>
+                    <f:ToolbarFill runat="server"> </f:ToolbarFill>                                       
                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
                    </f:Button>
                </Items>
@@ -1,4 +1,5 @@
 using BLL;
+using Microsoft.Office.Core;
 using System;
 using System.Web;

@@ -10,30 +11,27 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
        /// <summary>
        /// 主键
        /// </summary>
-        public string FileId
+        public string PersonId
        {
            get
            {
-                return (string)ViewState["FileId"];
+                return (string)ViewState["PersonId"];
            }
            set
            {
-                ViewState["FileId"] = value;
+                ViewState["PersonId"] = value;
            }
        }

-        /// <summary>
-        /// 项目主键
-        /// </summary>
-        public string ProjectId
+        public string SitePersonId
        {
            get
            {
-                return (string)ViewState["ProjectId"];
+                return (string)ViewState["SitePersonId"];
            }
            set
            {
-                ViewState["ProjectId"] = value;
+                ViewState["SitePersonId"] = value;
            }
        }
        #endregion
@@ -49,115 +47,21 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
            if (!IsPostBack)
            {
                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.CurrUser.LoginProjectId, null, null, true);
-                this.ProjectId = this.CurrUser.LoginProjectId;
-                this.FileId = Request.Params["FileId"];
-                if (!string.IsNullOrEmpty(this.FileId))
+             
+                this.SitePersonId = Request.Params["SitePersonId"];              
+                var getPerson= SitePerson_PersonService.GetSitePersonById(this.SitePersonId);
+                if (getPerson != null)
                {
-                    Model.OccupationHealth_PhysicalExamination PhysicalExamination = BLL.PhysicalExaminationService.GetPhysicalExaminationById(this.FileId);
-                    if (PhysicalExamination != null)
-                    {
-                        this.ProjectId = PhysicalExamination.ProjectId;
-                        this.txtFileCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.FileId);
-                        this.txtFileName.Text = PhysicalExamination.FileName;
-                        if (!string.IsNullOrEmpty(PhysicalExamination.CompileMan))
-                        {
-                            this.drpCompileMan.SelectedValue = PhysicalExamination.CompileMan;
-                        }
-                        this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", PhysicalExamination.CompileDate);
-                        this.txtFileContent.Text = HttpUtility.HtmlDecode(PhysicalExamination.FileContent);
-                    }
+                    this.txtProjectName.Text = ProjectService.GetProjectNameByProjectId(getPerson.ProjectId);
+                    this.txtUnitName.Text = UnitService.GetUnitNameByUnitId(getPerson.UnitId);
+                    this.PersonId = getPerson.PersonId;
+                    this.txtCardNo.Text = getPerson.CardNo;
+                    this.txtPersonName.Text = getPerson.PersonName;
                }
-                else
-                {
-                    ////自动生成编码
-                    this.txtFileCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.PhysicalExaminationMenuId, this.ProjectId, this.CurrUser.UnitId);
-                    this.drpCompileMan.SelectedValue = this.CurrUser.PersonId;
-                    this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.txtFileName.Text = this.SimpleForm1.Title;
-                }
-                ///初始化审核菜单
-                this.ctlAuditFlow.MenuId = BLL.Const.PhysicalExaminationMenuId;
-                this.ctlAuditFlow.DataId = this.FileId;
-                this.ctlAuditFlow.ProjectId = this.ProjectId;
-                this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
            }
        }
        #endregion

-        #region 提交按钮
-        /// <summary>
-        /// 提交按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSubmit_Click(object sender, EventArgs e)
-        {
-            if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
-            {
-                ShowNotify("请选择下一步办理人！", MessageBoxIcon.Warning);
-                return;
-            }
-            this.SaveData(BLL.Const.BtnSubmit);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
-        }
-        #endregion
-
-        #region 保存
-        /// <summary>
-        /// 保存按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnSave_Click(object sender, EventArgs e)
-        {
-            this.SaveData(BLL.Const.BtnSave);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
-        }
-
-
-        /// <summary>
-        /// 保存数据
-        /// </summary>
-        /// <param name="type"></param>
-        private void SaveData(string type)
-        {
-            Model.OccupationHealth_PhysicalExamination PhysicalExamination = new Model.OccupationHealth_PhysicalExamination
-            {
-                FileCode = this.txtFileCode.Text.Trim(),
-                FileName = this.txtFileName.Text.Trim()
-            };
-            if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
-            {
-                PhysicalExamination.CompileMan = this.drpCompileMan.SelectedValue;
-            }
-            PhysicalExamination.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
-            PhysicalExamination.FileContent = HttpUtility.HtmlEncode(this.txtFileContent.Text);
-            ////单据状态
-            PhysicalExamination.States = BLL.Const.State_0;
-            if (type == BLL.Const.BtnSubmit)
-            {
-                PhysicalExamination.States = this.ctlAuditFlow.NextStep;
-            }
-            if (!string.IsNullOrEmpty(this.FileId))
-            {
-                PhysicalExamination.FileId = this.FileId;
-                BLL.PhysicalExaminationService.UpdatePhysicalExamination(PhysicalExamination);
-                BLL.LogService.AddSys_Log(this.CurrUser, PhysicalExamination.FileCode, PhysicalExamination.FileId, BLL.Const.PhysicalExaminationMenuId, BLL.Const.BtnModify);
-            }
-            else
-            {
-                this.FileId = SQLHelper.GetNewID(typeof(Model.OccupationHealth_PhysicalExamination));
-                PhysicalExamination.FileId = this.FileId;
-                PhysicalExamination.ProjectId = this.ProjectId;
-                BLL.PhysicalExaminationService.AddPhysicalExamination(PhysicalExamination);
-                BLL.LogService.AddSys_Log(this.CurrUser, PhysicalExamination.FileCode, PhysicalExamination.FileId, BLL.Const.PhysicalExaminationMenuId, BLL.Const.BtnAdd);
-            }
-            ////保存流程审核数据         
-            this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.PhysicalExaminationMenuId, this.FileId, (type == BLL.Const.BtnSubmit ? true : false), this.txtFileName.Text.Trim(), "../OccupationHealth/PhysicalExaminationView.aspx?FileId={0}");
-        }
-        #endregion
-
        #region 附件上传
        /// <summary>
        /// 上传附件
@@ -166,11 +70,8 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
        /// <param name="e"></param>
        protected void btnAttachUrl_Click(object sender, EventArgs e)
        {
-            if (string.IsNullOrEmpty(this.FileId))
-            {
-                SaveData(BLL.Const.BtnSave);
-            }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PhysicalExaminationAttachUrl&menuId={1}", FileId, BLL.Const.PhysicalExaminationMenuId)));
+            string filePath = "FileUpLoad/PersonBaseInfo/" + DateTime.Now.ToString("yyyy-MM") + "/newfile/";
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=" + filePath + "&menuId={1}&strParam=3", this.PersonId, BLL.Const.PersonListMenuId)));
        }
        #endregion
    }
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.OccupationHealth {
-    
-    
-    public partial class PhysicalExaminationEdit {
-        
+namespace FineUIPro.Web.HSSE.OccupationHealth
+{
+
+
+    public partial class PhysicalExaminationEdit
+    {
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// SimpleForm1 控件。
        /// </summary>
@@ -38,70 +40,43 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Form SimpleForm1;
-        
+
        /// <summary>
-        /// txtFileCode 控件。
+        /// txtProjectName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtFileCode;
-        
+        protected global::FineUIPro.TextBox txtProjectName;
+
        /// <summary>
-        /// txtFileName 控件。
+        /// txtUnitName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.TextBox txtFileName;
-        
+        protected global::FineUIPro.TextBox txtUnitName;
+
        /// <summary>
-        /// txtFileContent 控件。
+        /// txtCardNo 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.HtmlEditor txtFileContent;
-        
+        protected global::FineUIPro.TextBox txtCardNo;
+
        /// <summary>
-        /// drpCompileMan 控件。
+        /// txtPersonName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpCompileMan;
-        
-        /// <summary>
-        /// txtCompileDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtCompileDate;
-        
-        /// <summary>
-        /// ContentPanel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel1;
-        
-        /// <summary>
-        /// ctlAuditFlow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
-        
+        protected global::FineUIPro.TextBox txtPersonName;
+
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@@ -110,7 +85,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;
-        
+
        /// <summary>
        /// btnAttachUrl 控件。
        /// </summary>
@@ -119,25 +94,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnAttachUrl;
-        
-        /// <summary>
-        /// btnSave 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSave;
-        
-        /// <summary>
-        /// btnSubmit 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSubmit;
-        
+
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@@ -146,7 +103,7 @@ namespace FineUIPro.Web.HSSE.OccupationHealth {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnClose;
-        
+
        /// <summary>
        /// WindowAtt 控件。
        /// </summary>
@@ -6,8 +6,8 @@
 <head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title>现场安全检查</title>
-    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
-    <script src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
+    <link href="../../res/css/common.css" rel="stylesheet" />
+    <script src="../../res/js/jquery-3.3.1.min.js"></script>
     <style type="text/css">
        .f-grid-row .f-grid-cell-inner {
            white-space: normal;
@@ -43,59 +43,65 @@
                </Items>
            </f:FormRow>   
            <f:FormRow>
-                <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检查标准" EnableCollapse="false" runat="server"
-                    BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true" 
-                    ClicksToEdit="1" DataIDField="ID" AllowSorting="true" SortField="SortIndex" SortDirection="ASC"
-                    OnSort="Grid1_Sort" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">                       
-                    <Columns>          
-                        <f:RenderField HeaderText="主键" ColumnID="ID" DataField="ID" Hidden="true">
-                        </f:RenderField>                  
-                        <f:RenderField HeaderText="序号" ColumnID="SortIndex" DataField="SortIndex"
-                            HeaderTextAlign="Center" TextAlign="Center" Width="60px">
-                        </f:RenderField>
-                        <f:RenderField HeaderText="检查项目" ColumnID="CheckItem" DataField="CheckItem"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="150px">                                
-                        </f:RenderField>
-                        <f:RenderField HeaderText="检查标准" ColumnID="CheckStandard" DataField="CheckStandard"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="400px" ExpandUnusedSpace="true">                               
-                        </f:RenderField>
-                        <f:RenderField HeaderText="检查方法" ColumnID="CheckMethod" DataField="CheckMethod"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="300px" >                               
-                        </f:RenderField>
-                        <f:RenderField HeaderText="检查结果" ColumnID="CheckResult" DataField="CheckResult"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="160px">
-                            <Editor>
-                                <f:TextArea ID="txtCheckResult" runat="server">
-                                </f:TextArea>
-                            </Editor>
-                        </f:RenderField>
-                        <f:RenderField HeaderText="基准分" ColumnID="BaseScore" DataField="BaseScore"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="100px" FieldType="Double"> 
-                            <Editor>
-                                <f:NumberBox ID="txtBaseScore"  runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
-                                </f:NumberBox>
-                            </Editor>                               
-                        </f:RenderField> 
-                        <f:RenderField HeaderText="扣减分" ColumnID="DeletScore" DataField="DeletScore"
-                            HeaderTextAlign="Center"  TextAlign="Left" Width="100px" FieldType="Double">
-                            <Editor>
-                                <f:NumberBox ID="txtDeletScore"  runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
-                                </f:NumberBox>
-                            </Editor>
-                        </f:RenderField> 
-                        <f:RenderField HeaderText="实得分" ColumnID="GetScore" DataField="GetScore"
-                             HeaderTextAlign="Center"  TextAlign="Left" Width="100px" FieldType="Double">                                
-                        </f:RenderField>                             
-                    </Columns>
-                    <Listeners>
-                   <%-- <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />--%>
-                    <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
-                    <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                </Listeners>
-               </f:Grid>
-               </Items>
-            </f:FormRow>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检查标准" EnableCollapse="false" runat="server"
+                            BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true" 
+                            ClicksToEdit="1" DataIDField="ID" AllowSorting="true" SortField="SortIndex" SortDirection="ASC"
+                            OnSort="Grid1_Sort" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                            <Columns>
+                                <f:RenderField HeaderText="主键" ColumnID="ID" DataField="ID" Hidden="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="序号" ColumnID="SortIndex" DataField="SortIndex"
+                                    HeaderTextAlign="Center" TextAlign="Center" Width="60px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检查项目" ColumnID="CheckItem" DataField="CheckItem"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检查标准" ColumnID="CheckStandard" DataField="CheckStandard"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="220px" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检查方法" ColumnID="CheckMethod" DataField="CheckMethod"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="300px">
+                                </f:RenderField>
+                                 <f:RenderCheckField Width="100px" ColumnID="IsSelect" DataField="IsSelect" HeaderText="是否适用" />
+                                <f:RenderField HeaderText="检查结果" ColumnID="CheckResult" DataField="CheckResult"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="200px">
+                                    <Editor>
+                                        <f:TextArea ID="txtCheckResult" runat="server">
+                                        </f:TextArea>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="基准分" ColumnID="BaseScore" DataField="BaseScore"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
+                                    <Editor>
+                                        <f:NumberBox ID="txtBaseScore" runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="扣减分" ColumnID="DeletScore" DataField="DeletScore"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
+                                    <Editor>
+                                        <f:NumberBox ID="txtDeletScore" runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="实得分" ColumnID="GetScore" DataField="GetScore"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </Listeners>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+              <f:FormRow>
+                    <Items>
+                        <f:Label ID="lbTotalCheckScore" runat="server" Label="检查得分"></f:Label>
+                    </Items>
+                </f:FormRow>
            <f:FormRow ColumnWidths="66% 34%">
            <Items>                                    
                <f:Label ID="lbTotal100Score" runat="server"></f:Label>
@@ -127,64 +133,64 @@
   </form>
    <script type="text/javascript">
        var grid1ClientID = '<%= Grid1.ClientID %>';
-        var lbTotal100ScoreClientID = '<%= lbTotal100Score.ClientID %>';
-    <%--    var hdTotalDeletScore6_7ClientID = '<%= hdTotalDeletScore6_7.ClientID %>';--%>
-
-    <%--  var lbTotalLastScoreClientID = '<%= lbTotalLastScore.ClientID %>';--%>
-        var lbEvaluationResultClientID = '<%= lbEvaluationResult.ClientID %>';
-        function reloadGrid() {
-            __doPostBack(null, 'reloadGrid');
+        var lbTotalCheckScoreClientID = '<%= lbTotalCheckScore.ClientID %>';        
+        var lbEvaluationResultClientID = '<%= lbEvaluationResult.ClientID %>';        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            // F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
        }
+
        //合并列
        function onGridDataLoad(event) {
-            this.mergeColumns(['SortIndex', 'CheckItem', 'CheckMethod', 'CheckResult','BaseScore','DeletScore','GetScore'], {
+            this.mergeColumns(['SortIndex', 'CheckItem', 'CheckMethod', 'CheckResult', 'BaseScore', 'DeletScore', 'GetScore'], {
                dependsFirst: true
            });
        }
-
-        function onGridAfterEdit(event, value, params) {           
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+        function onGridAfterEdit(event, value, params) {
            var me = this, columnId = params.columnId, rowId = params.rowId;
-            if (columnId === 'DeletScore' || columnId === 'BaseScore') {
-                var baseS = me.getCellValue(rowId, 'BaseScore') * 1.0;;
-                var deleteS = me.getCellValue(rowId, 'DeletScore') * 1.0;;
+            if (columnId === 'DeletScore' || columnId === 'BaseScore' || columnId === 'IsSelect') {
+                var baseS = me.getCellValue(rowId, 'BaseScore');
+                var deleteS = me.getCellValue(rowId, 'DeletScore');
                me.updateCellValue(rowId, 'GetScore', (baseS - deleteS).toFixed(2));
            }
+
            updateSummary();
        }

        function updateSummary() {
-             var me = F(grid1ClientID), baseScoreTotal = 0, deletScoreTotal = 0, getScoreTotal = 0;
-           me.getRowEls().each(function (index, tr) {
-               baseScoreTotal += me.getCellValue(tr, 'BaseScore') * 1.0;
-               deletScoreTotal += me.getCellValue(tr, 'DeletScore') * 1.0;
-               getScoreTotal += me.getCellValue(tr, 'GetScore') * 1.0;
+            var me = F(grid1ClientID), baseScoreTotal = 0, deletScoreTotal = 0, getScoreTotal = 0;
+            me.getRowEls().each(function (index, tr) {
+                var ischecked = me.getCellValue(tr, 'IsSelect');
+                if (ischecked) {
+                    baseScoreTotal += me.getCellValue(tr, 'BaseScore');
+                    deletScoreTotal += me.getCellValue(tr, 'DeletScore');
+                    getScoreTotal += me.getCellValue(tr, 'GetScore');
+                }
            });

-           // 第三个参数 true，强制更新，不显示左上角的更改标识
-           me.updateSummaryCellValue('CheckItem', '合计分', true);
-           me.updateSummaryCellValue('BaseScore', baseScoreTotal, true);
-           me.updateSummaryCellValue('DeletScore', deletScoreTotal, true);
-           me.updateSummaryCellValue('GetScore', getScoreTotal, true);
-           
-           var pValue=((getScoreTotal  / baseScoreTotal) * 100).toFixed(2);
-           var lab100 = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100） " + pValue + "   分";
-           F(lbTotal100ScoreClientID).setValue(lab100);
+            // 第三个参数 true，强制更新，不显示左上角的更改标识
+            me.updateSummaryCellValue('CheckItem', '合计分', true);
+            me.updateSummaryCellValue('BaseScore', baseScoreTotal, true);
+            me.updateSummaryCellValue('DeletScore', deletScoreTotal, true);
+            me.updateSummaryCellValue('GetScore', getScoreTotal, true);

-        //   var lastScore = pValue - F(hdTotalDeletScore6_7ClientID).value;
-           //var lablast = "综合评定得分 = 本表得分 - 负面清单罚分 =   " + lastScore + "     分";
-           //F(lbTotalLastScoreClientID).setValue(lablast);
+            var pValue = ((getScoreTotal / baseScoreTotal) * 100).toFixed(2);
+            F(lbTotalCheckScoreClientID).setValue(pValue);

-           var str= "";
+            var str = "";
            if (pValue >= 80) {
-               str = "A级（合格）";
-           }
+                str = "A级【合格】";
+            }
            else if (pValue >= 71 && pValue <= 79) {
-               str = "B级（基本合格）";
-           }
+                str = "B级【基本合格】";
+            }
            else if (pValue <= 70) {
-               str = "C级（不合格）";
-           }
-           F(lbEvaluationResultClientID).setValue(str);
+                str = "C级【不合格】";
+            }
+            F(lbEvaluationResultClientID).setValue(str);
        }
    </script>
 </body>
@@ -74,7 +74,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
                        {
                            this.lbTotal100Score.Text = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100）       分";
                        }
-
+                        if (table1.Total100Score.HasValue)
+                        {
+                            this.lbTotalCheckScore.Text = table1.Total100Score.ToString();
+                        }
+                        else
+                        {
+                            this.lbTotalCheckScore.Text = "100";
+                        }
                        //if (table1.TotalLastScore.HasValue)
                        //{
                        //    this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 =   " + table1.TotalLastScore + "   分";
@@ -95,19 +102,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
        #region 数据绑定
        private void BindGrid()
        {
-            string strSql = @"SELECT [ID], 
-                                     [SortIndex], 
-                                     [CheckItem], 
-                                     [CheckStandard], 
-                                     [CheckMethod], 
-                                     [CheckResult], 
-                                     [BaseScore], 
-                                     [DeletScore], 
-                                     [GetScore], 
-                                     [Type], 
-                                     [CheckNoticeId]"
-                         + @" FROM ProjectSupervision_Check1"
-                         + @" WHERE Type='1' AND CheckNoticeId=@CheckNoticeId ORDER BY SortIndex";
+            string strSql = @"SELECT CheckNoticeId,ID,SortIndex,CheckItem,CheckStandard,CheckMethod,CheckResult,BaseScore,DeletScore,GetScore,Type,IsSelect
+                                          FROM ProjectSupervision_Check1
+                                    WHERE Type='1' AND CheckNoticeId=@CheckNoticeId ORDER BY SortIndex";
            SqlParameter[] parameter = new SqlParameter[]
                    {
                        new SqlParameter("@CheckNoticeId",this.CheckNoticeId),
@@ -116,29 +113,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
            this.Grid1.DataSource = tb;
            //求和
            this.OutputSummaryData(tb);
-
-            if (tb.Rows.Count == 0)
-            {
-                string strSql2 = @"SELECT [ID], 
-                                          [SortIndex], 
-                                          [CheckItem], 
-                                          [CheckStandard], 
-                                          [CheckMethod], 
-                                          [BaseScore], 
-                                          [Type], 
-                                          [Indexs],
-                                          NULL as DeletScore,
-                                          [BaseScore] AS GetScore"
-                            + @" FROM [dbo].[ProjectSupervision_CheckTemplate]"
-                            + @" WHERE Type='1' ORDER BY [Indexs]";
-                List<SqlParameter> listStr2 = new List<SqlParameter>();
-
-                SqlParameter[] parameter2 = listStr2.ToArray();
-                DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
-                this.Grid1.DataSource = tb2;
-                //求和
-                this.OutputSummaryData(tb2);
-            }
            this.Grid1.DataBind();
        }

@@ -151,35 +125,13 @@ namespace FineUIPro.Web.OfficeCheck.Check
            decimal baseScoreTotal = 0;
            decimal deletScoreTotal = 0;
            decimal getScoreTotal = 0;
-            List<string> lists = new List<string>();
            foreach (DataRow row in source.Rows)
            {
-                var checks = BLL.ProjectSupervision_Check1Service.GetCheck1ByCheckItem(row["CheckItem"].ToString(), this.CheckNoticeId);
-                if (checks != null)
+                if (row["IsSelect"].ToString() == "True")
                {
-                    if (!lists.Contains(checks.CheckItem))
-                    {
-                        baseScoreTotal += Funs.GetNewDecimalOrZero(row["BaseScore"].ToString());
-                        deletScoreTotal += Funs.GetNewDecimalOrZero(row["DeletScore"].ToString());
-                        getScoreTotal += Funs.GetNewDecimalOrZero(row["GetScore"].ToString());
-
-                        lists.Add(row["CheckItem"].ToString());
-                    }
-                }
-                else
-                {
-                    var temp = Funs.DB.ProjectSupervision_CheckTemplate.FirstOrDefault(x => x.CheckItem == row["CheckItem"].ToString() && x.Type == "1");
-                    if (temp != null)
-                    {
-                        if (!lists.Contains(temp.CheckItem))
-                        {
-                            baseScoreTotal += Funs.GetNewDecimalOrZero(row["BaseScore"].ToString());
-                            deletScoreTotal += Funs.GetNewDecimalOrZero(row["DeletScore"].ToString());
-                            getScoreTotal += Funs.GetNewDecimalOrZero(row["GetScore"].ToString());
-
-                            lists.Add(row["CheckItem"].ToString());
-                        }
-                    }
+                    baseScoreTotal += Funs.GetNewDecimalOrZero(row["BaseScore"].ToString());
+                    deletScoreTotal += Funs.GetNewDecimalOrZero(row["DeletScore"].ToString());
+                    getScoreTotal += Funs.GetNewDecimalOrZero(row["GetScore"].ToString());
                }
            }

@@ -219,44 +171,23 @@ namespace FineUIPro.Web.OfficeCheck.Check
            }
            if (this.Grid1.GetModifiedData().Count > 0)
            {
-                BLL.ProjectSupervision_Check1Service.DeleteCheckByNoticeId(this.CheckNoticeId);
-
+                //BLL.ProjectSupervision_Check1Service.DeleteCheckByNoticeId(this.CheckNoticeId);
                JArray teamGroupData = this.Grid1.GetMergedData();
                foreach (JObject teamGroupRow in teamGroupData)
                {
-                    JObject values = teamGroupRow.Value<JObject>("values");
-                    var checks = BLL.ProjectSupervision_Check1Service.GetCheck1ByCheckItem(values.Value<string>("CheckItem"), this.CheckNoticeId);
-                    if (checks == null)
-                    {
-                        Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
-                        newCheck.ID = SQLHelper.GetNewID();
-                        newCheck.SortIndex = Funs.GetNewInt(values.Value<string>("SortIndex"));
-                        newCheck.CheckItem = values.Value<string>("CheckItem");
-                        newCheck.CheckStandard = values.Value<string>("CheckStandard");
-                        newCheck.CheckMethod = values.Value<string>("CheckMethod");
-                        newCheck.CheckResult = values.Value<string>("CheckResult");
-                        newCheck.BaseScore = Funs.GetNewDecimalOrZero(values.Value<string>("BaseScore"));
-                        newCheck.DeletScore = Funs.GetNewDecimalOrZero(values.Value<string>("DeletScore"));
-                        newCheck.GetScore = Funs.GetNewDecimalOrZero(values.Value<string>("GetScore"));
-                        newCheck.Type = "1";
-                        newCheck.CheckNoticeId = this.CheckNoticeId;
-                        BLL.ProjectSupervision_Check1Service.AddCheck1(newCheck);
-                    }
-                    else
-                    {
-                        Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
-                        newCheck.ID = SQLHelper.GetNewID();
-                        newCheck.SortIndex = checks.SortIndex;
-                        newCheck.CheckItem = checks.CheckItem;
-                        newCheck.CheckStandard = values.Value<string>("CheckStandard");
-                        newCheck.CheckMethod = checks.CheckMethod;
-                        newCheck.CheckResult = checks.CheckResult;
-                        newCheck.BaseScore = checks.BaseScore;
-                        newCheck.DeletScore = checks.DeletScore;
-                        newCheck.GetScore = checks.GetScore;
-                        newCheck.Type = "1";
-                        newCheck.CheckNoticeId = this.CheckNoticeId;
-                        BLL.ProjectSupervision_Check1Service.AddCheck1(newCheck);
+                    JObject values = teamGroupRow.Value<JObject>("values"); bool isSelect = Convert.ToBoolean(values.Value<string>("IsSelect"));
+                    if (isSelect)
+                    {                   
+                        var taleItem = Funs.DB.ProjectSupervision_Check1.FirstOrDefault(x => x.ID == values.Value<string>("ID"));
+                        if (taleItem != null)
+                        {
+                            taleItem.CheckResult = values.Value<string>("CheckResult");
+                            taleItem.IsSelect = Convert.ToBoolean(values.Value<string>("IsSelect"));
+                            taleItem.BaseScore = Funs.GetNewDecimalOrZero(values.Value<string>("BaseScore"));
+                            taleItem.DeletScore = Funs.GetNewDecimalOrZero(values.Value<string>("DeletScore"));
+                            taleItem.GetScore = (taleItem.BaseScore - taleItem.DeletScore);
+                            Funs.DB.SubmitChanges();
+                        }
                    }
                }
            }
@@ -269,15 +200,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
            var tale1Item = from x in Funs.DB.ProjectSupervision_Check1 where x.CheckNoticeId == this.CheckNoticeId && x.Type == "1" orderby x.SortIndex select x;
            if (tale1Item.Count() > 0)
            {
-                List<string> lists = new List<string>();
                foreach (var item in tale1Item)
                {
-                    var result = lists.Exists(t => t == item.CheckItem);//如果是相同的检查项目，则只增加其中一条的分数
-                    if (!result)
+                    if (item.IsSelect == true)
                    {
                        totalBaseScore += item.BaseScore.Value;
                        totalDeletScore += item.DeletScore.Value;
-                        lists.Add(item.CheckItem);
                    }
                }

@@ -286,7 +214,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
                    totalGetScore = totalBaseScore - totalDeletScore;
                    decimal sS = (totalGetScore / totalBaseScore) * 100;
                    total100Score = Math.Round(sS, 2);
-                    totalLastScore = total100Score; //total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text));
+                    totalLastScore = total100Score;
                }
            }

@@ -131,6 +131,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.NumberBox txtDeletScore;

+        /// <summary>
+        /// lbTotalCheckScore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbTotalCheckScore;
+
        /// <summary>
        /// lbTotal100Score 控件。
        /// </summary>
@@ -17,6 +17,10 @@
            white-space: normal;
            word-break: break-all;
        }
+
+          .tileFont {
+            font-weight:600;
+        }
    </style>
 </head>
 <body>
@@ -25,7 +29,7 @@
        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
            <Items>
                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="300px" Title="监督检查" TitleToolTip="监督检查" ShowBorder="true"
+                    EnableCollapse="true" Width="350px" Title="监督检查" TitleToolTip="监督检查" ShowBorder="true"
                    ShowHeader="false" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="VBox" AutoScroll="true">
                    <Items>
                        <f:DatePicker ID="txtCheckStartTimeS" runat="server" Label="开始时间" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
@@ -37,7 +41,7 @@
                    </Items>
                    <Items>
                        <f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="true" Title="监督检查节点树"
-                            OnNodeCommand="tvControlItem_NodeCommand" AutoLeafIdentification="true" Height="620px"
+                            OnNodeCommand="tvControlItem_NodeCommand" AutoLeafIdentification="true" Height="650px"
                            runat="server" EnableTextSelection="true">
                        </f:Tree>
                    </Items>
@@ -48,6 +52,7 @@
                    <Toolbars>
                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                            <Items>
+                                <f:Label runat="server" ID="lb1" Text="安全检查" CssClass="tileFont"></f:Label>
                                <%--<f:Button ID="btnFind" Text="安全监督检查管理办法" Icon="Find" runat="server" OnClick="btnFind_Click">
                            </f:Button>--%>
                                <f:HiddenField runat="server" ID="hdCheckNoticeId"></f:HiddenField>
@@ -107,13 +112,6 @@
                        <f:Form ID="Form2" ShowBorder="true" ShowHeader="false" AutoScroll="true"
                            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                            <Rows>
-                                <f:FormRow >
-                                    <Items>
-                                        <f:Label ID="Label1" runat="server" Text="现场安全检查" >
-                                        </f:Label>
-                                  <%--      <f:Label ID="lblSubjectUnitId" runat="server" Label="受检对象"></f:Label>--%>
-                                    </Items>
-                                </f:FormRow>
                                <f:FormRow >
                                    <Items>
                                     <%--   <f:Label ID="lblCheckDate" runat="server" Label="生效日">
@@ -125,7 +123,9 @@
                            </Rows>
                            <Toolbars>
                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
-                                    <Items>
+                                    <Items>    
+                                        <f:Label ID="Label1" runat="server" Text="现场安全检查"  CssClass="tileFont">
+                                        </f:Label>
                                        <f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
                                        <f:Button ID="btnCheck1" Text="编辑" Icon="TableEdit" runat="server" OnClick="btnCheck1_Click" Hidden="true">
                                        </f:Button>
@@ -139,14 +139,7 @@
                    <Items>
                        <f:Form ID="Form4" ShowBorder="true" ShowHeader="false" AutoScroll="true"
                            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-                            <Rows>
-                                <f:FormRow >
-                                    <Items>
-                                        <f:Label ID="Label9" runat="server" Text="检查报告" >
-                                        </f:Label>
-                                        <%--<f:Label ID="lblCheckObject" runat="server" Label="受检对象"></f:Label>--%>
-                                    </Items>
-                                </f:FormRow>
+                            <Rows>                               
                                <f:FormRow >
                                    <Items>
                                      <%--  <f:Label ID="lblCheckStartTime" runat="server" Label="生效日">
@@ -159,6 +152,8 @@
                            <Toolbars>
                                <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
                                    <Items>
+                                          <f:Label ID="Label9" runat="server" Text="检查报告"  CssClass="tileFont">
+                                        </f:Label>
                                        <f:ToolbarFill ID="ToolbarFill4" runat="server"></f:ToolbarFill>
                                        <f:Button ID="btnCheck3" Text="编辑" Icon="TableEdit" runat="server" OnClick="btnCheck3_Click" Hidden="true">
                                        </f:Button>
@@ -172,14 +167,7 @@
                    <Items>
                        <f:Form ID="Form3" ShowBorder="true" ShowHeader="false" AutoScroll="true"
                            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-                            <Rows>
-                                <f:FormRow >
-                                    <Items>
-                                        <f:Label ID="Label5" runat="server" Text="隐患整改" >
-                                        </f:Label>
-                                     <%--   <f:Label ID="lblUnitId" runat="server" Label="受检对象"></f:Label>--%>
-                                    </Items>
-                                </f:FormRow>
+                            <Rows>                            
                                <f:FormRow >
                                    <Items>
                                <%--        <f:Label ID="lblCheckedDate" runat="server" Label="生效日">
@@ -192,6 +180,8 @@
                            <Toolbars>
                                <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
                                    <Items>
+                                          <f:Label ID="Label5" runat="server" Text="隐患整改"  CssClass="tileFont">
+                                        </f:Label>
                                        <f:ToolbarFill ID="ToolbarFill3" runat="server"></f:ToolbarFill>
                                        <f:Button ID="btnCheck2"  Text="编辑" ToolTip="编辑隐患整改" Icon="TableEdit" runat="server" OnClick="btnCheck2_Click" Hidden="true">
                                        </f:Button>
@@ -151,7 +151,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// <param name="sender"></param>
        /// <param name="e"></param>
        protected void btnEdit_Click(object sender, EventArgs e)
-        {
+        {         
            string window = String.Format("CheckNoticeEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
            PageContext.RegisterStartupScript(Window1.GetShowReference(window));
        }
@@ -300,6 +300,38 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// <param name="e"></param>
        protected void btnCheck1_Click(object sender, EventArgs e)
        {
+            var checkInfo = BLL.CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
+            if (checkInfo != null)
+            {
+                var getCheckCount = Funs.DB.ProjectSupervision_Check1.Where(x => x.CheckNoticeId == this.CheckNoticeId).Count();
+                if (getCheckCount == 0)
+                {
+                    ////增加明细
+                    var checkTemplate = from x in Funs.DB.ProjectSupervision_CheckTemplate where x.Type == "1" select x;
+                    if (checkTemplate.Count() > 0)
+                    {
+                        foreach (var item in checkTemplate)
+                        {
+                            Model.ProjectSupervision_Check1 check1 = new Model.ProjectSupervision_Check1
+                            {
+                                CheckNoticeId = this.CheckNoticeId,
+                                ID = SQLHelper.GetNewID(),
+                                SortIndex = item.SortIndex,
+                                CheckItem = item.CheckItem,
+                                CheckStandard = item.CheckStandard,
+                                CheckMethod = item.CheckMethod,
+                                BaseScore = item.BaseScore,
+                                DeletScore = 0,
+                                GetScore = item.BaseScore,
+                                Type = item.Type
+                            };
+                            Funs.DB.ProjectSupervision_Check1.InsertOnSubmit(check1);
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
+            }
+
            string window = String.Format("CheckContentEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
            PageContext.RegisterStartupScript(Window2.GetShowReference(window));
        }
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar2;

+        /// <summary>
+        /// lb1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lb1;
+
        /// <summary>
        /// hdCheckNoticeId 控件。
        /// </summary>
@@ -221,15 +230,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Form Form2;

-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
        /// <summary>
        /// lblResult 控件。
        /// </summary>
@@ -248,6 +248,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;

+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
        /// <summary>
        /// ToolbarFill2 控件。
        /// </summary>
@@ -284,15 +293,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Form Form4;

-        /// <summary>
-        /// Label9 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label9;
-
        /// <summary>
        /// lblCheckReportResult 控件。
        /// </summary>
@@ -311,6 +311,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar4;

+        /// <summary>
+        /// Label9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label9;
+
        /// <summary>
        /// ToolbarFill4 控件。
        /// </summary>
@@ -347,15 +356,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Form Form3;

-        /// <summary>
-        /// Label5 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label5;
-
        /// <summary>
        /// lblCheckResult 控件。
        /// </summary>
@@ -374,6 +374,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar3;

+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label5;
+
        /// <summary>
        /// ToolbarFill3 控件。
        /// </summary>
@@ -195,7 +195,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
            }

            //SaveGrid1();
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
        }

        #region 获取按钮权限
@@ -33,7 +33,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile

            ContractId = Request.Params["ContractId"];

-            GridTable.Columns.Add("Id");
+            GridTable.Columns.Add("Id"); 
+            GridTable.Columns.Add("SerialNumber");
            ListItem[] list = new ListItem[8];
            list[0] = new ListItem("主项号", "MainItemCode");
            list[1] = new ListItem("主项名称", "MainItemName");
@@ -316,6 +317,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                   foreach (var item in sublist)
                    {
                        DataRow row = tempTable.NewRow();
+                        row["SerialNumber"] = item.SerialNumber;
                        row["Id"] = item.Id;
                        row["MainItemCode"] = item.MainItemCode;
                        row["MainItemName"] = item.MainItemName;
@@ -362,7 +364,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                    GridTable.Rows.Add(newRow);
                }
                Grid1.RecordCount = count;
-                Grid1.DataSource = GridTable;
+                Grid1.DataSource = GridTable.AsEnumerable().OrderBy(x => x["SerialNumber"].ToString(), new CustomComparer());;
                Grid1.DataBind();
            }
        } 
@@ -48,8 +48,9 @@
                                <f:DatePicker ID="txtPlanDate" runat="server" Label="制定日期" LabelWidth="90px"
                                        EnableEdit="true">
                                </f:DatePicker>
-                                <f:DropDownList ID="drpPlanMan" runat="server" Label="制定人" EnableEdit="true" LabelWidth="90px">
-                                </f:DropDownList>
+                                <f:TextBox ID="PlanManName" runat="server" Label="制定人" LabelWidth="90px">
+                                </f:TextBox>
+                                <f:TextBox ID="PlanManId" runat="server" Hidden="true"></f:TextBox>
                            </Items>
                        </f:FormRow>
                            <f:FormRow>
@@ -40,14 +40,16 @@ namespace FineUIPro.Web.PersonManage.Test
                this.TestPlanId = Request.Params["TestPlanId"];
                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                Funs.FineUIPleaseSelect(this.drpUserType);
-                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpPlanMan, this.CurrUser.LoginProjectId, null, null, true);
+               // Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpPlanMan, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, null, true);
                TestTrainingService.InitTestTrainingDropDownList(this.drpTraining, true);
                var getTestPlan = ServerTestPlanService.GetTestPlanById(this.TestPlanId);
                if (getTestPlan != null)
                {
                    this.txtPlanCode.Text = getTestPlan.PlanCode;
                    this.txtPlanName.Text = getTestPlan.PlanName;
-                    this.drpPlanMan.SelectedValue = getTestPlan.PlanManId;
+                    this.PlanManName.Text =Person_PersonsService.GetPersonsNameById( getTestPlan.PlanManId);
+                    this.PlanManId.Text = getTestPlan.PlanManId;
+
                    this.txtPlanDate.Text = string.Format("{0:yyyy-MM-dd}", getTestPlan.PlanDate);
                    this.txtTestStartTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", getTestPlan.TestStartTime);
                    this.txtTestEndTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", getTestPlan.TestEndTime);
@@ -68,7 +70,8 @@ namespace FineUIPro.Web.PersonManage.Test
                {
                    this.txtPlanName.Text = DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString("00") + "知识竞赛考试";
                    this.txtPlanDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.drpPlanMan.SelectedValue = this.CurrUser.PersonId;
+                    this.PlanManName.Text = this.CurrUser.PersonName;
+                    this.PlanManId.Text = this.CurrUser.PersonId;
                    this.txtTestStartTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddDays(1));
                    this.txtTestEndTime.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddDays(2));
                    this.txtSValue.Text = "2";
@@ -286,11 +289,9 @@ namespace FineUIPro.Web.PersonManage.Test
                SValue = Funs.GetNewInt(this.txtSValue.Text),
                MValue = Funs.GetNewInt(this.txtMValue.Text),
                JValue = Funs.GetNewInt(this.txtJValue.Text),
+                PlanManId=this.PlanManId.Text,
            };
-            if (this.drpPlanMan.SelectedValue != BLL.Const._Null)
-            {
-                newTestPlan.PlanManId = this.drpPlanMan.SelectedValue;
-            }
+         
            newTestPlan.States = Const.State_0;
            if (type == Const.BtnSubmit)
            {
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.PersonManage.Test {
-    
-    
-    public partial class TestPlanEdit {
-        
+namespace FineUIPro.Web.PersonManage.Test
+{
+
+
+    public partial class TestPlanEdit
+    {
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-        
+
        /// <summary>
        /// SimpleForm2 控件。
        /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Form SimpleForm2;
-        
+
        /// <summary>
        /// txtPlanCode 控件。
        /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtPlanCode;
-        
+
        /// <summary>
        /// txtPlanName 控件。
        /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtPlanName;
-        
+
        /// <summary>
        /// txtTestStartTime 控件。
        /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtTestStartTime;
-        
+
        /// <summary>
        /// txtTestEndTime 控件。
        /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtTestEndTime;
-        
+
        /// <summary>
        /// txtDuration 控件。
        /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtDuration;
-        
+
        /// <summary>
        /// txtTestPalce 控件。
        /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtTestPalce;
-        
+
        /// <summary>
        /// txtPlanDate 控件。
        /// </summary>
@@ -110,16 +112,25 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtPlanDate;
-        
+
        /// <summary>
-        /// drpPlanMan 控件。
+        /// PlanManName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUIPro.DropDownList drpPlanMan;
-        
+        protected global::FineUIPro.TextBox PlanManName;
+
+        /// <summary>
+        /// PlanManId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox PlanManId;
+
        /// <summary>
        /// txtSValue 控件。
        /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtSValue;
-        
+
        /// <summary>
        /// txtMValue 控件。
        /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtMValue;
-        
+
        /// <summary>
        /// txtJValue 控件。
        /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtJValue;
-        
+
        /// <summary>
        /// lbm 控件。
        /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label lbm;
-        
+
        /// <summary>
        /// SimpleForm1 控件。
        /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Form SimpleForm1;
-        
+
        /// <summary>
        /// Toolbar2 控件。
        /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar2;
-        
+
        /// <summary>
        /// ToolbarFill1 控件。
        /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
        /// <summary>
        /// btnSave 控件。
        /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSave;
-        
+
        /// <summary>
        /// btnSubmit 控件。
        /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSubmit;
-        
+
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnClose;
-        
+
        /// <summary>
        /// hdTestPlanTrainingId 控件。
        /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.HiddenField hdTestPlanTrainingId;
-        
+
        /// <summary>
        /// drpUserType 控件。
        /// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpUserType;
-        
+
        /// <summary>
        /// drpTraining 控件。
        /// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpTraining;
-        
+
        /// <summary>
        /// txtTestType1Count 控件。
        /// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtTestType1Count;
-        
+
        /// <summary>
        /// txtTestType2Count 控件。
        /// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtTestType2Count;
-        
+
        /// <summary>
        /// txtTestType3Count 控件。
        /// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.NumberBox txtTestType3Count;
-        
+
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-        
+
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@@ -281,7 +292,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;
-        
+
        /// <summary>
        /// btnSure 控件。
        /// </summary>
@@ -290,7 +301,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSure;
-        
+
        /// <summary>
        /// Menu1 控件。
        /// </summary>
@@ -299,7 +310,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Menu Menu1;
-        
+
        /// <summary>
        /// btnMenuEdit 控件。
        /// </summary>
@@ -308,7 +319,7 @@ namespace FineUIPro.Web.PersonManage.Test {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
        /// <summary>
        /// btnMenuDelete 控件。
        /// </summary>
@@ -319,20 +319,26 @@ namespace FineUIPro.Web

                }
                this.drpProject.DataValueField = "ProjectId";
-                this.drpProject.DataTextField = "ShortName";
+                this.drpProject.DataTextField = "ShortName";               
                var projectlist =ProjectService.GetSortIndexProjectByUserIdDropDownList(this.CurrUser.PersonId);
                this.drpProject.DataSource = projectlist;
                this.drpProject.DataBind();

                if (!string.IsNullOrEmpty(Request.Params["projectId"]))
                {
-                    Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
-                    if (!projectlist.Contains(project))
+                    var getp = projectlist.FirstOrDefault(x => x.ProjectId == Request.Params["projectId"]);
+                    if (getp == null)
                    {
-                        projectlist.Add(project);
-                        this.drpProject.DataSource = projectlist;
-                        this.drpProject.DataBind();
+                        Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
+                        if (project != null)
+                        {
+                            projectlist.Add(project);
+                            this.drpProject.Items.Clear();
+                            this.drpProject.DataSource = projectlist;
+                            this.drpProject.DataBind();
+                        }
                    }
+                  
                    this.drpProject.SelectedValue = Request.Params["projectId"];
                }

@@ -0,0 +1,60 @@
+ 
+function parse(y) {
+    var box = document.getElementById("box");
+    //获取进度条div的宽度
+    var x = box.style.width;
+    x = parseInt(x) + 1;
+    y = y + 1;
+    //将y值加上百分号赋值给box的宽度。这样每次+1就可以实现进度条占父容器的100%;
+    box.style.width = y + "%";
+    //将y值加上百分号并赋值给显示下载百分比的div上
+    document.getElementById("box").innerHTML = y + "%";
+    //判断当y已经100的时候，也就是进度条的宽度和父容器的宽度一致的时候停止。
+    if (y >= 100) {
+
+        document.getElementById("box").innerHTML = "100%";
+    }
+}
+
+
+
+ 
+
+function printX() { 
+    var userid = document.getElementById('id-inputEl').value;
+    F.ui.Window2.show();
+    parse(0);
+    var begin = setInterval(function () {
+        PageMethods.getPercent(userid,function (result) {
+            parse(result);
+            if (result >= 100) {
+                F.ui.Window2.hide();
+                clearInterval(begin); 
+                print();
+            }
+        });
+    }, 1000 );
+    y = 0;
+  
+
+} 
+function print() {
+    PageMethods.
+    setTimeout(function () {
+        var message = document.getElementById('message-inputEl').value;
+        console.log(message);
+        notify(message);
+    }, 1000); // 1000毫秒，即1秒
+}
+// 通知框
+function notify(msg) {
+    F.notify({
+        message: msg,
+        messageIcon: 'information',
+        target: '_top',
+        header: false,
+        displayMilliseconds: 3 * 1000,
+        positionX: 'center',
+        positionY: 'center'
+    });
+}