From f09ac29b50b114b56ad9c26435b482339cf79057 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 17:00:06 +0800
Subject: [PATCH] 过站

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs |  635 +++++++++++++++++++++++++++------------------------------
 1 files changed, 297 insertions(+), 338 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 889b4cd..cceceda 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -42,7 +42,6 @@
             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();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -79,7 +78,6 @@
             this.gv_changeDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancellerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -144,19 +142,12 @@
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -164,20 +155,9 @@
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -225,8 +205,25 @@
             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.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -294,19 +291,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@@ -314,26 +304,32 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).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.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -438,7 +434,6 @@
             this.gv_changeDate,
             this.gv_cancelStatus,
             this.gv_cancellerId,
-            this.gv_versionNo,
             this.gv_changerId,
             this.gv_entryNote,
             this.gv_fbilltype,
@@ -477,8 +472,6 @@
             this.gv_erpId.Name = "gv_erpId";
             this.gv_erpId.OptionsColumn.AllowEdit = false;
             this.gv_erpId.Tag = "query_a.erp_id";
-            this.gv_erpId.Visible = true;
-            this.gv_erpId.VisibleIndex = 0;
             this.gv_erpId.Width = 94;
             // 
             // gv_billNo
@@ -491,7 +484,7 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 1;
+            this.gv_billNo.VisibleIndex = 0;
             this.gv_billNo.Width = 94;
             // 
             // gv_billTypeId
@@ -829,19 +822,6 @@
             this.gv_cancellerId.VisibleIndex = 20;
             this.gv_cancellerId.Width = 94;
             // 
-            // gv_versionNo
-            // 
-            this.gv_versionNo.AppearanceCell.Options.UseFont = true;
-            this.gv_versionNo.Caption = "鐗堟湰鍙� ";
-            this.gv_versionNo.FieldName = "versionNo";
-            this.gv_versionNo.MinWidth = 50;
-            this.gv_versionNo.Name = "gv_versionNo";
-            this.gv_versionNo.OptionsColumn.AllowEdit = false;
-            this.gv_versionNo.Tag = "query_a.version_no";
-            this.gv_versionNo.Visible = true;
-            this.gv_versionNo.VisibleIndex = 21;
-            this.gv_versionNo.Width = 94;
-            // 
             // gv_changerId
             // 
             this.gv_changerId.AppearanceCell.Options.UseFont = true;
@@ -863,7 +843,7 @@
             this.gv_entryNote.OptionsColumn.AllowEdit = false;
             this.gv_entryNote.Tag = "query_a.entry_note";
             this.gv_entryNote.Visible = true;
-            this.gv_entryNote.VisibleIndex = 22;
+            this.gv_entryNote.VisibleIndex = 21;
             this.gv_entryNote.Width = 94;
             // 
             // gv_fbilltype
@@ -917,7 +897,7 @@
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 23;
+            this.gridColumn1.VisibleIndex = 1;
             this.gridColumn1.Width = 94;
             // 
             // gridColumn2
@@ -927,7 +907,7 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 24;
+            this.gridColumn2.VisibleIndex = 22;
             this.gridColumn2.Width = 94;
             // 
             // gridColumn3
@@ -937,7 +917,7 @@
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 25;
+            this.gridColumn3.VisibleIndex = 23;
             this.gridColumn3.Width = 94;
             // 
             // gridColumn4
@@ -947,7 +927,7 @@
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 26;
+            this.gridColumn4.VisibleIndex = 24;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn14
@@ -957,7 +937,7 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 27;
+            this.gridColumn14.VisibleIndex = 25;
             this.gridColumn14.Width = 94;
             // 
             // pageBar1
@@ -997,7 +977,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1568, 570);
-            this.splitMx1.SplitterPosition = 267;
+            this.splitMx1.SplitterPosition = 243;
             this.splitMx1.TabIndex = 4;
             // 
             // layoutMx1
@@ -1051,12 +1031,14 @@
             this.layoutControlItem12,
             this.layoutControlItem13,
             this.layoutControlItem35,
-            this.layoutControlItem34});
+            this.layoutControlItem34,
+            this.layoutControlItem2,
+            this.layoutControlItem31});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1568, 267);
+            this.layoutMx1.Size = new System.Drawing.Size(1568, 243);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1115,7 +1097,7 @@
             // 
             // txt_versionNo
             // 
-            this.txt_versionNo.Location = new System.Drawing.Point(99, 180);
+            this.txt_versionNo.Location = new System.Drawing.Point(99, 175);
             this.txt_versionNo.Name = "txt_versionNo";
             this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
             this.txt_versionNo.Size = new System.Drawing.Size(290, 24);
@@ -1124,7 +1106,7 @@
             // 
             // txt_cancellerId
             // 
