From 141c4565056b0e0e800c78ee73d1727d1267415f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 03 三月 2025 08:12:13 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs |  675 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 481 insertions(+), 194 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 883cba6..18ce3ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -29,25 +29,25 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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.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.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.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -87,9 +87,15 @@
             this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_receiveContact = 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();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
             this.txt_receiveContact = new DevExpress.XtraEditors.TextEdit();
             this.txt_receiveId = new DevExpress.XtraEditors.TextEdit();
             this.txt_saleOrgId = new DevExpress.XtraEditors.TextEdit();
@@ -124,9 +130,13 @@
             this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_billTypeId = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
+            this.txt_documentStatusTxt = new DevExpress.XtraEditors.TextEdit();
             this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
+            this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_custName = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -165,6 +175,11 @@
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -210,9 +225,16 @@
             this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1eHid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -266,9 +288,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatusTxt.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -307,13 +333,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -370,18 +400,6 @@
             this.split1.SplitterPosition = 551;
             this.split1.TabIndex = 0;
             // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 512);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
-            this.pageBar1.TabIndex = 4;
-            this.pageBar1.TotalPages = 0;
-            // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -435,7 +453,11 @@
             this.gv_fbilltype,
             this.gv_saleOrgId,
             this.gv_receiveId,
-            this.gv_receiveContact});
+            this.gv_receiveContact,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -447,7 +469,7 @@
             // 
             this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "id ";
+            this.gv_id.Caption = "涓婚敭GUID";
             this.gv_id.FieldName = "id";
             this.gv_id.MinWidth = 50;
             this.gv_id.Name = "gv_id";
@@ -504,7 +526,7 @@
             this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
             this.gv_documentStatus.Caption = "鍗曟嵁鐘舵�� ";
-            this.gv_documentStatus.FieldName = "documentStatus";
+            this.gv_documentStatus.FieldName = "documentStatusTxt";
             this.gv_documentStatus.MinWidth = 50;
             this.gv_documentStatus.Name = "gv_documentStatus";
             this.gv_documentStatus.OptionsColumn.AllowEdit = false;
@@ -573,7 +595,7 @@
             // 
             this.gv_custId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_custId.AppearanceCell.Options.UseFont = true;
-            this.gv_custId.Caption = "瀹㈡埛 ";
+            this.gv_custId.Caption = "瀹㈡埛ID";
             this.gv_custId.FieldName = "custId";
             this.gv_custId.MinWidth = 50;
             this.gv_custId.Name = "gv_custId";
@@ -601,7 +623,7 @@
             // 
             this.gv_saleDeptId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_saleDeptId.AppearanceCell.Options.UseFont = true;
-            this.gv_saleDeptId.Caption = "閿�鍞儴闂� ";
+            this.gv_saleDeptId.Caption = "閿�鍞儴闂↖D";
             this.gv_saleDeptId.FieldName = "saleDeptId";
             this.gv_saleDeptId.MinWidth = 50;
             this.gv_saleDeptId.Name = "gv_saleDeptId";
@@ -615,7 +637,7 @@
             // 
             this.gv_salerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_salerId.AppearanceCell.Options.UseFont = true;
-            this.gv_salerId.Caption = "閿�鍞憳 ";
+            this.gv_salerId.Caption = "閿�鍞憳ID";
             this.gv_salerId.FieldName = "salerId";
             this.gv_salerId.MinWidth = 50;
             this.gv_salerId.Name = "gv_salerId";
@@ -961,6 +983,58 @@
             this.gv_receiveContact.VisibleIndex = 36;
             this.gv_receiveContact.Width = 94;
             // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "瀹㈡埛鍚嶇О";
+            this.gridColumn1.FieldName = "custName";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 37;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "閿�鍞儴闂�";
+            this.gridColumn2.FieldName = "saleDeptName";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 38;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "閿�鍞儴鍛�";
+            this.gridColumn3.FieldName = "salerName";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 39;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "閿�鍞粍缁�";
+            this.gridColumn4.FieldName = "xsOrgName";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 40;
+            this.gridColumn4.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 512);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
@@ -977,7 +1051,6 @@
             // 
             // splitMx1.Panel1
             // 
-            this.splitMx1.Panel1.AutoScroll = true;
             this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
             this.splitMx1.Panel1.Text = "Panel1";
             // 
