20241203 质量事件报告

FCL/FineUIPro.Web/AttachFile/webuploader2.aspx

@@ -28,7 +28,7 @@
             EnableCollapse="false" EnableCheckBoxSelect="false" EmptyText="File not uploaded"
             DataIDField="id" OnRowCommand="Grid1_RowCommand">
             <Toolbars>
-                <f:Toolbar runat="server">
+                <f:Toolbar ID="Toolbar1" runat="server">
                     <Items>
                         <f:Button ID="btnSelectFiles" Text="Select file upload" IconFont="Plus" runat="server" EnablePostBack="false">
                         </f:Button>

FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.cs

@@ -61,9 +61,20 @@ namespace FineUIPro.Web.AttachFile
                 
                 Session[sessionName] = null;
                 ToKeyId = Request.QueryString["toKeyId"];
+                if (!string.IsNullOrEmpty(Request.QueryString["strParam"]))
+                {
+                    this.ToKeyId = this.ToKeyId + "#" + Request.QueryString["strParam"];
+                }
                 AttachPath = Request.QueryString["path"];
                 ParamStr = sessionName + "|" + AttachPath;
                 MenuId = Request.QueryString["menuId"];
+
+                string t = Request.QueryString["type"];
+                if (t == "-1")
+                {
+                    this.Toolbar1.Hidden = true;
+                    this.Grid1.Columns[4].Hidden = true;
+                }
                 BindGrid();
             }
             else