-            this.txt_cancellerId.Location = new System.Drawing.Point(480, 180);
+            this.txt_cancellerId.Location = new System.Drawing.Point(480, 124);
             this.txt_cancellerId.Name = "txt_cancellerId";
             this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
             this.txt_cancellerId.Size = new System.Drawing.Size(291, 24);
@@ -1133,7 +1115,7 @@
             // 
             // txt_cancelStatusTxt
             // 
-            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 208);
+            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 152);
             this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt";
             this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true;
             this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24);
@@ -1142,7 +1124,7 @@
             // 
             // txt_changeDate
             // 
-            this.txt_changeDate.Location = new System.Drawing.Point(1244, 208);
+            this.txt_changeDate.Location = new System.Drawing.Point(862, 208);
             this.txt_changeDate.Name = "txt_changeDate";
             this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
             this.txt_changeDate.Size = new System.Drawing.Size(291, 24);
@@ -1151,7 +1133,7 @@
             // 
             // txt_closeDate
             // 
-            this.txt_closeDate.Location = new System.Drawing.Point(862, 236);
+            this.txt_closeDate.Location = new System.Drawing.Point(480, 208);
             this.txt_closeDate.Name = "txt_closeDate";
             this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
             this.txt_closeDate.Size = new System.Drawing.Size(291, 24);
@@ -1160,7 +1142,7 @@
             // 
             // txt_closerId
             // 
-            this.txt_closerId.Location = new System.Drawing.Point(862, 208);
+            this.txt_closerId.Location = new System.Drawing.Point(480, 180);
             this.txt_closerId.Name = "txt_closerId";
             this.txt_closerId.Properties.Appearance.Options.UseFont = true;
             this.txt_closerId.Size = new System.Drawing.Size(291, 24);
@@ -1169,7 +1151,7 @@
             // 
             // txt_approveDate
             // 
-            this.txt_approveDate.Location = new System.Drawing.Point(480, 96);
+            this.txt_approveDate.Location = new System.Drawing.Point(480, 40);
             this.txt_approveDate.Name = "txt_approveDate";
             this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
             this.txt_approveDate.Size = new System.Drawing.Size(291, 24);
@@ -1196,7 +1178,7 @@
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(480, 152);
+            this.txt_createDate.Location = new System.Drawing.Point(480, 96);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
             this.txt_createDate.Size = new System.Drawing.Size(291, 24);
@@ -1205,7 +1187,7 @@
             // 
             // txt_creatorId
             // 
-            this.txt_creatorId.Location = new System.Drawing.Point(480, 124);
+            this.txt_creatorId.Location = new System.Drawing.Point(480, 68);
             this.txt_creatorId.Name = "txt_creatorId";
             this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
             this.txt_creatorId.Size = new System.Drawing.Size(291, 24);
@@ -1241,7 +1223,7 @@
             // 
             // txt_approverId
             // 
-            this.txt_approverId.Location = new System.Drawing.Point(480, 68);
+            this.txt_approverId.Location = new System.Drawing.Point(480, 12);
             this.txt_approverId.Name = "txt_approverId";
             this.txt_approverId.Properties.Appearance.Options.UseFont = true;
             this.txt_approverId.Size = new System.Drawing.Size(291, 24);
@@ -1268,7 +1250,7 @@
             // 
             // txt_changeReason
             // 
-            this.txt_changeReason.Location = new System.Drawing.Point(1244, 236);
+            this.txt_changeReason.Location = new System.Drawing.Point(1244, 208);
             this.txt_changeReason.Name = "txt_changeReason";
             this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
             this.txt_changeReason.Size = new System.Drawing.Size(291, 24);
@@ -1340,10 +1322,10 @@
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(480, 40);
+            this.txt_fDate.Location = new System.Drawing.Point(99, 40);
             this.txt_fDate.Name = "txt_fDate";
             this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(291, 24);
+            this.txt_fDate.Size = new System.Drawing.Size(290, 24);
             this.txt_fDate.StyleController = this.layoutMx1;
             this.txt_fDate.TabIndex = 231;
             // 
@@ -1358,16 +1340,16 @@
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(480, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(291, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(290, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 216;
             // 
             // txt_documentStatusTxt
             // 
-            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40);
+            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 68);
             this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
             this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
             this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24);
@@ -1376,7 +1358,7 @@
             // 
             // txt_erpId
             // 
-            this.txt_erpId.Location = new System.Drawing.Point(99, 12);
+            this.txt_erpId.Location = new System.Drawing.Point(99, 7);
             this.txt_erpId.Name = "txt_erpId";
             this.txt_erpId.Properties.Appearance.Options.UseFont = true;
             this.txt_erpId.Size = new System.Drawing.Size(290, 24);
