From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index a25003b..1c50280 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -37,21 +37,27 @@
this.tooLoading = new System.Windows.Forms.ToolStripStatusLabel();
this.toolZhiChi = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolVersion = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolFont = new System.Windows.Forms.ToolStripStatusLabel();
this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
this.barMy = new DevExpress.XtraBars.BarSubItem();
this.barExit = new DevExpress.XtraBars.BarButtonItem();
this.barPwd = new DevExpress.XtraBars.BarButtonItem();
this.barMsg = new DevExpress.XtraBars.BarListItem();
this.barMsgXf = new DevExpress.XtraBars.BarButtonItem();
+ this.barOrg = new DevExpress.XtraBars.BarEditItem();
+ this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
this.fdm1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tabCloseCurrent = new System.Windows.Forms.ToolStripMenuItem();
this.tabCloseAll = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolForm = new System.Windows.Forms.ToolStripStatusLabel();
this.fluentDesignFormContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
this.strp1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fdm1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
this.cms1.SuspendLayout();
@@ -83,7 +89,10 @@
this.strp1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tooLoading,
this.toolZhiChi,
- this.toolTime});
+ this.toolTime,
+ this.toolVersion,
+ this.toolFont,
+ this.toolForm});
this.strp1.Location = new System.Drawing.Point(0, 701);
this.strp1.Name = "strp1";
this.strp1.Size = new System.Drawing.Size(1022, 26);
@@ -101,8 +110,8 @@
//
this.toolZhiChi.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
this.toolZhiChi.Name = "toolZhiChi";
- this.toolZhiChi.Size = new System.Drawing.Size(194, 20);
- this.toolZhiChi.Text = "鎶�鏈敮鎸侊細瀹佹尝骞挎繁绉戞妧";
+ this.toolZhiChi.Size = new System.Drawing.Size(183, 20);
+ this.toolZhiChi.Text = "鎶�鏈敮鎸�:瀹佹尝骞挎繁绉戞妧";
//
// toolTime
//
@@ -110,6 +119,20 @@
this.toolTime.Name = "toolTime";
this.toolTime.Size = new System.Drawing.Size(89, 20);
this.toolTime.Text = "鐧诲綍鏃堕棿";
+ //
+ // toolVersion
+ //
+ this.toolVersion.Image = global::Gs.DevApp.Properties.Resources.editrangepermission_16x16;
+ this.toolVersion.Name = "toolVersion";
+ this.toolVersion.Size = new System.Drawing.Size(89, 20);
+ this.toolVersion.Text = "鐗堟湰淇℃伅";
+ //
+ // toolFont
+ //
+ this.toolFont.Image = global::Gs.DevApp.Properties.Resources.fontsizeincrease_16x161;
+ this.toolFont.Name = "toolFont";
+ this.toolFont.Size = new System.Drawing.Size(89, 20);
+ this.toolFont.Text = "瀛椾綋淇℃伅";
//
// fluentDesignFormControl1
//
@@ -119,16 +142,20 @@
this.barExit,
this.barPwd,
this.barMsg,
- this.barMsgXf});
+ this.barMsgXf,
+ this.barOrg});
this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
this.fluentDesignFormControl1.Manager = this.fdm1;
this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
+ this.fluentDesignFormControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemCheckedComboBoxEdit1});
this.fluentDesignFormControl1.Size = new System.Drawing.Size(1230, 39);
this.fluentDesignFormControl1.TabIndex = 2;
this.fluentDesignFormControl1.TabStop = false;
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMy);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsgXf);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsg);
+ this.fluentDesignFormControl1.TitleItemLinks.Add(this.barOrg);
//
// barMy
//
@@ -173,6 +200,24 @@
this.barMsgXf.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barMsgXf.ImageOptions.LargeImage")));
this.barMsgXf.Name = "barMsgXf";
//
+ // barOrg
+ //
+ this.barOrg.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ this.barOrg.Caption = "鍒囨崲缁勭粐";
+ this.barOrg.Edit = this.repositoryItemCheckedComboBoxEdit1;
+ this.barOrg.EditWidth = 150;
+ this.barOrg.Id = 37;
+ this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.usergroup_16x161;
+ this.barOrg.Name = "barOrg";
+ this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemCheckedComboBoxEdit1
+ //
+ this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false;
+ this.repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1";
+ //
// fdm1
//
this.fdm1.Form = this;
@@ -181,8 +226,11 @@
this.barExit,
this.barPwd,
this.barMsg,
- this.barMsgXf});
- this.fdm1.MaxItemId = 37;
+ this.barMsgXf,
+ this.barOrg});
+ this.fdm1.MaxItemId = 38;
+ this.fdm1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemCheckedComboBoxEdit1});
//
// acrd
//
@@ -223,6 +271,13 @@
this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
this.tabCloseAll.Text = "鍏抽棴鍏跺畠椤�";
//
+ // toolForm
+ //
+ this.toolForm.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.toolForm.Name = "toolForm";
+ this.toolForm.Size = new System.Drawing.Size(97, 20);
+ this.toolForm.Text = "toolForm";
+ //
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -244,6 +299,7 @@
this.strp1.ResumeLayout(false);
this.strp1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fdm1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
this.cms1.ResumeLayout(false);
@@ -269,6 +325,10 @@
private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent;
private System.Windows.Forms.ToolStripMenuItem tabCloseAll;
private System.Windows.Forms.ToolStripStatusLabel toolZhiChi;
-
+ private DevExpress.XtraBars.BarEditItem barOrg;
+ private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
+ private System.Windows.Forms.ToolStripStatusLabel toolVersion;
+ private System.Windows.Forms.ToolStripStatusLabel toolFont;
+ private System.Windows.Forms.ToolStripStatusLabel toolForm;
}
}
\ No newline at end of file
--
Gitblit v1.9.3