Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

2024-04-28 17:48:16 +08:00
parent 2f87f6af53 fc56b1f6c2
commit ccce05d505
23 changed files with 12540 additions and 769 deletions
@@ -0,0 +1,19 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('51ee983f-085e-4f02-b819-cab049d9cc27','项目质量周报（新）','CQMS/ManageReportNew/WeekReport.aspx',15,'7ecf0229-8a0b-40ce-8b04-e556f7bd3394','Menu_CQMS',0,1,1)
+go
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('F30A37F8-A05E-4EFA-A577-26E909733C14','51ee983f-085e-4f02-b819-cab049d9cc27','增加',1)
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('A214EF84-5C60-40EA-823C-DC1CB523A214','51ee983f-085e-4f02-b819-cab049d9cc27','修改',2)
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('964847FA-521C-4BAF-B172-A5B2A06A18A8','51ee983f-085e-4f02-b819-cab049d9cc27','删除',3)
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('256E7842-64DC-44EB-AAD5-A6DBC1DA31C8','51ee983f-085e-4f02-b819-cab049d9cc27','保存',4)
+	go
+
+alter table Report_WeekAndMonthReport_New add ReportType nvarchar(10)
+go
+
+update Report_WeekAndMonthReport_New set ReportType='1'where ReportType is null
+go
@@ -19,18 +19,7 @@ namespace BLL
        public static Model.Comprehensive_DataReceivingDoc GetDataReceivingDocById(string dataReceivingDocId)
        {
            return Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(e => e.DataReceivingDocId == dataReceivingDocId);
-        }
-
-        /// <summary>
-        /// 根据编号和名称获取资料收发文登记记录
-        /// </summary>
-        /// <param name="fileCode"></param>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        public static Model.Comprehensive_DataReceivingDoc GetDataReceivingDocByCodeAndName(string fileCode, string fileName)
-        {
-            return Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(e => e.FileCode == fileCode && e.FileName == fileName);
-        }
+        }           

        /// <summary>
        /// 添加资料收发文登记记录
@@ -103,6 +92,7 @@ namespace BLL
                newDoc.CompileDate = doc.CompileDate;
                newDoc.Status = doc.Status;
                newDoc.AuditMan = doc.AuditMan;
+                newDoc.RemarkCode = doc.RemarkCode;
                Funs.DB.SubmitChanges();
            }
        }
@@ -3241,6 +3241,11 @@ namespace BLL
        /// </summary>
        public const string MonthReportNewTemplateUrl = "File\\Word\\CQMS\\项目质量月报.doc";

+        /// <summary>
+        /// 新项目质量周报模板文件原始虚拟路径
+        /// </summary>
+        public const string WeekReportNewTemplateUrl = "File\\Word\\CQMS\\项目质量周报.doc";
+
        /// <summary>
        /// 资料收发文登记记录导入模板原始虚拟路径
        /// </summary>
@@ -3317,11 +3322,6 @@ namespace BLL
        /// </summary>
        public const string InspectionMachineTempUrl = "File\\Excel\\CQMS\\机具报验模板.xls";

-        /// <summary>
-        /// 资料收发文登记记录模板文件原始虚拟路径
-        /// </summary>
-        public const string DataReceivingDocTempUrl = "File\\Excel\\CQMS\\资料收发文登记记录模板.xls";
-
        /// <summary>
        /// 培训记录模板文件原始虚拟路径
        /// </summary>
@@ -3622,9 +3622,14 @@ namespace BLL
        public const string DivisionId15 = "BD0C9DC9-C621-497E-B947-A85F46D86AA4";

        /// <summary>
-        /// 质量周报(新)
+        /// 质量月报(新)
        /// </summary>
