提交代码

SGGL/BLL/BLL.csproj

@@ -96,7 +96,6 @@
     <Compile Include="API\APIUnitService.cs" />
     <Compile Include="API\APIUpLoadFileService.cs" />
     <Compile Include="API\APIUserService.cs" />
-    <Compile Include="API\CQMS\Performance\PerformanceService.cs" />
     <Compile Include="API\HJGL\APIGetHJDataService.cs" />
     <Compile Include="API\HJGL\APIHotProcessHardService.cs" />
     <Compile Include="API\HJGL\APINDETrustService.cs" />
@@ -259,6 +258,7 @@
     <Compile Include="CQMS\ManageReport\RowMaterialProblemService.cs" />
     <Compile Include="CQMS\ManageReport\ThisWeekOrMonthContentService.cs" />
     <Compile Include="CQMS\ManageReport\WeekAndMonthReportService.cs" />
+    <Compile Include="CQMS\Performance\PerformanceService.cs" />
     <Compile Include="CQMS\ProcessControl\HotProessManageService.cs" />
     <Compile Include="CQMS\ProcessControl\InspectionManagementDetailService.cs" />
     <Compile Include="CQMS\ProcessControl\InspectionManagementService.cs" />
@@ -1061,6 +1061,7 @@
       <Version>4.7.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SGGL/BLL/CQMS/Performance/PerformanceService.cs

@@ -12,25 +12,25 @@ namespace BLL
         /// 根据年月删除
         /// </summary>
         /// <param name="CreateDateMonth"></param>
-        public static void Delete(string CreateDateMonth)
+        public static void Delete(string Gid)
         {
             Model.SGGLDB db = Funs.DB;
-            List<Model.CQMS_Performance> list = db.CQMS_Performance.Where(e => e.CreateDateMonth == CreateDateMonth).ToList();
+            List<Model.CQMS_Performance> list = db.CQMS_Performance.Where(e => e.PerformanceGid == Gid).ToList();
             if (list.Count > 0)
             {
                 ///删除主表记录
                 db.CQMS_Performance.DeleteAllOnSubmit(list);
 
                 //删除子表1数据
-                var child1List = db.CQMS_Performance_Child1.Where(x => x.PerformanceGid == list[0].PerformanceGid).ToList();
+                var child1List = db.CQMS_Performance_Child1.Where(x => x.PerformanceGid == Gid).ToList();
                 if (child1List.Count > 0)
                 {
                     //删除子表2数据
-                    var child2List = db.CQMS_Performance_Child2.Where(x => x.PerformanceGid == list[0].PerformanceGid).ToList();
+                    var child2List = db.CQMS_Performance_Child2.Where(x => x.PerformanceGid == Gid).ToList();
                     if (child2List.Count > 0)
                     {
                         //删除子表3数据
-                        var child3List = db.CQMS_Performance_Child3.Where(x => x.PerformanceGid == list[0].PerformanceGid).ToList();
+                        var child3List = db.CQMS_Performance_Child3.Where(x => x.PerformanceGid == Gid).ToList();
                         if (child3List.Count > 0)
                         {
                             db.CQMS_Performance_Child3.DeleteAllOnSubmit(child3List);

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="选择审核人"
+                        <f:DropDownList ID="drpUser" runat="server" EnableEdit="true" Label="选择审核人"
-                                    ForceSelection="false" 
+                                    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);
             }
         }