From 0182a12e08e1253e9fb2d1b4dabb353babf1feea Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 25 十月 2025 09:01:49 +0800
Subject: [PATCH] 更新操作人

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs |  260 ++++++++++++++++++++++++++--------------------------
 1 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 9b87f89..4cab475 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -30,25 +30,25 @@
         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.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = 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.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 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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -103,6 +103,7 @@
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -122,7 +123,6 @@
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -204,6 +204,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -223,7 +224,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -400,7 +400,7 @@
             // 
             this.gv_fCreatorId.AppearanceCell.Options.UseFont = true;
             this.gv_fCreatorId.Caption = "鍒涘缓浜� ";
-            this.gv_fCreatorId.FieldName = "fCreatorId";
+            this.gv_fCreatorId.FieldName = "cjPeople";
             this.gv_fCreatorId.MinWidth = 50;
             this.gv_fCreatorId.Name = "gv_fCreatorId";
             this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
@@ -413,7 +413,7 @@
             // 
             this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
             this.gv_fApproverID.Caption = "瀹℃牳浜�";
-            this.gv_fApproverID.FieldName = "fApproverID";
+            this.gv_fApproverID.FieldName = "shPeople";
             this.gv_fApproverID.MinWidth = 50;
             this.gv_fApproverID.Name = "gv_fApproverID";
             this.gv_fApproverID.OptionsColumn.AllowEdit = false;
@@ -534,7 +534,7 @@
             // gridColumn39
             // 
             this.gridColumn39.Caption = "璐㈠姟瀹℃牳浜�";
-            this.gridColumn39.FieldName = "qt031";
+            this.gridColumn39.FieldName = "cwPeople";
             this.gridColumn39.MinWidth = 25;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.Visible = true;
@@ -648,10 +648,10 @@
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(671, 74);
+            this.txt_chkStatus.Location = new System.Drawing.Point(682, 74);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_chkStatus.Size = new System.Drawing.Size(326, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 376;
             this.txt_chkStatus.Tag = "readonly";
@@ -671,7 +671,7 @@
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(223, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -686,16 +686,16 @@
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(223, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
             this.txt_fBillTypeID.StyleController = this.layoutMx1;
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(773, 12);
+            this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
             this.txt_fApproverID.Name = "txt_fApproverID";
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverID.Size = new System.Drawing.Size(224, 24);
+            this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
             this.txt_fApproverID.StyleController = this.layoutMx1;
             this.txt_fApproverID.TabIndex = 222;
             this.txt_fApproverID.Tag = "readonly";
@@ -705,35 +705,35 @@
             this.txt_salesId.IsReadly = false;
             this.txt_salesId.Location = new System.Drawing.Point(114, 74);
             this.txt_salesId.Name = "txt_salesId";
-            this.txt_salesId.Size = new System.Drawing.Size(223, 24);
+            this.txt_salesId.Size = new System.Drawing.Size(229, 24);
             this.txt_salesId.TabIndex = 367;
             // 
             // txt_fSaleOrgIdTxt
             // 
-            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(443, 12);
+            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
             this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
             this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(224, 24);
+            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
             this.txt_fSaleOrgIdTxt.TabIndex = 365;
             this.txt_fSaleOrgIdTxt.Tag = "readonly";
             // 
             // txt_fCreatorId
             // 
-            this.txt_fCreatorId.Location = new System.Drawing.Point(1103, 105);
+            this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 105);
             this.txt_fCreatorId.Name = "txt_fCreatorId";
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(224, 24);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
             this.txt_fCreatorId.StyleController = this.layoutMx1;
             this.txt_fCreatorId.TabIndex = 219;
             this.txt_fCreatorId.Tag = "readonly";
             // 
             // txt_fApproveDate
             // 
-            this.txt_fApproveDate.Location = new System.Drawing.Point(773, 43);
+            this.txt_fApproveDate.Location = new System.Drawing.Point(784, 43);
             this.txt_fApproveDate.Name = "txt_fApproveDate";
             this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproveDate.Size = new System.Drawing.Size(224, 24);
+            this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
             this.txt_fApproveDate.StyleController = this.layoutMx1;
             this.txt_fApproveDate.TabIndex = 228;
             this.txt_fApproveDate.Tag = "readonly";
@@ -743,54 +743,54 @@
             this.txt_fNote.Location = new System.Drawing.Point(114, 105);
             this.txt_fNote.Name = "txt_fNote";
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_fNote.Size = new System.Drawing.Size(223, 24);
+            this.txt_fNote.Size = new System.Drawing.Size(229, 24);
             this.txt_fNote.StyleController = this.layoutMx1;
             this.txt_fNote.TabIndex = 243;
             // 
             // txt_fSalesManIDTxt
             // 
-            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(773, 105);
+            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 105);
             this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
             this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(224, 24);
+            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
             this.txt_fSalesManIDTxt.TabIndex = 231;
             this.txt_fSalesManIDTxt.Tag = "readonly";
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(1103, 136);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 136);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(224, 24);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
             this.txt_fCreateDate.StyleController = this.layoutMx1;
             this.txt_fCreateDate.TabIndex = 226;
             this.txt_fCreateDate.Tag = "readonly";
             // 
             // txt_fCustomerIDTxt
             // 