-        public const string CQWeekReportNewMenuId = "4164BF9B-DA7C-4287-AC11-D1EB6A664F57";
+        public const string MonthReportNewMenuId = "4164BF9B-DA7C-4287-AC11-D1EB6A664F57";
+
+        /// <summary>
+        /// 质量周报（新）
+        /// </summary>
+        public const string WeekReportNewMenuId = "51ee983f-085e-4f02-b819-cab049d9cc27";

        #region  质量管理
        #region 基础设置
@@ -330,7 +330,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
        protected void btnOut_Click(object sender, EventArgs e)
        {
            string rootPath = Server.MapPath("~/");
-            string initTemplatePath = Const.DataReceivingDocTempUrl;
+            string initTemplatePath = Const.CQMS_DataReceivingDocTempUrl;
            string uploadfilepath = string.Empty;
            string newUrl = string.Empty;
            uploadfilepath = rootPath + initTemplatePath;
@@ -346,10 +346,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
            {
                lists = lists.Where(x => x.FileName.Contains(this.stxtFileName.Text.Trim()));
            }
-            lists = lists.OrderBy(x => x.FileCode);
+            lists = lists.OrderBy(x => x.RemarkCode);
            if (lists != null)
            {
-                newUrl = uploadfilepath.Replace("资料收发文登记记录模板.xls", "资料收发文登记记录.xls");
+                string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
+                newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")");
                File.Copy(uploadfilepath, newUrl);
                // 第一步：读取文件流
                NPOI.SS.UserModel.IWorkbook workbook;
@@ -384,7 +385,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
                NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
                NPOI.SS.UserModel.ICell cell;
-                int i = 1;
+                int i = 3;
                foreach (var item in lists)
                {
                    // 第二步：创建新数据行
@@ -511,6 +512,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                    }
                    cell.SetCellValue(isO);//是否存档

+                    cell = row.CreateCell(19);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.RemarkCode);//标志编号
+
                    i++;
                }
                // 第三步：写入文件流
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive

                var cns = from x in Funs.DB.Base_CNProfessional select x;               

-                for (int i = 0; i < ir; i++)
+                for (int i = 2; i < ir; i++)
                {
                    string row0 = pds.Rows[i][0].ToString();
                    if (string.IsNullOrEmpty(row0))
@@ -263,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                    string row9 = pds.Rows[i][9].ToString();
                    if (string.IsNullOrEmpty(row9))
                    {
-                        result += (i + 2).ToString() + "," + "发出日期" + "," + "此项为必填项！" + "|";
+                        result += (i + 2).ToString() + "," + "上报日期" + "," + "此项为必填项！" + "|";
                    }
                    else
                    {
@@ -273,7 +273,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                        }
                        catch (Exception)
                        {
-                            result += (i + 2).ToString() + "," + "发出日期" + "," + "格式错误！" + "|";
+                            result += (i + 2).ToString() + "," + "上报日期" + "," + "格式错误！" + "|";
                        }
                    }
                
@@ -286,7 +286,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                            var unit = units.Where(x => x.UnitName == u.Trim()).FirstOrDefault();
                            if (unit == null)
                            {
-                                result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + u.Trim() + "]不存在！" + "|";
+                                result += (i + 2).ToString() + "," + "上报接收单位" + "," + "[" + u.Trim() + "]不存在！" + "|";
                            }
                        }
                    }
@@ -511,7 +511,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive

                var cns = from x in Funs.DB.Base_CNProfessional select x;
                
