1

2026-04-10 17:55:49 +08:00
parent 0d2b67dc72
commit 0dcdd1474a
37 changed files with 1550 additions and 156 deletions
@@ -11,7 +11,7 @@
        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="岗位信息" ShowHeader="false"
            Layout="HBox">
-            <Items>
+            <items>
                <f:Grid ID="Grid1" Title="岗位信息" ShowHeader="false" EnableCollapse="true" PageSize="20"
                    EnableColumnLines="true" ShowBorder="true" AllowPaging="true" IsDatabasePaging="true"
                    runat="server" Width="750px" DataKeyNames="WorkPostId" DataIDField="WorkPostId" AllowSorting="true"
@@ -53,6 +53,10 @@
                        RendererFunction="renderIsHsse" HeaderText="质量管理" HeaderTextAlign="Center"
                        TextAlign="Center">
                    </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="IsCQMSCheck" DataField="IsCQMSCheck" FieldType="Boolean"
+                            RendererFunction="renderIsHsse" HeaderText="质量报验" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
                        <f:TemplateField Width="120px" HeaderText="对口专业" HeaderTextAlign="Center" TextAlign="Center">
                            <ItemTemplate>
                                <asp:Label ID="Label4" runat="server" Text='<%# ConvertCNCodes(Eval("CNCodes")) %>'></asp:Label>
@@ -101,6 +105,8 @@
                        </f:CheckBox>                          
                               <f:CheckBox ID="ckbIsCQMS" runat="server" Label="质量管理" LabelAlign="Right" LabelWidth="80px">
                    </f:CheckBox>
+                        <f:CheckBox ID="ckbIsCQMSCheck" runat="server" Label="质量报验" LabelAlign="Right" LabelWidth="80px">
+                        </f:CheckBox>
                        <f:DropDownBox runat="server" Label="对口专业" ID="txtCNCodes" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="true" LabelWidth="80px">
                            <PopPanel>
                                <f:Grid ID="gvCNCodes" DataIDField="CNProfessionalId" ForceFit="true"
@@ -146,7 +152,7 @@
                        </f:Toolbar>
                    </Toolbars>
                </f:SimpleForm>
-            </Items>
+            </items>
        </f:Panel>
        <f:Window ID="Window1" Title="单位合并" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="false"
@@ -186,6 +192,7 @@
        var drpPostTypeClientID = '<%= drpPostType.ClientID %>';
        var ckbIsHsseClientID = '<%= ckbIsHsse.ClientID %>';
        var ckbIsCQMSClientID = '<%= ckbIsCQMS.ClientID %>';
+        var ckbIsCQMSCheckClientID = '<%= ckbIsCQMSCheck.ClientID %>';
        var txtCNCodesClientID = '<%= txtCNCodes.ClientID %>';
        var txtRemarkClientID = '<%=txtRemark.ClientID %>';

@@ -204,6 +211,7 @@
            F(drpPostTypeClientID).setValue(rowValue['PostType']);
            F(ckbIsHsseClientID).setValue(rowValue['IsHsse']);
            F(ckbIsCQMSClientID).setValue(rowValue['IsCQMS']);
+            F(ckbIsCQMSCheckClientID).setValue(rowValue['IsCQMSCheck']);
            F(txtCNCodesClientID).setValue(rowValue['CNCodes']);
            F(txtRemarkClientID).setValue(rowValue['Remark']);

@@ -33,7 +33,7 @@ namespace FineUIPro.Web.BaseInfo
        /// </summary>
        private void BindGrid()
        {
-            string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.CNCodes,
+            string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.CNCodes,wp.IsCQMSCheck,
                                            case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
                                            FROM dbo.Base_WorkPost AS wp
                                            LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' " +
@@ -170,6 +170,10 @@ namespace FineUIPro.Web.BaseInfo
                {
                    this.ckbIsCQMS.Checked = true;
                }
+                if (workPost.IsCQMSCheck == true)
+                {
+                    this.ckbIsCQMSCheck.Checked = true;
+                }
                if (!string.IsNullOrEmpty(workPost.CNCodes))
                {
                    txtCNCodes.Values = workPost.CNCodes.Split(',');
@@ -210,6 +214,7 @@ namespace FineUIPro.Web.BaseInfo
                PostType = this.drpPostType.SelectedValue,
                IsHsse = Convert.ToBoolean(this.ckbIsHsse.Checked),
                IsCQMS = Convert.ToBoolean(this.ckbIsCQMS.Checked),
+                IsCQMSCheck = Convert.ToBoolean(this.ckbIsCQMSCheck.Checked),
                CNCodes = string.Join(",", txtCNCodes.Values),
                Remark = txtRemark.Text.Trim()
            };
@@ -282,6 +287,16 @@ namespace FineUIPro.Web.BaseInfo

        #endregion

+        /// <summary>
+        /// 关闭导入弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
        #region 验证岗位名称、编号是否存在
        /// <summary>
        /// 验证岗位名称、编号是否存在
@@ -201,6 +201,15 @@ namespace FineUIPro.Web.BaseInfo {
        /// </remarks>
        protected global::FineUIPro.CheckBox ckbIsCQMS;
        
+        /// <summary>
+        /// ckbIsCQMSCheck 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckbIsCQMSCheck;
+        
        /// <summary>
        /// txtCNCodes 控件。
        /// </summary>