-            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(443, 43);
+            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 43);
             this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
             this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(224, 24);
+            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
             this.txt_fCustomerIDTxt.TabIndex = 368;
             this.txt_fCustomerIDTxt.Tag = "readonly";
             // 
             // txt_shf
             // 
-            this.txt_shf.Location = new System.Drawing.Point(443, 74);
+            this.txt_shf.Location = new System.Drawing.Point(449, 74);
             this.txt_shf.Name = "txt_shf";
-            this.txt_shf.Size = new System.Drawing.Size(224, 24);
+            this.txt_shf.Size = new System.Drawing.Size(229, 24);
             this.txt_shf.StyleController = this.layoutMx1;
             this.txt_shf.TabIndex = 373;
             this.txt_shf.Tag = "readonly";
             // 
             // txt_shName
             // 
-            this.txt_shName.Location = new System.Drawing.Point(443, 105);
+            this.txt_shName.Location = new System.Drawing.Point(449, 105);
             this.txt_shName.Name = "txt_shName";
-            this.txt_shName.Size = new System.Drawing.Size(224, 24);
+            this.txt_shName.Size = new System.Drawing.Size(229, 24);
             this.txt_shName.StyleController = this.layoutMx1;
             this.txt_shName.TabIndex = 374;
             this.txt_shName.Tag = "readonly";
@@ -807,31 +807,31 @@
             // 
             // txt_qt031
             // 
-            this.txt_qt031.Location = new System.Drawing.Point(1103, 12);
+            this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
             this.txt_qt031.Name = "txt_qt031";
             this.txt_qt031.Properties.ReadOnly = true;
-            this.txt_qt031.Size = new System.Drawing.Size(224, 24);
+            this.txt_qt031.Size = new System.Drawing.Size(229, 24);
             this.txt_qt031.StyleController = this.layoutMx1;
             this.txt_qt031.TabIndex = 378;
             this.txt_qt031.Tag = "readonly";
             // 
             // txt_qt030
             // 
-            this.txt_qt030.Location = new System.Drawing.Point(1103, 43);
+            this.txt_qt030.Location = new System.Drawing.Point(1119, 43);
             this.txt_qt030.Name = "txt_qt030";
             this.txt_qt030.Properties.ReadOnly = true;
-            this.txt_qt030.Size = new System.Drawing.Size(224, 24);
+            this.txt_qt030.Size = new System.Drawing.Size(229, 24);
             this.txt_qt030.StyleController = this.layoutMx1;
             this.txt_qt030.TabIndex = 379;
             this.txt_qt030.Tag = "readonly";
             // 
             // txt_qt029
             // 
-            this.txt_qt029.Location = new System.Drawing.Point(1001, 74);
+            this.txt_qt029.Location = new System.Drawing.Point(1017, 74);
             this.txt_qt029.Name = "txt_qt029";
             this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
             this.txt_qt029.Properties.ReadOnly = true;
-            this.txt_qt029.Size = new System.Drawing.Size(326, 24);
+            this.txt_qt029.Size = new System.Drawing.Size(331, 24);
             this.txt_qt029.StyleController = this.layoutMx1;
             this.txt_qt029.TabIndex = 380;
             this.txt_qt029.Tag = "readonly";