@@ -986,7 +1059,7 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 335;
+            this.splitMx1.SplitterPosition = 367;
             this.splitMx1.TabIndex = 4;
             // 
             // layoutMx1
@@ -1026,21 +1099,33 @@
             this.layoutMx1.Controls.Add(this.txt_fDate);
             this.layoutMx1.Controls.Add(this.txt_billTypeId);
             this.layoutMx1.Controls.Add(this.txt_billNo);
-            this.layoutMx1.Controls.Add(this.txt_documentStatus);
+            this.layoutMx1.Controls.Add(this.txt_documentStatusTxt);
             this.layoutMx1.Controls.Add(this.txt_erpId);
             this.layoutMx1.Controls.Add(this.txt_id);
+            this.layoutMx1.Controls.Add(this.txt_xsOrgName);
+            this.layoutMx1.Controls.Add(this.txt_salerName);
+            this.layoutMx1.Controls.Add(this.txt_custName);
+            this.layoutMx1.Controls.Add(this.textEdit1);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 120, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 335);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 367);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(283, 300);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(267, 28);
+            this.lbGuid.TabIndex = 428;
+            this.lbGuid.Text = "lbGuid";
+            // 
             // txt_receiveContact
             // 
-            this.txt_receiveContact.Location = new System.Drawing.Point(119, 295);
+            this.txt_receiveContact.Location = new System.Drawing.Point(119, 300);
             this.txt_receiveContact.Name = "txt_receiveContact";
             this.txt_receiveContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
@@ -1050,7 +1135,7 @@
             // 
             // txt_receiveId
             // 
-            this.txt_receiveId.Location = new System.Drawing.Point(932, 263);
+            this.txt_receiveId.Location = new System.Drawing.Point(932, 268);
             this.txt_receiveId.Name = "txt_receiveId";
             this.txt_receiveId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
@@ -1060,7 +1145,7 @@
             // 
             // txt_saleOrgId
             // 
-            this.txt_saleOrgId.Location = new System.Drawing.Point(661, 263);
+            this.txt_saleOrgId.Location = new System.Drawing.Point(661, 268);
             this.txt_saleOrgId.Name = "txt_saleOrgId";
             this.txt_saleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_saleOrgId.Properties.Appearance.Options.UseFont = true;
@@ -1070,7 +1155,7 @@
             // 
             // txt_fbilltype
             // 
-            this.txt_fbilltype.Location = new System.Drawing.Point(390, 263);
+            this.txt_fbilltype.Location = new System.Drawing.Point(390, 268);
             this.txt_fbilltype.Name = "txt_fbilltype";
             this.txt_fbilltype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fbilltype.Properties.Appearance.Options.UseFont = true;
@@ -1080,7 +1165,7 @@
             // 
             // txt_entryNote
             // 
-            this.txt_entryNote.Location = new System.Drawing.Point(119, 263);
+            this.txt_entryNote.Location = new System.Drawing.Point(119, 268);
             this.txt_entryNote.Name = "txt_entryNote";
             this.txt_entryNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_entryNote.Properties.Appearance.Options.UseFont = true;
@@ -1090,7 +1175,7 @@
             // 
             // txt_changerId
             // 
-            this.txt_changerId.Location = new System.Drawing.Point(932, 231);
+            this.txt_changerId.Location = new System.Drawing.Point(932, 236);
             this.txt_changerId.Name = "txt_changerId";
             this.txt_changerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_changerId.Properties.Appearance.Options.UseFont = true;
@@ -1100,7 +1185,7 @@
             // 
             // txt_versionNo
             // 
-            this.txt_versionNo.Location = new System.Drawing.Point(661, 231);
+            this.txt_versionNo.Location = new System.Drawing.Point(661, 236);
             this.txt_versionNo.Name = "txt_versionNo";
             this.txt_versionNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
@@ -1110,7 +1195,7 @@
             // 
             // txt_cancellerId
             // 
-            this.txt_cancellerId.Location = new System.Drawing.Point(390, 231);
+            this.txt_cancellerId.Location = new System.Drawing.Point(390, 236);
             this.txt_cancellerId.Name = "txt_cancellerId";
             this.txt_cancellerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
@@ -1120,7 +1205,7 @@
             // 
             // txt_cancelStatus
             // 
