From cf758a0cd625345be2176bd19ac0d94c8fe609d6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 06 八月 2025 18:52:25 +0800
Subject: [PATCH] 1、采购到货新增合并提交 2、顶部按钮合并按钮启用
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index d873c15..d1a7b73 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -70,10 +70,13 @@
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
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.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
+
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -126,9 +129,11 @@
this.barLargeButtonItem2,
this.barLargeButtonItem3,
this.barLargeButtonItem4,
- this.btnFPiZhun});
+ this.btnFPiZhun,
+ this.barButtonItem1,
+ this.barLargeButtonItem5});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 67;
+ this.barManager1.MaxItemId = 69;
//
// bar2
//
@@ -549,48 +554,69 @@
this.barLargeButtonItem4.Tag = "Never";
this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // 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";
+ //
// 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);
+ //
+ // 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";
//
// 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 +667,7 @@
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;
}
}
--
Gitblit v1.9.3