@@ -884,6 +884,17 @@
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_SaleOrgId;
+            this.layoutControlItem22.Location = new System.Drawing.Point(329, 124);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            // 
             // layoutControlGroup1
             // 
             this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -909,36 +920,36 @@
             this.layoutControlItem21});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.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.layoutControlGroup1.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;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 175);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem13
@@ -946,11 +957,11 @@
             this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
             this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem13.Location = new System.Drawing.Point(329, 31);
+            this.layoutControlItem13.Location = new System.Drawing.Point(335, 31);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -959,10 +970,10 @@
             this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
-            this.layoutControlItem5.Location = new System.Drawing.Point(329, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem5.Text = "閿�鍞粍缁�";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -971,11 +982,11 @@
             this.layoutControlItem14.Control = this.txt_shf;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
-            this.layoutControlItem14.Location = new System.Drawing.Point(329, 62);
+            this.layoutControlItem14.Location = new System.Drawing.Point(335, 62);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem14.Text = "鏀惰揣鏂�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -987,7 +998,7 @@
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(329, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem8.Text = "鐢宠澶囨敞";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -999,7 +1010,7 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(329, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem4.Text = "閿�鍞鍗�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1008,10 +1019,10 @@
             this.layoutControlItem10.Control = this.txt_fApproverID;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
-            this.layoutControlItem10.Location = new System.Drawing.Point(659, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1020,22 +1031,22 @@
             this.layoutControlItem11.Control = this.txt_fApproveDate;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem11.Location = new System.Drawing.Point(659, 31);
+            this.layoutControlItem11.Location = new System.Drawing.Point(670, 31);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_chkStatus;
-            this.layoutControlItem15.Location = new System.Drawing.Point(659, 62);
+            this.layoutControlItem15.Location = new System.Drawing.Point(670, 62);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem15.TextVisible = false;
@@ -1043,32 +1054,32 @@
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_qt031;
-            this.layoutControlItem18.Location = new System.Drawing.Point(989, 0);
+            this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem18.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_qt030;
-            this.layoutControlItem19.Location = new System.Drawing.Point(989, 31);
+            this.layoutControlItem19.Location = new System.Drawing.Point(1005, 31);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_qt029;
-            this.layoutControlItem20.Location = new System.Drawing.Point(989, 62);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1005, 62);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem20.TextVisible = false;
@@ -1078,11 +1089,11 @@
             this.layoutControlItem6.Control = this.txt_fCreatorId;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
-            this.layoutControlItem6.Location = new System.Drawing.Point(989, 93);
+            this.layoutControlItem6.Location = new System.Drawing.Point(1005, 93);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1091,11 +1102,11 @@
             this.layoutControlItem7.Control = this.txt_fCreateDate;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem7.Location = new System.Drawing.Point(989, 124);
+            this.layoutControlItem7.Location = new System.Drawing.Point(1005, 124);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem7.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1104,11 +1115,11 @@
             this.layoutControlItem17.Control = this.txt_shName;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
-            this.layoutControlItem17.Location = new System.Drawing.Point(329, 93);
+            this.layoutControlItem17.Location = new System.Drawing.Point(335, 93);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1117,11 +1128,11 @@
             this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
-            this.layoutControlItem9.Location = new System.Drawing.Point(659, 93);
+            this.layoutControlItem9.Location = new System.Drawing.Point(670, 93);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem9.Text = "閿�鍞汉鍛�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1133,7 +1144,7 @@
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(329, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1144,7 +1155,7 @@
             this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(329, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem2.Text = "鐢宠缂栧彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1157,21 +1168,10 @@
             this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
+            this.layoutControlItem21.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem21.TextVisible = false;
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_SaleOrgId;
-            this.layoutControlItem22.Location = new System.Drawing.Point(329, 124);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
-            this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1536,10 +1536,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1584,9 +1584,9 @@
             // rptCk
             // 
             this.rptCk.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
             this.rptCk.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptCk.Name = "rptCk";
             this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
             // 
@@ -1660,6 +1660,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -1679,7 +1680,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);

--
Gitblit v1.9.3