-            this.txt_cancelStatus.Location = new System.Drawing.Point(119, 231);
+            this.txt_cancelStatus.Location = new System.Drawing.Point(119, 236);
             this.txt_cancelStatus.Name = "txt_cancelStatus";
             this.txt_cancelStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_cancelStatus.Properties.Appearance.Options.UseFont = true;
@@ -1130,7 +1215,7 @@
             // 
             // txt_changeDate
             // 
-            this.txt_changeDate.Location = new System.Drawing.Point(932, 199);
+            this.txt_changeDate.Location = new System.Drawing.Point(932, 204);
             this.txt_changeDate.Name = "txt_changeDate";
             this.txt_changeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
@@ -1140,7 +1225,7 @@
             // 
             // txt_closeDate
             // 
-            this.txt_closeDate.Location = new System.Drawing.Point(661, 199);
+            this.txt_closeDate.Location = new System.Drawing.Point(661, 204);
             this.txt_closeDate.Name = "txt_closeDate";
             this.txt_closeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
@@ -1150,7 +1235,7 @@
             // 
             // txt_closerId
             // 
-            this.txt_closerId.Location = new System.Drawing.Point(390, 199);
+            this.txt_closerId.Location = new System.Drawing.Point(390, 204);
             this.txt_closerId.Name = "txt_closerId";
             this.txt_closerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_closerId.Properties.Appearance.Options.UseFont = true;
@@ -1160,7 +1245,7 @@
             // 
             // txt_approveDate
             // 
-            this.txt_approveDate.Location = new System.Drawing.Point(119, 199);
+            this.txt_approveDate.Location = new System.Drawing.Point(119, 204);
             this.txt_approveDate.Name = "txt_approveDate";
             this.txt_approveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
@@ -1170,7 +1255,7 @@
             // 
             // txt_modifyDate
             // 
-            this.txt_modifyDate.Location = new System.Drawing.Point(932, 167);
+            this.txt_modifyDate.Location = new System.Drawing.Point(932, 172);
             this.txt_modifyDate.Name = "txt_modifyDate";
             this.txt_modifyDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
@@ -1180,7 +1265,7 @@
             // 
             // txt_modifierId
             // 
-            this.txt_modifierId.Location = new System.Drawing.Point(661, 167);
+            this.txt_modifierId.Location = new System.Drawing.Point(661, 172);
             this.txt_modifierId.Name = "txt_modifierId";
             this.txt_modifierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
@@ -1190,7 +1275,7 @@
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(390, 167);
+            this.txt_createDate.Location = new System.Drawing.Point(390, 172);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -1200,7 +1285,7 @@
             // 
             // txt_creatorId
             // 
-            this.txt_creatorId.Location = new System.Drawing.Point(119, 167);
+            this.txt_creatorId.Location = new System.Drawing.Point(119, 172);
             this.txt_creatorId.Name = "txt_creatorId";
             this.txt_creatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
@@ -1210,7 +1295,7 @@
             // 
             // txt_linkPhone
             // 
-            this.txt_linkPhone.Location = new System.Drawing.Point(932, 135);
+            this.txt_linkPhone.Location = new System.Drawing.Point(932, 140);
             this.txt_linkPhone.Name = "txt_linkPhone";
             this.txt_linkPhone.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
@@ -1220,7 +1305,7 @@
             // 
             // txt_chargeId
             // 
-            this.txt_chargeId.Location = new System.Drawing.Point(661, 135);
+            this.txt_chargeId.Location = new System.Drawing.Point(661, 140);
             this.txt_chargeId.Name = "txt_chargeId";
             this.txt_chargeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
@@ -1230,7 +1315,7 @@
             // 
             // txt_linkMan
             // 
-            this.txt_linkMan.Location = new System.Drawing.Point(390, 135);
+            this.txt_linkMan.Location = new System.Drawing.Point(390, 140);
             this.txt_linkMan.Name = "txt_linkMan";
             this.txt_linkMan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
@@ -1240,7 +1325,7 @@
             // 
             // txt_approverId
             // 
-            this.txt_approverId.Location = new System.Drawing.Point(119, 135);
+            this.txt_approverId.Location = new System.Drawing.Point(119, 140);
             this.txt_approverId.Name = "txt_approverId";
             this.txt_approverId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approverId.Properties.Appearance.Options.UseFont = true;
@@ -1250,7 +1335,7 @@
             // 
             // txt_settleId
             // 