@@ -1395,7 +1377,7 @@
             // 
             // txt_xsOrgName
             // 
-            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96);
+            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 124);
             this.txt_xsOrgName.Name = "txt_xsOrgName";
             this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24);
             this.txt_xsOrgName.StyleController = this.layoutMx1;
@@ -1403,7 +1385,7 @@
             // 
             // txt_salerName
             // 
-            this.txt_salerName.Location = new System.Drawing.Point(99, 152);
+            this.txt_salerName.Location = new System.Drawing.Point(99, 180);
             this.txt_salerName.Name = "txt_salerName";
             this.txt_salerName.Size = new System.Drawing.Size(290, 24);
             this.txt_salerName.StyleController = this.layoutMx1;
@@ -1411,7 +1393,7 @@
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(99, 124);
+            this.txt_custName.Location = new System.Drawing.Point(99, 152);
             this.txt_custName.Name = "txt_custName";
             this.txt_custName.Size = new System.Drawing.Size(290, 24);
             this.txt_custName.StyleController = this.layoutMx1;
@@ -1419,7 +1401,7 @@
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 96);
             this.txt_saleDeptName.Name = "txt_saleDeptName";
             this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
@@ -1505,19 +1487,11 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem3,
-            this.layoutControlItem6,
             this.layoutControlItem7,
             this.layoutControlItem20,
-            this.layoutControlItem2,
-            this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem8,
             this.layoutControlItem37,
-            this.layoutControlItem41,
-            this.lab_saleDeptName,
-            this.layoutControlItem39,
-            this.layoutControlItem40,
             this.layoutControlItem9,
             this.layoutControlItem36,
             this.layoutControlItem18,
@@ -1525,20 +1499,26 @@
             this.layoutControlItem16,
             this.layoutControlItem23,
             this.layoutControlItem24,
-            this.layoutControlItem27,
-            this.layoutControlItem26,
             this.layoutControlItem11,
-            this.layoutControlItem31,
             this.layoutControlItem32,
-            this.layoutControlItem28,
-            this.layoutControlItem14,
+            this.layoutControlItem4,
             this.layoutControlItem15,
+            this.layoutControlItem40,
+            this.layoutControlItem41,
+            this.layoutControlItem39,
+            this.lab_saleDeptName,
+            this.layoutControlItem3,
+            this.layoutControlItem6,
             this.layoutControlItem17,
             this.layoutControlItem25,
             this.layoutControlItem21,
             this.layoutControlItem22,
             this.layoutControlItem30,
-            this.layoutControlItem29});
+            this.layoutControlItem29,
+            this.layoutControlItem26,
+            this.layoutControlItem27,
+            this.layoutControlItem28,
+            this.layoutControlItem14});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1570,8 +1550,6 @@
             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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
@@ -1580,31 +1558,9 @@
             rowDefinition5,
             rowDefinition6,
             rowDefinition7,
-            rowDefinition8,
-            rowDefinition9});
-            this.Root.Size = new System.Drawing.Size(1547, 272);
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1547, 244);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_documentStatusTxt;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(381, 28);
-            this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_fDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(381, 28);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
@@ -1637,16 +1593,6 @@
             this.layoutControlItem2.Text = "ERPID";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_billNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(381, 0);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_billTypeId;
@@ -1677,46 +1623,6 @@
             this.layoutControlItem37.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem41
-            // 
-            this.layoutControlItem41.Control = this.txt_custName;
-            this.layoutControlItem41.Location = new System.Drawing.Point(0, 112);
-            this.layoutControlItem41.Name = "layoutControlItem41";
-            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem41.Size = new System.Drawing.Size(381, 28);
-            this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // lab_saleDeptName
-            // 
-            this.lab_saleDeptName.Control = this.txt_saleDeptName;
-            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 56);
-            this.lab_saleDeptName.Name = "lab_saleDeptName";
-            this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
-            this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28);
-            this.lab_saleDeptName.Text = "閿�鍞儴闂�";
-            this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem39
-            // 
-            this.layoutControlItem39.Control = this.txt_xsOrgName;
-            this.layoutControlItem39.Location = new System.Drawing.Point(0, 84);
-            this.layoutControlItem39.Name = "layoutControlItem39";
-            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem39.Size = new System.Drawing.Size(381, 28);
-            this.layoutControlItem39.Text = "閿�鍞粍缁�";
-            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem40
-            // 
-            this.layoutControlItem40.Control = this.txt_salerName;
-            this.layoutControlItem40.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem40.Name = "layoutControlItem40";
-            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem40.Size = new System.Drawing.Size(381, 28);
-            this.layoutControlItem40.Text = "閿�鍞憳鍚�";
-            this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
@@ -1795,28 +1701,6 @@
             this.layoutControlItem24.Text = "淇敼鏃ユ湡";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_closeDate;
