From 22d06658ca67614ec1bce0449031df6c5448b2ef Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 17 十月 2025 11:09:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 3
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 290 ++++++++++++++++++++++++++++++---------------------------
2 files changed, 155 insertions(+), 138 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index 7a1ee75..b6dcd65 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -29,18 +29,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.XtraLayout.RowDefinition rowDefinition3 = 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();
+ 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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -64,6 +64,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_wwGys = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_bl007 = new DevExpress.XtraEditors.TextEdit();
this.txt_blNo = new DevExpress.XtraEditors.TextEdit();
@@ -85,6 +87,8 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.缁勭粐鏈烘瀯 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.渚涘簲鍟� = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -118,10 +122,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
- this.缁勭粐鏈烘瀯 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_wwGys = new Gs.DevApp.UserControl.UcLookSupplier();
- this.渚涘簲鍟� = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -160,6 +161,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.渚涘簲鍟�)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -169,8 +172,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.渚涘簲鍟�)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -182,7 +183,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1601, 98);
@@ -194,7 +195,7 @@
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
this.xtraTabControl1.Size = new System.Drawing.Size(1601, 736);
@@ -206,7 +207,7 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1599, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
@@ -217,7 +218,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -237,10 +238,10 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.Size = new System.Drawing.Size(1599, 635);
this.gcMain1.TabIndex = 2;
@@ -258,6 +259,7 @@
this.gv_bl018,
this.gv_bl019,
this.gv_blNo,
+ this.gridColumn12,
this.gv_bl004,
this.gv_bl005,
this.gv_bl016,
@@ -458,7 +460,7 @@
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.Size = new System.Drawing.Size(1599, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
@@ -468,7 +470,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -503,13 +505,31 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(663, 385, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1599, 138);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_wwGys
+ //
+ this.txt_wwGys.IsReadly = false;
+ this.txt_wwGys.Location = new System.Drawing.Point(490, 90);
+ this.txt_wwGys.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_wwGys.Name = "txt_wwGys";
+ this.txt_wwGys.Size = new System.Drawing.Size(307, 28);
+ this.txt_wwGys.TabIndex = 448;
+ //
+ // txt_orgId
+ //
+ this.txt_orgId.IsReadly = false;
+ this.txt_orgId.Location = new System.Drawing.Point(490, 51);
+ 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(307, 28);
+ this.txt_orgId.TabIndex = 447;
//
// lbGuid
//
@@ -523,65 +543,65 @@
//
// txt_bl007
//
- this.txt_bl007.Location = new System.Drawing.Point(101, 52);
- this.txt_bl007.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl007.Location = new System.Drawing.Point(96, 51);
+ this.txt_bl007.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl007.Name = "txt_bl007";
this.txt_bl007.Properties.Appearance.Options.UseFont = true;
- this.txt_bl007.Size = new System.Drawing.Size(302, 28);
+ this.txt_bl007.Size = new System.Drawing.Size(306, 28);
this.txt_bl007.StyleController = this.layoutMx1;
this.txt_bl007.TabIndex = 228;
//
// txt_blNo
//
- this.txt_blNo.Location = new System.Drawing.Point(101, 14);
- this.txt_blNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_blNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_blNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_blNo.Name = "txt_blNo";
this.txt_blNo.Properties.Appearance.Options.UseFont = true;
this.txt_blNo.Properties.Tag = "readOnly";
- this.txt_blNo.Size = new System.Drawing.Size(302, 28);
+ this.txt_blNo.Size = new System.Drawing.Size(306, 28);
this.txt_blNo.StyleController = this.layoutMx1;
this.txt_blNo.TabIndex = 211;
this.txt_blNo.Tag = "readonly";
//
// txt_bl006
//
- this.txt_bl006.Location = new System.Drawing.Point(1282, 52);
- this.txt_bl006.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl006.Location = new System.Drawing.Point(1280, 51);
+ this.txt_bl006.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl006.Name = "txt_bl006";
this.txt_bl006.Properties.Appearance.Options.UseFont = true;
- this.txt_bl006.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl006.Size = new System.Drawing.Size(307, 28);
this.txt_bl006.StyleController = this.layoutMx1;
this.txt_bl006.TabIndex = 226;
this.txt_bl006.Tag = "readonly";
//
// txt_bl016
//
- this.txt_bl016.Location = new System.Drawing.Point(1282, 14);
- this.txt_bl016.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl016.Location = new System.Drawing.Point(1280, 12);
+ this.txt_bl016.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl016.Name = "txt_bl016";
this.txt_bl016.Properties.Appearance.Options.UseFont = true;
- this.txt_bl016.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl016.Size = new System.Drawing.Size(307, 28);
this.txt_bl016.StyleController = this.layoutMx1;
this.txt_bl016.TabIndex = 267;
this.txt_bl016.Tag = "readonly";
//
// txt_bl018
//
- this.txt_bl018.Location = new System.Drawing.Point(1195, 90);
- this.txt_bl018.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl018.Location = new System.Drawing.Point(1196, 90);
+ this.txt_bl018.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl018.Name = "txt_bl018";
this.txt_bl018.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_bl018.Size = new System.Drawing.Size(390, 27);
+ this.txt_bl018.Size = new System.Drawing.Size(391, 27);
this.txt_bl018.StyleController = this.layoutMx1;
this.txt_bl018.TabIndex = 295;
//
// txt_bl017
//
this.txt_bl017.Enabled = false;
- this.txt_bl017.Location = new System.Drawing.Point(494, 14);
- this.txt_bl017.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl017.Location = new System.Drawing.Point(490, 12);
+ this.txt_bl017.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl017.Name = "txt_bl017";
- this.txt_bl017.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl017.Size = new System.Drawing.Size(307, 28);
this.txt_bl017.StyleController = this.layoutMx1;
this.txt_bl017.TabIndex = 296;
this.txt_bl017.Tag = "readonly";
@@ -589,8 +609,8 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(14, 90);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnSelect.Location = new System.Drawing.Point(12, 90);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(171, 34);
this.btnSelect.StyleController = this.layoutMx1;
@@ -599,20 +619,20 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(888, 14);
- this.textEdit1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textEdit1.Location = new System.Drawing.Point(885, 12);
+ this.textEdit1.Margin = new System.Windows.Forms.Padding(4);
this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(303, 28);
+ this.textEdit1.Size = new System.Drawing.Size(307, 28);
this.textEdit1.StyleController = this.layoutMx1;
this.textEdit1.TabIndex = 445;
this.textEdit1.Tag = "readonly";
//
// textEdit2
//
- this.textEdit2.Location = new System.Drawing.Point(888, 52);
- this.textEdit2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textEdit2.Location = new System.Drawing.Point(885, 51);
+ this.textEdit2.Margin = new System.Windows.Forms.Padding(4);
this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(303, 28);
+ this.textEdit2.Size = new System.Drawing.Size(307, 28);
this.textEdit2.StyleController = this.layoutMx1;
this.textEdit2.TabIndex = 446;
this.textEdit2.Tag = "readonly";
@@ -647,29 +667,29 @@
this.渚涘簲鍟唥);
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1599, 138);
this.Root.TextVisible = false;
//
@@ -678,29 +698,29 @@
this.layoutControlItem1.Control = this.txt_blNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(394, 39);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bl017;
- this.layoutControlItem8.Location = new System.Drawing.Point(393, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(394, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem8.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem8.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.btnSelect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 78);
this.layoutControlItem13.MaxSize = new System.Drawing.Size(175, 38);
this.layoutControlItem13.MinSize = new System.Drawing.Size(119, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem13.Size = new System.Drawing.Size(394, 40);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -709,21 +729,21 @@
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_bl007;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 39);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem14.Size = new System.Drawing.Size(394, 39);
this.layoutControlItem14.Text = "鍗曟嵁澶囨敞";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_bl018;
- this.layoutControlItem15.Location = new System.Drawing.Point(1181, 76);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1184, 78);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(395, 40);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -731,50 +751,70 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_bl006;
- this.layoutControlItem3.Location = new System.Drawing.Point(1181, 38);
+ this.layoutControlItem3.Location = new System.Drawing.Point(1184, 39);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem3.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_bl016;
- this.layoutControlItem4.Location = new System.Drawing.Point(1181, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(1184, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem4.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.textEdit1;
- this.layoutControlItem2.Location = new System.Drawing.Point(787, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(789, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem2.Text = "鍒跺崟浜哄憳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.textEdit2;
- this.layoutControlItem5.Location = new System.Drawing.Point(787, 38);
+ this.layoutControlItem5.Location = new System.Drawing.Point(789, 39);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem5.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem5.Text = "鍒跺崟鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // 缁勭粐鏈烘瀯
+ //
+ this.缁勭粐鏈烘瀯.Control = this.txt_orgId;
+ this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(394, 39);
+ this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.RowIndex = 1;
+ this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(395, 39);
+ this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // 渚涘簲鍟�
+ //
+ this.渚涘簲鍟�.Control = this.txt_wwGys;
+ this.渚涘簲鍟�.Location = new System.Drawing.Point(394, 78);
+ this.渚涘簲鍟�.Name = "渚涘簲鍟�";
+ this.渚涘簲鍟�.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.渚涘簲鍟�.OptionsTableLayoutItem.RowIndex = 2;
+ this.渚涘簲鍟�.Size = new System.Drawing.Size(395, 40);
+ this.渚涘簲鍟�.TextSize = new System.Drawing.Size(72, 22);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
this.tabMx.Size = new System.Drawing.Size(1599, 545);
@@ -785,7 +825,7 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1597, 507);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
@@ -793,10 +833,10 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
@@ -1006,10 +1046,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1140,7 +1180,7 @@
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
this.picCheckBox.Location = new System.Drawing.Point(1235, 67);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1148,43 +1188,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_orgId
+ // gridColumn12
//
- this.txt_orgId.IsReadly = false;
- this.txt_orgId.Location = new System.Drawing.Point(494, 52);
- 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(303, 28);
- this.txt_orgId.TabIndex = 447;
- //
- // 缁勭粐鏈烘瀯
- //
- this.缁勭粐鏈烘瀯.Control = this.txt_orgId;
- this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(393, 38);
- this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
- this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.ColumnIndex = 1;
- this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.RowIndex = 1;
- this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(394, 38);
- this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
- //
- // txt_wwGys
- //
- this.txt_wwGys.IsReadly = false;
- this.txt_wwGys.Location = new System.Drawing.Point(494, 90);
- this.txt_wwGys.Margin = new System.Windows.Forms.Padding(0);
- this.txt_wwGys.Name = "txt_wwGys";
- this.txt_wwGys.Size = new System.Drawing.Size(303, 28);
- this.txt_wwGys.TabIndex = 448;
- //
- // 渚涘簲鍟�
- //
- this.渚涘簲鍟�.Control = this.txt_wwGys;
- this.渚涘簲鍟�.Location = new System.Drawing.Point(393, 76);
- this.渚涘簲鍟�.Name = "渚涘簲鍟�";
- this.渚涘簲鍟�.OptionsTableLayoutItem.ColumnIndex = 1;
- this.渚涘簲鍟�.OptionsTableLayoutItem.RowIndex = 2;
- this.渚涘簲鍟�.Size = new System.Drawing.Size(394, 38);
- this.渚涘簲鍟�.TextSize = new System.Drawing.Size(72, 22);
+ this.gridColumn12.Caption = "渚涘簲鍟�";
+ this.gridColumn12.FieldName = "suppName";
+ this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "sup.supp_name";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.Width = 112;
//
// WwBlcl
//
@@ -1193,7 +1206,7 @@
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "WwBlcl";
this.Size = new System.Drawing.Size(1601, 834);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1234,6 +1247,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.渚涘簲鍟�)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1243,8 +1258,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.渚涘簲鍟�)).EndInit();
this.ResumeLayout(false);
}
@@ -1330,5 +1343,6 @@
private UserControl.UcLookOrg txt_orgId;
private DevExpress.XtraLayout.LayoutControlItem 缁勭粐鏈烘瀯;
private DevExpress.XtraLayout.LayoutControlItem 渚涘簲鍟�;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index af1ffc8..5380f01 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -270,6 +270,9 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_orgId.IsReadly = true;
+ txt_wwGys.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
--
Gitblit v1.9.3