-            this.txt_settleId.Location = new System.Drawing.Point(932, 103);
+            this.txt_settleId.Location = new System.Drawing.Point(932, 108);
             this.txt_settleId.Name = "txt_settleId";
             this.txt_settleId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_settleId.Properties.Appearance.Options.UseFont = true;
@@ -1260,7 +1345,7 @@
             // 
             // txt_note
             // 
-            this.txt_note.Location = new System.Drawing.Point(661, 103);
+            this.txt_note.Location = new System.Drawing.Point(661, 108);
             this.txt_note.Name = "txt_note";
             this.txt_note.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_note.Properties.Appearance.Options.UseFont = true;
@@ -1270,7 +1355,7 @@
             // 
             // txt_changeReason
             // 
-            this.txt_changeReason.Location = new System.Drawing.Point(390, 103);
+            this.txt_changeReason.Location = new System.Drawing.Point(390, 108);
             this.txt_changeReason.Name = "txt_changeReason";
             this.txt_changeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
@@ -1280,7 +1365,7 @@
             // 
             // txt_salerId
             // 
-            this.txt_salerId.Location = new System.Drawing.Point(119, 103);
+            this.txt_salerId.Location = new System.Drawing.Point(119, 108);
             this.txt_salerId.Name = "txt_salerId";
             this.txt_salerId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_salerId.Properties.Appearance.Options.UseFont = true;
@@ -1290,7 +1375,7 @@
             // 
             // txt_saleDeptId
             // 
-            this.txt_saleDeptId.Location = new System.Drawing.Point(932, 71);
+            this.txt_saleDeptId.Location = new System.Drawing.Point(932, 76);
             this.txt_saleDeptId.Name = "txt_saleDeptId";
             this.txt_saleDeptId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_saleDeptId.Properties.Appearance.Options.UseFont = true;
@@ -1300,7 +1385,7 @@
             // 
             // txt_closeStatus
             // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(661, 71);
+            this.txt_closeStatus.Location = new System.Drawing.Point(661, 76);
             this.txt_closeStatus.Name = "txt_closeStatus";
             this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
@@ -1310,7 +1395,7 @@
             // 
             // txt_custId
             // 
-            this.txt_custId.Location = new System.Drawing.Point(390, 71);
+            this.txt_custId.Location = new System.Drawing.Point(390, 76);
             this.txt_custId.Name = "txt_custId";
             this.txt_custId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_custId.Properties.Appearance.Options.UseFont = true;
@@ -1320,7 +1405,7 @@
             // 
             // txt_headLocId
             // 
-            this.txt_headLocId.Location = new System.Drawing.Point(119, 71);
+            this.txt_headLocId.Location = new System.Drawing.Point(119, 76);
             this.txt_headLocId.Name = "txt_headLocId";
             this.txt_headLocId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
@@ -1330,7 +1415,7 @@
             // 
             // txt_headDeliveryWay
             // 
-            this.txt_headDeliveryWay.Location = new System.Drawing.Point(932, 39);
+            this.txt_headDeliveryWay.Location = new System.Drawing.Point(932, 44);
             this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
             this.txt_headDeliveryWay.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
@@ -1340,7 +1425,7 @@
             // 
             // txt_businessType
             // 
-            this.txt_businessType.Location = new System.Drawing.Point(661, 39);
+            this.txt_businessType.Location = new System.Drawing.Point(661, 44);
             this.txt_businessType.Name = "txt_businessType";
             this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_businessType.Properties.Appearance.Options.UseFont = true;
@@ -1350,7 +1435,7 @@
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(390, 39);
+            this.txt_fDate.Location = new System.Drawing.Point(390, 44);
             this.txt_fDate.Name = "txt_fDate";
             this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fDate.Properties.Appearance.Options.UseFont = true;
@@ -1360,7 +1445,7 @@
             // 
             // txt_billTypeId
             // 
-            this.txt_billTypeId.Location = new System.Drawing.Point(932, 7);
+            this.txt_billTypeId.Location = new System.Drawing.Point(932, 12);
             this.txt_billTypeId.Name = "txt_billTypeId";
             this.txt_billTypeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
