提交代码

SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs

@@ -1317,11 +1317,12 @@ namespace FineUIPro.Web.CQMS.Performance
             if (e.EventArgument == "Confirmgd_OK")
             {
                 // 根据日期查询是否有数据
-                var modelSum = Funs.DB.CQMS_Performance.Where(x => x.CreateDateMonth == drpCompileDateMonth.Text.Trim()).FirstOrDefault();
+                var modelSum = Funs.DB.CQMS_Performance.Where(x => x.CreateDateMonth == drpCompileDateMonth.Text.Trim()
+                && x.ProjectId == CurrUser.LoginProjectId && x.CreateMan == CreateUser).FirstOrDefault();
                 if (modelSum != null)
                 {
                     //删除数据
-                    PerformanceService.Delete(modelSum.CreateDateMonth);
+                    PerformanceService.Delete(modelSum.PerformanceGid);
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PerformanceEdit.aspx?CreateDateMonth="
                         + drpCompileDateMonth.Text.Trim(), ""), "新增", Unit.Parse("1000px"), Unit.Parse("800px")));
                 }

SGGL/FineUIPro.Web/CQMS/Performance/PerformanceSubmit.aspx

@@ -18,8 +18,8 @@
              <Rows>
                  <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpUser" runat="server" EnableEdit="false" Label="选择审核人"
-                                    ForceSelection="false" 
+                        <f:DropDownList ID="drpUser" runat="server" EnableEdit="true" Label="选择审核人"
+                                    ForceSelection="false" AutoSelectFirstItem="false" 
                                   AutoPostBack="true" >
                                 </f:DropDownList>
 

SGGL/FineUIPro.Web/CQMS/Performance/PerformanceSubmit.aspx.cs

@@ -51,7 +51,10 @@ namespace FineUIPro.Web.CQMS.Performance
                 PerformanceGid = Request.Params["PerformanceGid"];
                 CreateDateMonth = Request.Params["CreateDateMonth"];
                 //加载当前项目下的审核人
-                UserService.InitUserDropDownList(drpUser, CurrUser.LoginProjectId, true);
+                //UserService.InitUserDropDownList(drpUser, CurrUser.LoginProjectId, true);
+
+                //施工经理
+                UserService.InitUserProjectIdRoleIdDropDownList(drpUser, CurrUser.LoginProjectId, Const.ConstructionManager, false);
             }
         }