FCL/FineUIPro.Web/AttachFile/webuploader2.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.AttachFile {
+namespace FineUIPro.Web.AttachFile
+{
 
 
-    public partial class webuploader2 {
+    public partial class webuploader2
+    {
 
         /// <summary>
         /// form1 控件。
@@ -39,6 +41,15 @@ namespace FineUIPro.Web.AttachFile {
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
 
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
         /// <summary>
         /// btnSelectFiles 控件。
         /// </summary>

FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx.cs

@@ -53,17 +53,10 @@ namespace FineUIPro.Web.ContractorQuality
                            where Flag='2'  ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
-            var departleader = BLL.DepartService.GetDepartByLeader(this.CurrUser.UserId);
-
             if (this.CurrUser.UserId == BLL.Const.GlyId || role.RoleName.Contains("Contractor_Leader") || role.RoleName.Contains("CTE/D Manager"))
             {
                 this.rblState.Hidden = true;
             }
-            else if (departleader != null)
-            {
-                this.rblState.Hidden = true;
-                strSql += " and d.DepartLeader='" + this.CurrUser.UserId + "'";
-            }
             else
             {
                 if (rblState.SelectedValue == "1")

FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx

@@ -54,6 +54,7 @@
                                                         <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach_Click">
                                                         </f:Button>
                                                         <f:Label ID="lblTips" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
+                                                        <f:LinkButton ID="lbtnViewAttach" runat="server" Text="查看" OnClick="lbtnViewAttach_Click"></f:LinkButton>
                                                     </Items>
                                                 </f:Panel>
                                             </Items>
@@ -176,6 +177,7 @@
                                                         <f:Button ID="btnAttach2" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
                                                         </f:Button>
                                                         <f:Label ID="Label6" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>                                                        
+                                                        <f:LinkButton ID="lbtnViewAttach2" runat="server" Text="查看" OnClick="lbtnViewAttach2_Click"></f:LinkButton>  
                                                     </Items>
                                                 </f:Panel>
                                             </Items>
@@ -277,6 +279,7 @@
                                                         <f:Button ID="btnAttach3" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
                                                         </f:Button>
                                                         <f:Label ID="Label8" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>                                                        
+                                                        <f:LinkButton ID="lbtnAttach3" runat="server" Text="查看" OnClick="lbtnViewAttach2_Click"></f:LinkButton>
                                                     </Items>
                                                 </f:Panel>
                                             </Items>

FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs

@@ -174,7 +174,8 @@ namespace FineUIPro.Web.ContractorQuality
                                     this.btnSave.Hidden = false;
                                     this.btnSbumit.Hidden = false;
                                     this.btnNoPass.Hidden = false;//拒绝按钮
-                                    GroupPanel1.Enabled = false;
+                                    //GroupPanel1.Enabled = false;
+                                    GroupPanel1Enabled();
                                     GroupPanel2.Hidden = false;
                                     if (pun.SeType == "1")//服务
                                     {
@@ -239,7 +240,8 @@ namespace FineUIPro.Web.ContractorQuality
                             }
                             else if (pun.States == "2") //框架合同：主协调员办理，非框架合同：需求人办理
                             {
-                                GroupPanel1.Enabled = false;
+                                //GroupPanel1.Enabled = false;
+                                GroupPanel1Enabled();
                                 GroupPanel2.Hidden = false;
                                 GroupPanel2.Enabled = false;
                                 GroupPanel3.Hidden = false;
@@ -292,20 +294,24 @@ namespace FineUIPro.Web.ContractorQuality
                             }
                             else if (pun.States == "3" && pun.IsFrame == true)//用户部门填写
                             {
-                                GroupPanel1.Enabled = false;
+                                //GroupPanel1.Enabled = false;
+                                GroupPanel1Enabled();
                                 GroupPanel2.Hidden = false;
                                 GroupPanel2.Enabled = false;
-                                GroupPanel3.Enabled = false;
+                                //GroupPanel3.Enabled = false;
+                                GroupPanel3Enabled();
                                 GroupPanel3.Hidden = false;
                                 GroupPanel4.Hidden = false;
                                 this.btnSbumit.Hidden = false;
                             }
                             else if (pun.States == "4" && pun.IsFrame == true)//合同管理员填写
                             {
-                                GroupPanel1.Enabled = false;
+                                //GroupPanel1.Enabled = false;
+                                GroupPanel1Enabled();
                                 GroupPanel2.Hidden = false;
                                 GroupPanel2.Enabled = false;
-                                GroupPanel3.Enabled = false;
+                                //GroupPanel3.Enabled = false;
+                                GroupPanel3Enabled();
                                 GroupPanel3.Hidden = false;
                                 GroupPanel4.Hidden = false;
                                 GroupPanel4.Enabled = false;
@@ -314,7 +320,8 @@ namespace FineUIPro.Web.ContractorQuality
                             }
                             else if (pun.States == "5")//采购员填写
                             {
-                                GroupPanel1.Enabled = false;
+                                //GroupPanel1.Enabled = false;
+                                GroupPanel1Enabled();
                                 GroupPanel2.Hidden = false;
                                 GroupPanel2.Enabled = false;
                                 fr2.Hidden = true;
@@ -325,7 +332,8 @@ namespace FineUIPro.Web.ContractorQuality
                                 if (pun.SeType == "1")
                                 {
                                     GroupPanel3.Hidden = false;
-                                    GroupPanel3.Enabled = false;
+                                    //GroupPanel3.Enabled = false;
+                                    GroupPanel3Enabled();
                                     GroupPanel6.Hidden = false;
                                     fr1.Hidden = false;
                                     frNoFrame1.Hidden = false;
@@ -339,7 +347,8 @@ namespace FineUIPro.Web.ContractorQuality
                                     frNoFrame2.Hidden = true;
                                     frWz.Hidden = false;
                                     GroupPanel7.Hidden = false;
-                                    GroupPanel7.Enabled = false;
+                                    //GroupPanel7.Enabled = false;
+                                    GroupPanel7Enabled();
                                     GroupPanel6.Hidden = false;
                                 }
                             }
@@ -477,6 +486,54 @@ namespace FineUIPro.Web.ContractorQuality
                 }
             }
         }
+
+        /// <summary>
+        /// 申报人填写不可编辑
+        /// </summary>
+        protected void GroupPanel1Enabled()
+        {
+            txtPunishDate.Enabled = false;
+            txtLocation.Enabled = false;
+            txtDescription.Enabled = false;
+            txtViolation_Inspector.Enabled = false;
+            txtViolation_InspectorDep.Enabled = false;
+            txtMIContractor.Enabled = false;
+            Label3.Enabled = false;
+            lblAttach.Enabled = false;
+            btnAttach.Enabled = false;
+            lblTips.Enabled = false;
+        }
+
+        /// <summary>
+        /// 主协调员填写不可编辑
+        /// </summary>
+        protected void GroupPanel3Enabled()
+        {
+            drpViolationClause.Enabled = false;
+            drpViolationDegree.Enabled = false;
+            txtCompany.Enabled = false;
+            txtIndividualPerson.Enabled = false;
+            txtIndividual.Enabled = false;
+            drpUserDep.Enabled = false;
+            Label2.Enabled = false;
+            btnAttach2.Enabled = false;
+            Label6.Enabled = false;
+        }
+
+        /// <summary>
+        /// PVT组长或请购人填写
+        /// </summary>
+        protected void GroupPanel7Enabled()
+        {
+            drpBuyer2.Enabled = false;
+            drpViolationClause2.Enabled = false;
+            drpViolationDegree2.Enabled = false;
+            txtCompany2.Enabled = false;
+            txtFo.Enabled = false;
+            Label7.Enabled = false;
+            btnAttach3.Enabled = false;
+            Label8.Enabled = false;
+        }
         #endregion
 
         #region 保存、提交
@@ -1294,7 +1351,7 @@ namespace FineUIPro.Web.ContractorQuality
                 {
                     punishment.States = "0";//申请人未提交
                 }
-                var att = from x in Funs.DB.AttachFile where x.ToKeyId == punishment.PunishmentId select x;
+                var att = from x in Funs.DB.AttachFile where x.ToKeyId == punishment.PunishmentId + "#1" select x;
                 if (att.Count() > 0)
                 {
                     punishment.AttachUrl = att.First().AttachUrl;
@@ -1574,7 +1631,7 @@ namespace FineUIPro.Web.ContractorQuality
         }
         #endregion
 
-        #region 附件上传
+        #region 附件上传、查看
         /// <summary>
         /// 相关附件上传
         /// </summary>
@@ -1586,7 +1643,17 @@ namespace FineUIPro.Web.ContractorQuality
             {
                 this.hdId.Text = SQLHelper.GetNewID(typeof(Model.EMC_Punishment));
             }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=1", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
+        }
+
+        /// <summary>
+        /// 附件查看
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtnViewAttach_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=-1&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=1", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
         }
 
         /// <summary>
@@ -1600,7 +1667,17 @@ namespace FineUIPro.Web.ContractorQuality
             {
                 this.hdId.Text = SQLHelper.GetNewID(typeof(Model.EMC_Punishment));
             }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=0&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=2", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
+        }
+
+        /// <summary>
+        /// 附件查看
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtnViewAttach2_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=-1&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=2", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
         }
         #endregion
 