-                for (int i = 0; i < ir; i++)
+                for (int i = 2; i < ir; i++)
                {
                    Model.Comprehensive_DataReceivingDoc oldViewInfo = new Model.Comprehensive_DataReceivingDoc();
                    var cn = cns.Where(y => y.ProfessionalName == pds.Rows[i][4].ToString().Trim()).FirstOrDefault();
@@ -60,10 +60,10 @@
                                    <Items>
                                        <f:FormRow ColumnWidths="33% 67%">
                                            <Items>
-                                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="发出日期" ID="txtSendDate"
+                                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="上报日期" ID="txtSendDate"
                                                    LabelAlign="Right" LabelWidth="130px">
                                                </f:DatePicker>
-                                                <f:DropDownList ID="drpReceiveUnit" runat="server" Label="接收单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
+                                                <f:DropDownList ID="drpReceiveUnit" runat="server" Label="上报接收单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
                                            </Items>
                                        </f:FormRow>
                                        <f:FormRow>
@@ -115,6 +115,13 @@
                        </f:GroupPanel>
                    </Items>
                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRemarkCode" runat="server" Label="标志编号" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
+                         <f:Label ID="Label1" runat="server"></f:Label>
+                         <f:Label ID="Label3" runat="server"></f:Label>
+                    </Items>
+                </f:FormRow>
                <%--<f:FormRow>
                    <Items>
                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
@@ -72,6 +72,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
            this.txtIssueCopies.Readonly = true;
            this.txtIssueUnitReceiver.Readonly = true;
            this.rblIsOnFile.Readonly = true;
+            this.txtRemarkCode.Readonly = true;
            //this.drpAudit.Readonly = true;
            //this.btnAttach.Enabled = false;
        }
@@ -152,6 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                            this.rblIsOnFile.SelectedValue = "false";
                        }
                    }
+                    this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode;

                    //var currApprove = DataReceivingDocApproveService.GetCurrentApprove(dataReceivingDoc.DataReceivingDocId);
                    //if (currApprove != null)
@@ -210,6 +212,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
                return;
            }
+            var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.RemarkCode == this.txtRemarkCode.Text.Trim() && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null)));
+            if (q != null)
+            {
+                Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
+                return;
+            }
+
            Model.Comprehensive_DataReceivingDoc dataReceivingDoc = new Model.Comprehensive_DataReceivingDoc();
            dataReceivingDoc.ProjectId = this.CurrUser.LoginProjectId;
            dataReceivingDoc.FileCode = this.txtFileCode.Text.Trim();
@@ -265,6 +274,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
            {
                dataReceivingDoc.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue);
            }
+            dataReceivingDoc.RemarkCode = this.txtRemarkCode.Text.Trim();
            //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
            //{
            //    dataReceivingDoc.AuditMan = drpAudit.SelectedValue;
@@ -264,6 +264,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
        /// </remarks>
        protected global::FineUIPro.RadioButtonList rblIsOnFile;
        
