1、IPQC/fqc 2、通用菜单新增（生成报告）

kyy

5 天以前 ac35ba967db863b461f5aee36bb31eec0bc53e49

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs

@@ -40,8 +40,8 @@
            this.btnLoad = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -70,10 +70,14 @@
            this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnChbg = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            this.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
            this.SuspendLayout();
            // 
@@ -126,9 +130,13 @@
            this.barLargeButtonItem2,
            this.barLargeButtonItem3,
            this.barLargeButtonItem4,
            this.btnFPiZhun});
            this.btnFPiZhun,
            this.barButtonItem1,
            this.barLargeButtonItem5,
            this.btnChbg,
            this.btnBaoGao});
            this.barManager1.MainMenu = this.bar2;
            this.barManager1.MaxItemId = 67;
            this.barManager1.MaxItemId = 71;
            // 
            // bar2
            // 
@@ -148,8 +156,8 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLoad),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnDel, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnHb),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnQuery),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnIn),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnOut),
@@ -177,7 +185,9 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnChbg),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao)});
            this.bar2.OptionsBar.AllowQuickCustomization = false;
            this.bar2.OptionsBar.DrawBorder = false;
            this.bar2.OptionsBar.DrawDragBorder = false;
@@ -256,6 +266,16 @@
            this.btnChk.Name = "btnChk";
            this.btnChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnHb
            // 
            this.btnHb.Caption = "合并审核";
            this.btnHb.Id = 16;
            this.btnHb.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.Image")));
            this.btnHb.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.LargeImage")));
            this.btnHb.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHb.Name = "btnHb";
            this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnFchk
            // 
            this.btnFchk.Caption = "反审核";
@@ -265,16 +285,6 @@
            this.btnFchk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnFchk.Name = "btnFchk";
            this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnHb
            // 
            this.btnHb.Caption = "合并";
            this.btnHb.Id = 16;
            this.btnHb.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.Image")));
            this.btnHb.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.LargeImage")));
            this.btnHb.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHb.Name = "btnHb";
            this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnQuery
            // 
@@ -549,48 +559,86 @@
            this.barLargeButtonItem4.Tag = "Never";
            this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnChbg
            // 
            this.btnChbg.Caption = "撤回报工";
            this.btnChbg.Id = 69;
            this.btnChbg.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnChbg.ImageOptions.Image")));
            this.btnChbg.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnChbg.ImageOptions.LargeImage")));
            this.btnChbg.Name = "btnChbg";
            this.btnChbg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barDockControlTop
            // 
            this.barDockControlTop.CausesValidation = false;
            this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
            this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
            this.barDockControlTop.Manager = this.barManager1;
            this.barDockControlTop.Size = new System.Drawing.Size(1543, 142);
            this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.barDockControlTop.Size = new System.Drawing.Size(1350, 114);
            // 
            // barDockControlBottom
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 146);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 114);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
            // 
            // barDockControlLeft
            // 
            this.barDockControlLeft.CausesValidation = false;
            this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
            this.barDockControlLeft.Manager = this.barManager1;
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 4);
            this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
            // 
            // barDockControlRight
            // 
            this.barDockControlRight.CausesValidation = false;
            this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
            this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
            this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
            this.barDockControlRight.Manager = this.barManager1;
            this.barDockControlRight.Size = new System.Drawing.Size(0, 4);
            this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
            // 
            // barButtonItem1
            // 
            this.barButtonItem1.Caption = "合并提交";
            this.barButtonItem1.Id = 67;
            this.barButtonItem1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.Image")));
            this.barButtonItem1.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.LargeImage")));
            this.barButtonItem1.Name = "barButtonItem1";
            // 
            // barLargeButtonItem5
            // 
            this.barLargeButtonItem5.Caption = "合并提交";
            this.barLargeButtonItem5.Id = 68;
            this.barLargeButtonItem5.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.Image")));
            this.barLargeButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.LargeImage")));
            this.barLargeButtonItem5.Name = "barLargeButtonItem5";
            // 
            // btnBaoGao
            // 
            this.btnBaoGao.Caption = "生产报告";
            this.btnBaoGao.Id = 70;
            this.btnBaoGao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.Image")));
            this.btnBaoGao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.LargeImage")));
            this.btnBaoGao.Name = "btnBaoGao";
            // 
            // UcToolBarMenu
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.barDockControlLeft);
            this.Controls.Add(this.barDockControlRight);
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 146);
            this.Size = new System.Drawing.Size(1350, 114);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
@@ -641,5 +689,9 @@
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
        private DevExpress.XtraBars.BarLargeButtonItem btnFPiZhun;
        private DevExpress.XtraBars.BarButtonItem barButtonItem1;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem5;
        private DevExpress.XtraBars.BarLargeButtonItem btnChbg;
        private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
    }
}