From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 41 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
index 1061938..125ad2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
@@ -46,6 +46,7 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,9 +68,9 @@
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.txt_DepartmentName = new DevExpress.XtraEditors.TextEdit();
this.txt_LineName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_OrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,8 +78,10 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.缁勭粐鏈烘瀯 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -113,7 +116,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_LineName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -121,8 +123,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -210,6 +214,7 @@
this.gv_createBy,
this.gv_createDate,
this.gridColumn6,
+ this.gridColumn5,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
@@ -262,6 +267,17 @@
this.gridColumn6.VisibleIndex = 0;
this.gridColumn6.Width = 117;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn5.FieldName = "orgName";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "orgName";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 112;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "閮ㄩ棬ID";
@@ -272,7 +288,7 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "departmentId";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -285,7 +301,7 @@
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Tag = "departmentName";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 120;
//
// gridColumn3
@@ -296,9 +312,9 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Tag = "lineNo";
+ this.gridColumn3.Tag = "line_No";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -309,9 +325,9 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Tag = "lineName";
+ this.gridColumn4.Tag = "line_Name";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 120;
//
// pageBar1
@@ -368,6 +384,7 @@
this.layoutMx1.Controls.Add(this.txt_LineNo);
this.layoutMx1.Controls.Add(this.txt_DepartmentName);
this.layoutMx1.Controls.Add(this.txt_LineName);
+ this.layoutMx1.Controls.Add(this.txt_OrgId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -434,11 +451,11 @@
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(1056, 46);
+ this.txt_checkStatus.Location = new System.Drawing.Point(1053, 46);
this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_checkStatus.Size = new System.Drawing.Size(340, 27);
+ this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
this.txt_checkStatus.StyleController = this.layoutMx1;
this.txt_checkStatus.TabIndex = 249;
this.txt_checkStatus.Tag = "readonly";
@@ -455,7 +472,7 @@
//
// txt_DepartmentId
//
- this.txt_DepartmentId.Location = new System.Drawing.Point(96, 12);
+ this.txt_DepartmentId.Location = new System.Drawing.Point(443, 12);
this.txt_DepartmentId.Margin = new System.Windows.Forms.Padding(4);
this.txt_DepartmentId.Name = "txt_DepartmentId";
this.txt_DepartmentId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -497,7 +514,7 @@
//
// txt_DepartmentName
//
- this.txt_DepartmentName.Location = new System.Drawing.Point(443, 12);
+ this.txt_DepartmentName.Location = new System.Drawing.Point(790, 12);
this.txt_DepartmentName.Margin = new System.Windows.Forms.Padding(4);
this.txt_DepartmentName.Name = "txt_DepartmentName";
this.txt_DepartmentName.Properties.ReadOnly = true;
@@ -517,6 +534,16 @@
this.txt_LineName.TabIndex = 253;
this.txt_LineName.Tag = "readonly";
//
+ // txt_OrgId
+ //
+ this.txt_OrgId.IsReadly = false;
+ this.txt_OrgId.Location = new System.Drawing.Point(96, 12);
+ this.txt_OrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_OrgId.Name = "txt_OrgId";
+ this.txt_OrgId.Size = new System.Drawing.Size(259, 28);
+ this.txt_OrgId.TabIndex = 460;
+ this.txt_OrgId.Tag = "edit";
+ //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.lbGuid;
@@ -534,7 +561,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem11,
this.layoutControlItem10,
@@ -542,8 +568,10 @@
this.layoutControlItem7,
this.layoutControlItem6,
this.layoutControlItem5,
+ this.layoutControlItem2,
this.layoutControlItem1,
- this.layoutControlItem2});
+ this.layoutControlItem12,
+ this.缁勭粐鏈烘瀯});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -574,17 +602,6 @@
rowDefinition4});
this.Root.Size = new System.Drawing.Size(1408, 159);
this.Root.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_DepartmentId;
- this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem12.CustomizationFormText = "閮ㄩ棬";
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
- this.layoutControlItem12.Text = "閮ㄩ棬";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
@@ -664,16 +681,6 @@
this.layoutControlItem5.Text = "寤虹珛鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_DepartmentName;
- this.layoutControlItem1.Location = new System.Drawing.Point(347, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
- this.layoutControlItem1.Text = "閮ㄩ棬鍚嶇О";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
- //
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_LineName;
@@ -684,6 +691,38 @@
this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem2.Text = "浜х嚎鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_DepartmentName;
+ this.layoutControlItem1.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem1.Text = "閮ㄩ棬鍚嶇О";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_DepartmentId;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "閮ㄩ棬";
+ this.layoutControlItem12.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem12.Text = "閮ㄩ棬";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // 缁勭粐鏈烘瀯
+ //
+ this.缁勭粐鏈烘瀯.Control = this.txt_OrgId;
+ this.缁勭粐鏈烘瀯.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.缁勭粐鏈烘瀯.CustomizationFormText = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(0, 0);
+ this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(347, 34);
+ this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
//
// picCheckBox
//
@@ -740,7 +779,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_LineName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -748,8 +786,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -783,7 +823,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.TextEdit txt_Guid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.SearchLookUpEdit txt_DepartmentId;
private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
private DevExpress.XtraEditors.SearchLookUpEdit txt_LineNo;
@@ -797,7 +836,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private UserControl.UcLookOrg txt_OrgId;
+ private DevExpress.XtraLayout.LayoutControlItem 缁勭粐鏈烘瀯;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
--
Gitblit v1.9.3