From 78fab6b55a27d015c09c399f9e538ba8bdbd3d51 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 11:24:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index 5711023..cb3396d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -99,12 +99,10 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -142,6 +140,8 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -180,12 +180,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
@@ -200,6 +198,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -684,7 +684,7 @@
// txt_orgId
//
this.txt_orgId.IsReadly = false;
- this.txt_orgId.Location = new System.Drawing.Point(96, 88);
+ this.txt_orgId.Location = new System.Drawing.Point(790, 127);
this.txt_orgId.Margin = new System.Windows.Forms.Padding(5);
this.txt_orgId.Name = "txt_orgId";
this.txt_orgId.Size = new System.Drawing.Size(259, 28);
@@ -713,7 +713,7 @@
//
// txt_bl015
//
- this.txt_bl015.Location = new System.Drawing.Point(790, 127);
+ this.txt_bl015.Location = new System.Drawing.Point(96, 88);
this.txt_bl015.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl015.Name = "txt_bl015";
this.txt_bl015.Properties.Appearance.Options.UseFont = true;
@@ -863,17 +863,17 @@
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem13,
this.layoutControlItem14,
- this.layoutControlItem12,
this.layoutControlItem3,
this.layoutControlItem15,
this.layoutControlItem8,
this.layoutControlItem17,
- this.layoutControlItem1});
+ this.layoutControlItem1,
+ this.layoutControlItem12,
+ this.layoutControlItem9});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -960,16 +960,6 @@
this.layoutControlItem7.Text = "渚涘簲鍟�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_orgId;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 76);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(347, 39);
- this.layoutControlItem9.Text = "鍙戞枡缁勭粐";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
- //
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_bl002;
@@ -1013,17 +1003,6 @@
this.layoutControlItem14.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem14.Text = "琛ユ枡鍘熷洜";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_bl015;
- this.layoutControlItem12.Location = new System.Drawing.Point(694, 115);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(347, 39);
- this.layoutControlItem12.Text = "浜у搧鍨嬪彿";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
@@ -1446,6 +1425,28 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_bl015;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 39);
+ this.layoutControlItem12.Text = "浜у搧鍨嬪彿";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_orgId;
+ this.layoutControlItem9.Location = new System.Drawing.Point(694, 115);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(347, 39);
+ this.layoutControlItem9.Text = "鍙戞枡缁勭粐";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem9.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
// WwBlcl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -1494,12 +1495,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
@@ -1514,6 +1513,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
this.ResumeLayout(false);
}
@@ -1571,7 +1572,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.CheckEdit txt_bl018;
@@ -1608,7 +1608,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.TextEdit txt_bl017;
@@ -1617,5 +1616,7 @@
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
}
}
\ No newline at end of file
--
Gitblit v1.9.3