@@ -1370,7 +1455,7 @@
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(661, 7);
+            this.txt_billNo.Location = new System.Drawing.Point(661, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -1378,19 +1463,19 @@
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 216;
             // 
-            // txt_documentStatus
+            // txt_documentStatusTxt
             // 
-            this.txt_documentStatus.Location = new System.Drawing.Point(119, 39);
-            this.txt_documentStatus.Name = "txt_documentStatus";
-            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatus.Size = new System.Drawing.Size(160, 28);
-            this.txt_documentStatus.StyleController = this.layoutMx1;
-            this.txt_documentStatus.TabIndex = 229;
+            this.txt_documentStatusTxt.Location = new System.Drawing.Point(119, 44);
+            this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
+            this.txt_documentStatusTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
+            this.txt_documentStatusTxt.Size = new System.Drawing.Size(160, 28);
+            this.txt_documentStatusTxt.StyleController = this.layoutMx1;
+            this.txt_documentStatusTxt.TabIndex = 229;
             // 
             // txt_erpId
             // 
-            this.txt_erpId.Location = new System.Drawing.Point(390, 7);
+            this.txt_erpId.Location = new System.Drawing.Point(390, 12);
             this.txt_erpId.Name = "txt_erpId";
             this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_erpId.Properties.Appearance.Options.UseFont = true;
@@ -1400,7 +1485,7 @@
             // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(119, 7);
+            this.txt_id.Location = new System.Drawing.Point(119, 12);
             this.txt_id.Margin = new System.Windows.Forms.Padding(0);
             this.txt_id.Name = "txt_id";
             this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1408,6 +1493,38 @@
             this.txt_id.Size = new System.Drawing.Size(160, 28);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 213;
+            // 
+            // txt_xsOrgName
+            // 
+            this.txt_xsOrgName.Location = new System.Drawing.Point(661, 300);
+            this.txt_xsOrgName.Name = "txt_xsOrgName";
+            this.txt_xsOrgName.Size = new System.Drawing.Size(160, 24);
+            this.txt_xsOrgName.StyleController = this.layoutMx1;
+            this.txt_xsOrgName.TabIndex = 429;
+            // 
+            // txt_salerName
+            // 
+            this.txt_salerName.Location = new System.Drawing.Point(932, 300);
+            this.txt_salerName.Name = "txt_salerName";
+            this.txt_salerName.Size = new System.Drawing.Size(161, 24);
+            this.txt_salerName.StyleController = this.layoutMx1;
+            this.txt_salerName.TabIndex = 430;
+            // 
+            // txt_custName
+            // 
+            this.txt_custName.Location = new System.Drawing.Point(119, 332);
+            this.txt_custName.Name = "txt_custName";
+            this.txt_custName.Size = new System.Drawing.Size(160, 24);
+            this.txt_custName.StyleController = this.layoutMx1;
+            this.txt_custName.TabIndex = 431;
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(390, 332);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Size = new System.Drawing.Size(160, 24);
+            this.textEdit1.StyleController = this.layoutMx1;
+            this.textEdit1.TabIndex = 432;
             // 
             // Root
             // 
@@ -1451,54 +1568,61 @@
             this.layoutControlItem35,
             this.layoutControlItem36,
             this.layoutControlItem37,
-            this.layoutControlItem38});
+            this.layoutControlItem38,
+            this.layoutControlItem39,
+            this.layoutControlItem40,
+            this.layoutControlItem41,
+            this.txt_saleDeptName});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
+            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;
+            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;
             rowDefinition11.Height = 100D;
             rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16,
