From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 224 +++++++++++++++++++++----------------------------------
1 files changed, 87 insertions(+), 137 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 1cc22e9..8da868d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -30,17 +30,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -67,22 +67,20 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_remark5 = new Gs.DevApp.UserControl.UcDictionary();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark5 = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -102,7 +100,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -127,16 +124,13 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -240,8 +234,7 @@
this.gridColumn3,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10,
- this.gridColumn12});
+ this.gridColumn10});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -290,8 +283,8 @@
// gv_depottype
//
this.gv_depottype.AppearanceCell.Options.UseFont = true;
- this.gv_depottype.Caption = "浠撳簱灞炴��";
- this.gv_depottype.FieldName = "depottype";
+ this.gv_depottype.Caption = "Mes浠撳簱灞炴��";
+ this.gv_depottype.FieldName = "remark5";
this.gv_depottype.MinWidth = 50;
this.gv_depottype.Name = "gv_depottype";
this.gv_depottype.OptionsColumn.AllowEdit = false;
@@ -334,8 +327,6 @@
this.gv_isFkc.Name = "gv_isFkc";
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
- this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 5;
this.gv_isFkc.Width = 60;
//
// gridColumn2
@@ -347,7 +338,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.zuid";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 50;
//
// gridColumn6
@@ -358,7 +349,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 70;
//
// gridColumn5
@@ -369,7 +360,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.Client_Id";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 60;
//
// gridColumn4
@@ -380,7 +371,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.VisibleIndex = 8;
this.gridColumn4.Width = 60;
//
// gridColumn7
@@ -391,7 +382,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.Phone";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 60;
//
// gridColumn3
@@ -402,7 +393,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "query_a.lastupdate_date";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.VisibleIndex = 12;
this.gridColumn3.Width = 180;
//
// gridColumn8
@@ -420,7 +411,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -430,7 +421,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.VisibleIndex = 11;
this.gridColumn10.Width = 94;
//
// pageBar1
@@ -470,20 +461,20 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1264, 570);
+ this.splitMx1.SplitterPosition = 76;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_remark5);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_isFkc);
this.layoutMx1.Controls.Add(this.txt_isNg);
this.layoutMx1.Controls.Add(this.txt_depotCode);
this.layoutMx1.Controls.Add(this.txt_zuid);
this.layoutMx1.Controls.Add(this.txt_depotName);
- this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_description);
this.layoutMx1.Controls.Add(this.txt_depottype);
- this.layoutMx1.Controls.Add(this.txt_remark5);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9,
@@ -492,9 +483,19 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1264, 100);
+ this.layoutMx1.Size = new System.Drawing.Size(1264, 76);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_remark5
+ //
+ this.txt_remark5.BtnTxt = "浠撳簱灞炴��";
+ this.txt_remark5.Location = new System.Drawing.Point(945, 12);
+ this.txt_remark5.Name = "txt_remark5";
+ this.txt_remark5.Size = new System.Drawing.Size(307, 52);
+ this.txt_remark5.TabIndex = 292;
+ this.txt_remark5.TextTxt = "";
+ this.txt_remark5.WhereTxt = " a.s_type=\'浠撳簱灞炴�' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
//
// lbGuid
//
@@ -507,7 +508,7 @@
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(1032, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(721, 12);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
this.txt_isFkc.Size = new System.Drawing.Size(220, 24);
@@ -517,7 +518,7 @@
//
// txt_isNg
//
- this.txt_isNg.Location = new System.Drawing.Point(1032, 52);
+ this.txt_isNg.Location = new System.Drawing.Point(721, 40);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
this.txt_isNg.Size = new System.Drawing.Size(220, 24);
@@ -555,19 +556,9 @@
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(721, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(220, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 219;
- this.txt_createBy.Tag = "readonly";
- //
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(99, 52);
+ this.txt_description.Location = new System.Drawing.Point(99, 40);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
this.txt_description.Size = new System.Drawing.Size(220, 24);
@@ -577,28 +568,13 @@
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(410, 52);
+ this.txt_depottype.Location = new System.Drawing.Point(410, 40);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
this.txt_depottype.Size = new System.Drawing.Size(220, 24);
this.txt_depottype.StyleController = this.layoutMx1;
this.txt_depottype.TabIndex = 231;
this.txt_depottype.Tag = "readonly";
- //
- // txt_remark5
- //
- this.txt_remark5.EditValue = "鍚�";
- this.txt_remark5.Location = new System.Drawing.Point(721, 52);
- this.txt_remark5.Name = "txt_remark5";
- this.txt_remark5.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_remark5.Properties.Items.AddRange(new object[] {
- "鍚�",
- "鏄�"});
- this.txt_remark5.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_remark5.Size = new System.Drawing.Size(220, 24);
- this.txt_remark5.StyleController = this.layoutMx1;
- this.txt_remark5.TabIndex = 292;
//
// layoutControlItem9
//
@@ -630,7 +606,6 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem7,
@@ -638,27 +613,27 @@
this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1264, 100);
+ rowDefinition1,
+ rowDefinition2});
+ this.Root.Size = new System.Drawing.Size(1264, 76);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -666,7 +641,7 @@
this.layoutControlItem1.Control = this.txt_depotCode;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem1.Text = "浠撳簱缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
@@ -676,73 +651,64 @@
this.layoutControlItem2.Location = new System.Drawing.Point(311, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem2.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(622, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(311, 40);
- this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_description;
this.layoutControlItem4.CustomizationFormText = "浠撳簱澶囨敞";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 40);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem4.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem4.Text = "浠撳簱澶囨敞";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depottype;
- this.layoutControlItem5.Location = new System.Drawing.Point(311, 40);
+ this.layoutControlItem5.Location = new System.Drawing.Point(311, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_isFkc;
- this.layoutControlItem7.Location = new System.Drawing.Point(933, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(622, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isNg;
- this.layoutControlItem8.Location = new System.Drawing.Point(933, 40);
+ this.layoutControlItem8.Location = new System.Drawing.Point(622, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem8.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem8.Text = "绂佺敤鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_remark5;
- this.layoutControlItem10.Location = new System.Drawing.Point(622, 40);
+ this.layoutControlItem10.Location = new System.Drawing.Point(933, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(311, 40);
- this.layoutControlItem10.Text = "鐗规畩浠撳簱";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(311, 56);
+ this.layoutControlItem10.Text = "浠撳簱灞炴��";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
//
// tabMx
//
@@ -750,7 +716,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1264, 458);
+ this.tabMx.Size = new System.Drawing.Size(1264, 482);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -759,7 +725,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1262, 426);
+ this.tabMxPage1.Size = new System.Drawing.Size(1262, 450);
this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
@@ -770,7 +736,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1262, 426);
+ this.gcMx1.Size = new System.Drawing.Size(1262, 450);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -880,10 +846,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -897,16 +863,6 @@
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 5;
this.gridColumn11.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "鐗规畩浠�";
- this.gridColumn12.FieldName = "remark5";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 12;
- this.gridColumn12.Width = 94;
//
// Frm_MesDepot
//
@@ -941,16 +897,13 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -994,17 +947,14 @@
private DevExpress.XtraEditors.TextEdit txt_isFkc;
private DevExpress.XtraEditors.TextEdit txt_zuid;
private DevExpress.XtraEditors.TextEdit txt_depottype;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_description;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotCode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1022,11 +972,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.TextEdit txt_isNg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private DevExpress.XtraEditors.ComboBoxEdit txt_remark5;
+ private UserControl.UcDictionary txt_remark5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
--
Gitblit v1.9.3