+        /// <summary>
+        /// txtRemarkCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarkCode;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@@ -26,9 +26,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew

        public void BindGrid()
        {
-            string strSql = @"select Id, Sortid, StartDate, EndDate, ProjectId
+            string strSql = @"select Id, Sortid, StartDate, EndDate, ProjectId,ReportType
                              from Report_WeekAndMonthReport_New C 
-                              where C.ProjectId = @ProjectId";
+                              where C.ReportType='1' AND C.ProjectId = @ProjectId";
            List<SqlParameter> listStr = new List<SqlParameter>();
            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
            SqlParameter[] parameter = listStr.ToArray();
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
            {
                return;
            }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CQWeekReportNewMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.MonthReportNewMenuId);
            if (buttonList.Count() > 0)
            {
                if (buttonList.Contains(BLL.Const.BtnModify))
@@ -2751,6 +2751,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
            Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
            report.Id = ReportId;
            report.ProjectId = this.CurrUser.LoginProjectId;
+            report.ReportType = "1";//1.月报，2-周报
            if (!string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
            {
                try
@@ -0,0 +1,84 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekReport.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.WeekReport" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>项目质量周报（新）</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+       <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" SortField="StartDate" 
+                    DataIDField="Id" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
+                    DataKeyNames="Id" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" 
+                    OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" OnRowDoubleClick="Grid1_RowDoubleClick"  EnableRowDoubleClickEvent="true"
+                    AllowFilters="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true"
+                                    runat="server" OnClick="btnNew_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                          <f:RenderField Width="180px" ColumnID="SortId" DataField="SortId"
+                            FieldType="String" HeaderText="周期" TextAlign="Center" HeaderTextAlign="Center" >
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="ReportId" Width="100px" HeaderText="时间段" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label41" runat="server" Text='<%# ConvertDate(Eval("Id")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                     <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="编辑项目质量周报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="1300px" Height="620px">
+        </f:Window>
+         <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
+                    OnClick="btnMenuView_Click">
+                </f:MenuButton>
+                  <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
+                    Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+      <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+      </script>
+</body>
+</html>
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ManageReportNew {
+    
+    
+    public partial class WeekReport {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// Label41 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label41;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+        
+        /// <summary>
+        /// btnMenuView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuView;
+        
+        /// <summary>
+        /// btnPrinter 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnPrinter;
+        
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
@@ -523,6 +523,8 @@
    <Content Include="CQMS\ManageReportNew\MonthReportNewEdit.aspx" />
    <Content Include="CQMS\ManageReportNew\MonthReportNewEdit1.aspx" />
    <Content Include="CQMS\ManageReportNew\MonthReportNewEdit2.aspx" />
+    <Content Include="CQMS\ManageReportNew\WeekReport.aspx" />
+    <Content Include="CQMS\ManageReportNew\WeekReportEdit.aspx" />
    <Content Include="CQMS\ManageReport\CheckStatisc.aspx" />
    <Content Include="CQMS\ManageReport\DesignChangeStatisc.aspx" />
    <Content Include="CQMS\ManageReport\HJGLStatisc.aspx" />
@@ -8054,6 +8056,20 @@
    <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit2.aspx.designer.cs">
      <DependentUpon>MonthReportNewEdit2.aspx</DependentUpon>
    </Compile>
+    <Compile Include="CQMS\ManageReportNew\WeekReport.aspx.cs">
+      <DependentUpon>WeekReport.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\WeekReport.aspx.designer.cs">
+      <DependentUpon>WeekReport.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\WeekReportEdit.aspx.cs">
+      <DependentUpon>WeekReportEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\WeekReportEdit.aspx.designer.cs">
+      <DependentUpon>WeekReportEdit.aspx</DependentUpon>
+    </Compile>
    <Compile Include="CQMS\ManageReport\CheckStatisc.aspx.cs">
      <DependentUpon>CheckStatisc.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -77,7 +77,7 @@
      <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
      <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"/>
    </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
    <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
    <authentication mode="Forms">
      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
@@ -38,6 +38,7 @@
 <TreeNode id="0c65cad2-2279-48fc-b78c-82bfbe01f037" Text="NCR统计" NavigateUrl="CQMS/ManageReport/NCRStatisc.aspx"></TreeNode>
 <TreeNode id="227d640a-9494-41ce-95bf-748dd59e986f" Text="设计变更单统计" NavigateUrl="CQMS/ManageReport/DesignChangeStatisc.aspx"></TreeNode>
 <TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc26" Text="项目质量周报" NavigateUrl="CQMS/ManageReport/WeekReport.aspx"></TreeNode>
+<TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc27" Text="项目质量周报（新）" NavigateUrl="CQMS/ManageReportNew/WeekReport.aspx"></TreeNode>
 <TreeNode id="8048c87a-c2b6-4a0d-bca9-f4f2dca42e5b" Text="项目质量月报" NavigateUrl="CQMS/ManageReport/MonthReport.aspx"></TreeNode>
 <TreeNode id="4164BF9B-DA7C-4287-AC11-D1EB6A664F57" Text="项目质量月报（新）" NavigateUrl="CQMS/ManageReportNew/MonthReport.aspx"></TreeNode>
 <TreeNode id="1443C901-A9C3-4CCC-B858-55512DE8C5CA" Text="质量管理工作总结报告" NavigateUrl="CQMS/ManageReport/QualityWorkSummaryReport.aspx"></TreeNode>