-            rowDefinition17,
-            rowDefinition18,
-            rowDefinition19,
-            rowDefinition20});
-            this.Root.Size = new System.Drawing.Size(1105, 340);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10,
+            rowDefinition11});
+            this.Root.Size = new System.Drawing.Size(1105, 372);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1522,12 +1646,12 @@
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txt_documentStatus;
+            this.layoutControlItem3.Control = this.txt_documentStatusTxt;
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem3.Text = "鍗曟嵁鐘舵�� ";
+            this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem4
@@ -1537,7 +1661,7 @@
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿 ";
+            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem5
@@ -1547,7 +1671,7 @@
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷 ";
+            this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem6
@@ -1558,7 +1682,7 @@
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem6.Text = "鏃ユ湡 ";
+            this.layoutControlItem6.Text = "鏃ユ湡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem7
@@ -1569,7 +1693,7 @@
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem7.Text = "涓氬姟绫诲瀷 ";
+            this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem8
@@ -1580,7 +1704,7 @@
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem8.Text = "浜よ揣鏂瑰紡 ";
+            this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem9
@@ -1590,7 +1714,7 @@
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem9.Text = "浜よ揣鍦扮偣 ";
+            this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem10
@@ -1601,7 +1725,7 @@
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem10.Text = "瀹㈡埛 ";
+            this.layoutControlItem10.Text = "瀹㈡埛ID";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem11
@@ -1612,7 +1736,7 @@
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem11.Text = "鍏抽棴鐘舵�� ";
+            this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem12
@@ -1623,7 +1747,7 @@
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem12.Text = "閿�鍞儴闂� ";
+            this.layoutControlItem12.Text = "閿�鍞儴闂↖D";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem13
@@ -1633,7 +1757,7 @@
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem13.Text = "閿�鍞憳 ";
+            this.layoutControlItem13.Text = "閿�鍞憳ID";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem14
@@ -1644,7 +1768,7 @@
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜 ";
+            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem15
@@ -1655,7 +1779,7 @@
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem15.Text = "澶囨敞 ";
+            this.layoutControlItem15.Text = "澶囨敞";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem16
@@ -1666,7 +1790,7 @@
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem16.Text = "缁撶畻鏂� ";
+            this.layoutControlItem16.Text = "缁撶畻鏂�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem17
@@ -1687,7 +1811,7 @@
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem18.Text = "鏀惰揣浜哄鍚� ";
+            this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem19
@@ -1698,7 +1822,7 @@
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem19.Text = "浠樻鏂� ";
+            this.layoutControlItem19.Text = "浠樻鏂�";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem20
@@ -1709,7 +1833,7 @@
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem20.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽 ";
+            this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem21
@@ -1719,7 +1843,7 @@
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
             this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem21.Text = "鍒涘缓浜� ";
+            this.layoutControlItem21.Text = "鍒涘缓浜�";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem22
@@ -1762,7 +1886,7 @@
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
             this.layoutControlItem25.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡 ";
+            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem26
@@ -1773,7 +1897,7 @@
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
             this.layoutControlItem26.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem26.Text = "鍏抽棴浜� ";
+            this.layoutControlItem26.Text = "鍏抽棴浜�";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem27
@@ -1784,7 +1908,7 @@
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
             this.layoutControlItem27.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡 ";
+            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem28
@@ -1795,7 +1919,7 @@
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6;
             this.layoutControlItem28.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡 ";
+            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem29
@@ -1805,7 +1929,7 @@
             this.layoutControlItem29.Name = "layoutControlItem29";
             this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
             this.layoutControlItem29.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem29.Text = "浣滃簾鐘舵�� ";
+            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
             this.layoutControlItem29.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem30
@@ -1816,7 +1940,7 @@
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
             this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem30.Text = "浣滃簾浜� ";
+            this.layoutControlItem30.Text = "浣滃簾浜�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem31
@@ -1827,7 +1951,7 @@
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 7;
             this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem31.Text = "鐗堟湰鍙� ";
+            this.layoutControlItem31.Text = "鐗堟湰鍙�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem32
@@ -1838,7 +1962,7 @@
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 7;
             this.layoutControlItem32.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem32.Text = "鍙樻洿浜� ";
+            this.layoutControlItem32.Text = "鍙樻洿浜�";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem33
@@ -1848,7 +1972,7 @@
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 8;
             this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem33.Text = "澶囨敞 ";
+            this.layoutControlItem33.Text = "澶囨敞";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem34
@@ -1870,7 +1994,7 @@
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
             this.layoutControlItem35.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem35.Text = "閿�鍞粍缁嘔D ";
+            this.layoutControlItem35.Text = "閿�鍞粍缁嘔D";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem36
@@ -1881,7 +2005,7 @@
             this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 8;
             this.layoutControlItem36.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem36.Text = "鏀惰揣鏂� ";
+            this.layoutControlItem36.Text = "鏀惰揣鏂�";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem37
@@ -1891,8 +2015,63 @@
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 9;
             this.layoutControlItem37.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem37.Text = "鏀惰揣鏂硅仈绯讳汉 ";
