202306131、新增项目级消息待办页面功能。2、新增项目单位是否同步实名制设置功能。3、优化考试合格自动生成卡号功能。

2023-06-13 16:30:08 +08:00
parent 3c887b46d1
commit 7a2a8ffb93
37 changed files with 805 additions and 194 deletions
@@ -197,6 +197,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                    isAgree = false;
                    NowFlow.Opinion = this.rblIsAgree.SelectedItem.Text + "，"+ this.txtOpinion.Text;
                    getCost.States = BLL.Const.State_0;
+                    getCost.NextManId = getCost.CompileMan;
                    BLL.CostManageService.UpdateCostManage(getCost);
                    CostManageService.updateOpenCostManageFlowOperate(this.CostManageId);
                }
@@ -208,9 +209,13 @@ namespace FineUIPro.Web.HSSE.CostGoods
                    {
                        NextFlow.OperaterId = this.drpNextMan.SelectedValue;
                        BLL.CostManageService.updateCostManageFlowOperate(NextFlow);
+
+                        getCost.NextManId = this.drpNextMan.SelectedValue;
+                        BLL.CostManageService.UpdateCostManage(getCost);                       
                    }
                    else
                    {
+                        getCost.NextManId = null;
                        getCost.States = BLL.Const.State_2;
                        BLL.CostManageService.UpdateCostManage(getCost);
                    }
@@ -313,7 +313,12 @@ namespace FineUIPro.Web.HSSE.CostGoods
            if (type == Const.BtnSubmit)
            {
                costManage.States = BLL.Const.State_1;
-            }         
+                costManage.NextManId = this.drpNextMan.SelectedValue;
+            }
+            else
+            {
+                costManage.NextManId = costManage.CompileMan;
+            }

           var getCost= CostManageService.GetCostManageById(this.CostManageId);
            if (getCost != null)
@@ -110,6 +110,8 @@
                                        </f:Button>
                                        <f:Button ID="btnQR" ToolTip="批量生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
                                        </f:Button>
+                                             <f:Button ID="btnRefresh" ToolTip="刷卡号" Icon="ArrowRefresh" runat="server" Hidden="true" OnClick="btnRefresh_Click">
+                                </f:Button>
                                    </Items>
                                </f:Toolbar>
                            </Toolbars>
@@ -70,6 +70,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                BLL.WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
                this.InitTreeMenu();//加载树
+                if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
+                {
+                    this.btnRefresh.Hidden = false;
+                }
            }
        }

@@ -726,5 +730,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/ProjectPersonView.aspx?SitePersonId={0}", this.SitePersonId, "查看 - ")));
            }
        }
+
+        protected void btnRefresh_Click(object sender, EventArgs e)
+        {
+           int count = GetDataService.SendCarNo(this.ProjectId);
+            Alert.ShowInTop("刷新完成"+ count.ToString()+"条。", MessageBoxIcon.Success);
+        }
    }
 }
@@ -248,6 +248,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
        /// </remarks>
        protected global::FineUIPro.Button btnQR;

+        /// <summary>
+        /// btnRefresh 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRefresh;
+
        /// <summary>
        /// lbIsPost 控件。
        /// </summary>