0414-001

2022-04-14 11:15:34 +08:00
parent 274010da92
commit 8e73412eb6
49 changed files with 1609 additions and 2301 deletions
@@ -154,6 +154,8 @@
            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
                Hidden="true" runat="server" Text="编辑" Icon="Pencil">
            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
        </f:Menu>
    </form>
    <script type="text/jscript">
@@ -99,6 +99,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
                {
                    this.btnMenuEdit.Hidden = false;
                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
            }
        }
        #endregion
@@ -109,7 +113,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        protected void btnMenuDel_Click(object sender, EventArgs e)
        {
            this.DeleteData();
        }
@@ -125,19 +129,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                {
                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var user = BLL.UserService.GetUserByUserId(rowID);
-                    if (user != null)
+                    var gjsx = BLL.GJSXService.GetGJSXById(rowID);
+                    if (gjsx != null)
                    {
-                        string cont = judgementDelete(rowID);
-                        if (string.IsNullOrEmpty(cont))
-                        {
-                            BLL.LogService.AddSys_Log(this.CurrUser, user.UserCode, user.UserId, BLL.Const.GJSXMenuId, BLL.Const.BtnDelete);
-                            BLL.GJSXService.DeleteGJSXById(rowID);
-                        }
-                        else
-                        {
-                            strShowNotify += "人员：" + user.UserName + cont;
-                        }
+                        BLL.LogService.AddSys_Log(this.CurrUser, gjsx.Detail, gjsx.GJSXID, BLL.Const.GJSXMenuId, BLL.Const.BtnDelete);
+                        BLL.GJSXItemService.DeleteGJSXMXByGJSXID(rowID);
+                        BLL.GJSXProcessService.DeleteProcess(rowID);
+                        BLL.GJSXService.DeleteGJSXById(rowID);
                    }
                }

@@ -137,5 +137,14 @@ namespace FineUIPro.Web.PZHGL.GJSX {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
    }
 }
@@ -446,7 +446,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
                gjsx.Detail = txtDetail.Text;
                gjsx.UserID = BLL.UserService.GetUserByUserName(txtUserID.Text).UserId;
                gjsx.CreateDate = DateTime.Parse(this.Date_CreateDate.Text);
-                gjsx.CNProfessional_ID = this.DropCNProfessional_ID.SelectedValue;
                gjsx.ProjectId = this.CurrUser.LoginProjectId;
                gjsx.UnitId = this.DropUnitId.SelectedValue;
                gjsx.State = state;