-            this.layoutControlItem27.Location = new System.Drawing.Point(763, 224);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem27.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_closerId;
-            this.layoutControlItem26.Location = new System.Drawing.Point(763, 196);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
-            // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_closeStatusTxt;
@@ -1849,111 +1733,13 @@
             this.layoutControlItem32.Text = "鍙樻洿浜哄憳";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_changeDate;
-            this.layoutControlItem28.Location = new System.Drawing.Point(1145, 196);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem28.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_changeReason;
-            this.layoutControlItem14.Location = new System.Drawing.Point(1145, 224);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem14.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_note;
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem15.Size = new System.Drawing.Size(381, 28);
-            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_approverId;
-            this.layoutControlItem17.Location = new System.Drawing.Point(381, 56);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_approveDate;
-            this.layoutControlItem25.Location = new System.Drawing.Point(381, 84);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem25.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_creatorId;
-            this.layoutControlItem21.Location = new System.Drawing.Point(381, 112);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem21.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_createDate;
-            this.layoutControlItem22.Location = new System.Drawing.Point(381, 140);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem22.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txt_cancellerId;
-            this.layoutControlItem30.Location = new System.Drawing.Point(381, 168);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem30.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
-            this.layoutControlItem29.Location = new System.Drawing.Point(381, 196);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem29.Size = new System.Drawing.Size(382, 28);
-            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
-            // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             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(1568, 291);
+            this.tabMx.Size = new System.Drawing.Size(1568, 315);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1962,7 +1748,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1566, 259);
+            this.tabMxPage1.Size = new System.Drawing.Size(1566, 283);
             this.tabMxPage1.Text = "閿�鍞槑缁�";
             // 
             // gcMx1
@@ -1971,7 +1757,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(1566, 259);
+            this.gcMx1.Size = new System.Drawing.Size(1566, 283);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -2500,23 +2286,199 @@
             this.gridColumn13.VisibleIndex = 29;
             this.gridColumn13.Width = 94;
             // 
-            // picCheckBox
+            // layoutControlItem4
             // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(970, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 9;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
+            this.layoutControlItem4.Control = this.txt_billNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_note;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem15.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_salerName;
+            this.layoutControlItem40.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem40.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem40.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem41
+            // 
+            this.layoutControlItem41.Control = this.txt_custName;
+            this.layoutControlItem41.Location = new System.Drawing.Point(0, 140);
+            this.layoutControlItem41.Name = "layoutControlItem41";
+            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem41.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.txt_xsOrgName;
+            this.layoutControlItem39.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem39.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem39.Text = "閿�鍞粍缁�";
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // lab_saleDeptName
+            // 
+            this.lab_saleDeptName.Control = this.txt_saleDeptName;
+            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 84);
+            this.lab_saleDeptName.Name = "lab_saleDeptName";
+            this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 3;
+            this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28);
+            this.lab_saleDeptName.Text = "閿�鍞儴闂�";
+            this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_documentStatusTxt;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_approverId;
+            this.layoutControlItem17.Location = new System.Drawing.Point(381, 0);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_approveDate;
+            this.layoutControlItem25.Location = new System.Drawing.Point(381, 28);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem25.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_creatorId;
+            this.layoutControlItem21.Location = new System.Drawing.Point(381, 56);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem21.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_createDate;
+            this.layoutControlItem22.Location = new System.Drawing.Point(381, 84);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem22.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_cancellerId;
+            this.layoutControlItem30.Location = new System.Drawing.Point(381, 112);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem30.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
+            this.layoutControlItem29.Location = new System.Drawing.Point(381, 140);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem29.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_closerId;
+            this.layoutControlItem26.Location = new System.Drawing.Point(381, 168);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem26.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_closeDate;
+            this.layoutControlItem27.Location = new System.Drawing.Point(381, 196);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem27.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_changeDate;
+            this.layoutControlItem28.Location = new System.Drawing.Point(763, 196);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem28.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_changeReason;
+            this.layoutControlItem14.Location = new System.Drawing.Point(1145, 196);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem14.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
             // Frm_SalesOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1570, 682);
-            this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_SalesOrder";
@@ -2588,19 +2550,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
@@ -2608,33 +2563,38 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).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.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -2710,7 +2670,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
@@ -2724,10 +2683,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.TextEdit txt_documentStatusTxt;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraEditors.TextEdit txt_billTypeId;
         private DevExpress.XtraEditors.TextEdit txt_fDate;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraEditors.TextEdit txt_businessTypeTxt;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
@@ -2785,15 +2742,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraLayout.LayoutControlItem lab_saleDeptName;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
@@ -2801,20 +2753,27 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+        private DevExpress.XtraLayout.LayoutControlItem lab_saleDeptName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3