+            this.layoutControlItem37.Text = "鏀惰揣鏂硅仈绯讳汉";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(95, 18);
+            // 
+            // layoutControlItem38
+            // 
+            this.layoutControlItem38.Control = this.lbGuid;
+            this.layoutControlItem38.Location = new System.Drawing.Point(271, 288);
+            this.layoutControlItem38.Name = "layoutControlItem38";
+            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 9;
+            this.layoutControlItem38.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem38.Text = "lbGuid";
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem38.TextVisible = false;
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.txt_xsOrgName;
+            this.layoutControlItem39.Location = new System.Drawing.Point(542, 288);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 9;
+            this.layoutControlItem39.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem39.Text = "閿�鍞粍缁囧悕";
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(95, 18);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_salerName;
+            this.layoutControlItem40.Location = new System.Drawing.Point(813, 288);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 9;
+            this.layoutControlItem40.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem40.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(95, 18);
+            // 
+            // layoutControlItem41
+            // 
+            this.layoutControlItem41.Control = this.txt_custName;
+            this.layoutControlItem41.Location = new System.Drawing.Point(0, 320);
+            this.layoutControlItem41.Name = "layoutControlItem41";
+            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 10;
+            this.layoutControlItem41.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(95, 18);
+            // 
+            // txt_saleDeptName
+            // 
+            this.txt_saleDeptName.Control = this.textEdit1;
+            this.txt_saleDeptName.Location = new System.Drawing.Point(271, 320);
+            this.txt_saleDeptName.Name = "txt_saleDeptName";
+            this.txt_saleDeptName.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.txt_saleDeptName.OptionsTableLayoutItem.RowIndex = 10;
+            this.txt_saleDeptName.Size = new System.Drawing.Size(271, 32);
+            this.txt_saleDeptName.Text = "閿�鍞儴闂ㄥ悕绉�";
+            this.txt_saleDeptName.TextSize = new System.Drawing.Size(95, 18);
             // 
             // tabMx
             // 
@@ -1900,7 +2079,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 223);
+            this.tabMx.Size = new System.Drawing.Size(1126, 191);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1909,7 +2088,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 191);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 159);
             this.tabMxPage1.Text = "閿�鍞槑缁�";
             // 
             // gcMx1
@@ -1918,7 +2097,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 191);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 159);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1966,7 +2145,16 @@
             this.gvMx1supplyOrgId,
             this.gvMx1stockOrgId,
             this.gvMx1settleOrgIds,
-            this.gvMx1eHid});
+            this.gvMx1eHid,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1978,7 +2166,7 @@
             // 
             this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "id ";
+            this.gvMx1id.Caption = "涓婚敭GUID";
             this.gvMx1id.FieldName = "id";
             this.gvMx1id.MinWidth = 50;
             this.gvMx1id.Name = "gvMx1id";
@@ -1991,7 +2179,7 @@
             // 
             this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid ";
+            this.gvMx1pid.Caption = "澶栭敭GUID";
             this.gvMx1pid.FieldName = "pid";
             this.gvMx1pid.MinWidth = 50;
             this.gvMx1pid.Name = "gvMx1pid";
@@ -2017,7 +2205,7 @@
             // 
             this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1materialId.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx1materialId.Caption = "鐗╂枡ID";
             this.gvMx1materialId.FieldName = "materialId";
             this.gvMx1materialId.MinWidth = 50;
             this.gvMx1materialId.Name = "gvMx1materialId";
@@ -2030,7 +2218,7 @@
             // 
             this.gvMx1unitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1unitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1unitId.Caption = "閿�鍞崟浣� ";
+            this.gvMx1unitId.Caption = "閿�鍞崟浣岻D";
             this.gvMx1unitId.FieldName = "unitId";
             this.gvMx1unitId.MinWidth = 50;
             this.gvMx1unitId.Name = "gvMx1unitId";
@@ -2056,7 +2244,7 @@
             // 
             this.gvMx1priceUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1priceUnitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1priceUnitId.Caption = "璁′环鍗曚綅 ";
+            this.gvMx1priceUnitId.Caption = "璁′环鍗曚綅ID";
             this.gvMx1priceUnitId.FieldName = "priceUnitId";
             this.gvMx1priceUnitId.MinWidth = 50;
             this.gvMx1priceUnitId.Name = "gvMx1priceUnitId";
@@ -2199,7 +2387,7 @@
             // 
             this.gvMx1outLmtUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1outLmtUnitId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1outLmtUnitId.Caption = "瓒呭彂鎺у埗鍗曚綅 ";