@@ -1652,5 +1729,7 @@ namespace FineUIPro.Web.ContractorQuality
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
         #endregion
+
+
     }
 }

FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs

@@ -158,6 +158,15 @@ namespace FineUIPro.Web.ContractorQuality
         /// </remarks>
         protected global::FineUIPro.Label lblTips;
 
+        /// <summary>
+        /// lbtnViewAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.LinkButton lbtnViewAttach;
+
         /// <summary>
         /// GroupPanel2 控件。
         /// </summary>
@@ -491,6 +500,15 @@ namespace FineUIPro.Web.ContractorQuality
         /// </remarks>
         protected global::FineUIPro.Label Label6;
 
+        /// <summary>
+        /// lbtnViewAttach2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.LinkButton lbtnViewAttach2;
+
         /// <summary>
         /// frMCNoPass 控件。
         /// </summary>
@@ -662,6 +680,15 @@ namespace FineUIPro.Web.ContractorQuality
         /// </remarks>
         protected global::FineUIPro.Label Label8;
 
+        /// <summary>
+        /// lbtnAttach3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.LinkButton lbtnAttach3;
+
         /// <summary>
         /// frPVTNoPass 控件。
         /// </summary>

FCL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>
     </Use64BitIISExpress>

FCL/FineUIPro.Web/Web.config

@@ -55,7 +55,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <buildProviders>
         <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91"/>
       </buildProviders>

FCL/WebApi/WebApi.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>