1

2026-03-06 17:58:48 +08:00
parent 393e451064
commit adedb7e83d
102 changed files with 13691 additions and 271 deletions
@@ -31,8 +31,14 @@
                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                LabelAlign="right">
                            </f:TextBox>
+                            <f:RadioButtonList runat="server" ID="rbSource" Width="220px" Label="来源" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="全部" Value="0" Selected="true" />
+                                    <f:RadioItem Text="系统内单位" Value="1" />
+                                </f:RadioButtonList>
                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
                            </f:ToolbarFill>
+
                            <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
                                runat="server">
                            </f:Button>                   
@@ -74,6 +80,9 @@
                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
                        TextAlign="Left">
                    </f:RenderField>
+                    <f:RenderField Width="140px" ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
+    TextAlign="Left">
+</f:RenderField>
                </Columns>
                <Listeners>
                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -1,4 +1,5 @@
 using BLL;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -60,7 +61,7 @@ namespace FineUIPro.Web.HSSE.Meeting
        private void BindGrid()
        {
            string strSql = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS   ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
-                + @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.PersonName,Users.PersonName)+']提交' WHEN ClassMeeting.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS  FlowOperateName"
+                + @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.PersonName,Users.PersonName)+']提交' WHEN ClassMeeting.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS  FlowOperateName,ClassMeeting.Remark"
                + @" FROM Meeting_ClassMeeting AS ClassMeeting "
                + @"  LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
                + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
@@ -85,6 +86,11 @@ namespace FineUIPro.Web.HSSE.Meeting
                strSql += " AND ClassMeetingName LIKE @ClassMeetingName";
                listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%"));
            }
+            if (this.rbSource.SelectedValue == "1")
+            {
+                strSql += " AND ClassMeeting.Remark LIKE @Remark ";
+                listStr.Add(new SqlParameter("@Remark", "%#%"));
+            }
            SqlParameter[] parameter = listStr.ToArray();
            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

@@ -294,5 +300,31 @@ namespace FineUIPro.Web.HSSE.Meeting
            Response.End();
        }
        #endregion
+
+        #region 分包会议数据推送至总包单位
+
+        /// <summary>
+        /// 分包会议数据推送至总包单位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPush_Click(object sender, EventArgs e)
+        {
+            ReturnData responeData = APIMeetingSyncService.PushClassMeetingLists(this.ProjectId, string.Empty);
+            //if (responeData.code == 0)
+            //{
+            //    Alert.ShowInTop(responeData.message, MessageBoxIcon.Warning);
+            //}
+            //else
+            //{
+            //    ShowNotify(responeData.message, MessageBoxIcon.Success);
+            //}
+            //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            ShowNotify(responeData.message, responeData.code == 0 ? MessageBoxIcon.Warning : MessageBoxIcon.Success);
+            return;
+        }
+
+        #endregion
+
    }
 }
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.HSSE.Meeting {
        /// </remarks>
        protected global::FineUIPro.TextBox txtClassMeetingName;
        
+        /// <summary>
+        /// rbSource 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbSource;
+        
        /// <summary>
        /// ToolbarFill1 控件。
        /// </summary>
@@ -128,6 +128,12 @@ namespace FineUIPro.Web.HSSE.Meeting
        protected void btnSave_Click(object sender, EventArgs e)
        {
            this.SaveData(BLL.Const.BtnSave);
+            var porject = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
+            if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
+            {//项目关联了总包单位项目，保存成功后自动推送至总包单位
+                APIMeetingSyncService.PushClassMeetingLists(this.ProjectId, this.ClassMeetingId);
+            }
+
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
        }