+            this.gvMx1outLmtUnitId.Caption = "瓒呭彂鎺у埗鍗曚綅ID";
             this.gvMx1outLmtUnitId.FieldName = "outLmtUnitId";
             this.gvMx1outLmtUnitId.MinWidth = 50;
             this.gvMx1outLmtUnitId.Name = "gvMx1outLmtUnitId";
@@ -2459,7 +2647,7 @@
             // 
             this.gvMx1supplyOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1supplyOrgId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1supplyOrgId.Caption = "渚涘簲缁勭粐 ";
+            this.gvMx1supplyOrgId.Caption = "渚涘簲缁勭粐ID";
             this.gvMx1supplyOrgId.FieldName = "supplyOrgId";
             this.gvMx1supplyOrgId.MinWidth = 50;
             this.gvMx1supplyOrgId.Name = "gvMx1supplyOrgId";
@@ -2472,7 +2660,7 @@
             // 
             this.gvMx1stockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1stockOrgId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1stockOrgId.Caption = "搴撳瓨缁勭粐 ";
+            this.gvMx1stockOrgId.Caption = "搴撳瓨缁勭粐ID";
             this.gvMx1stockOrgId.FieldName = "stockOrgId";
             this.gvMx1stockOrgId.MinWidth = 50;
             this.gvMx1stockOrgId.Name = "gvMx1stockOrgId";
@@ -2485,7 +2673,7 @@
             // 
             this.gvMx1settleOrgIds.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1settleOrgIds.AppearanceCell.Options.UseFont = true;
-            this.gvMx1settleOrgIds.Caption = "缁撶畻缁勭粐 ";
+            this.gvMx1settleOrgIds.Caption = "缁撶畻缁勭粐ID";
             this.gvMx1settleOrgIds.FieldName = "settleOrgIds";
             this.gvMx1settleOrgIds.MinWidth = 50;
             this.gvMx1settleOrgIds.Name = "gvMx1settleOrgIds";
@@ -2507,6 +2695,96 @@
             this.gvMx1eHid.VisibleIndex = 40;
             this.gvMx1eHid.Width = 94;
             // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn5.FieldName = "itemName";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 41;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn6.FieldName = "itemName";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 42;
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鐗╂枡鍨嬪彿";
+            this.gridColumn7.FieldName = "itemModel";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 43;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "閿�鍞崟浣�";
+            this.gridColumn8.FieldName = "unitName";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 44;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "璁′环鍗曚綅";
+            this.gridColumn9.FieldName = "priceUnitName";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 45;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "瓒呭彂鎺у埗鍗曚綅";
+            this.gridColumn10.FieldName = "outLmtUnitName";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 46;
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "渚涘簲缁勭粐";
+            this.gridColumn11.FieldName = "gyOrgName";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 47;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "搴撳瓨缁勭粐";
+            this.gridColumn12.FieldName = "kcOrgName";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 48;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "缁撶畻缁勭粐";
+            this.gridColumn13.FieldName = "jsOrgName";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 49;
+            this.gridColumn13.Width = 94;
+            // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -2517,26 +2795,6 @@
             this.picCheckBox.TabIndex = 9;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(283, 295);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(267, 28);
-            this.lbGuid.TabIndex = 428;
-            this.lbGuid.Text = "lbGuid";
-            // 
-            // layoutControlItem38
-            // 
-            this.layoutControlItem38.Control = this.lbGuid;
-            this.layoutControlItem38.Location = new System.Drawing.Point(271, 288);
-            this.layoutControlItem38.Name = "layoutControlItem38";
-            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 9;
-            this.layoutControlItem38.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem38.Text = "lbGuid";
-            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem38.TextVisible = false;
             // 
             // Frm_SalesOrder
             // 
@@ -2601,9 +2859,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatusTxt.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -2642,13 +2904,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2752,7 +3018,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
+        private DevExpress.XtraEditors.TextEdit txt_documentStatusTxt;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraEditors.TextEdit txt_billTypeId;
@@ -2823,5 +3089,26 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraEditors.TextEdit txt_xsOrgName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+        private DevExpress.XtraEditors.TextEdit txt_salerName;
+        private DevExpress.XtraEditors.TextEdit txt_custName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraLayout.LayoutControlItem txt_saleDeptName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3