From 5c26ea4c8c813ea85acf68fa07e180a12c748f33 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 七月 2025 14:21:01 +0800
Subject: [PATCH] bug

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 6765d3b..02cdb69 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -48,7 +49,8 @@
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fBillTypeID = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -58,13 +60,11 @@
             this.gv_fApproveDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fSalesManID = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fCustomerID = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fNote = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -151,7 +151,9 @@
             this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -271,27 +273,26 @@
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 51;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 468);
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
             // gridView1
             // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
+            this.gv_fApproverStaus,
+            this.gridColumn2,
             this.gv_billNo,
             this.gv_fBillTypeID,
             this.gv_fSaleOrgId,
@@ -301,13 +302,11 @@
             this.gv_fApproveDate,
             this.gv_fSalesManID,
             this.gv_fCustomerID,
-            this.gv_fDate,
             this.gv_fNote,
-            this.gv_fApproverStaus,
-            this.gridColumn2,
             this.gridColumn33,
             this.gridColumn34,
-            this.gridColumn35});
+            this.gridColumn35,
+            this.gridColumn36});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -315,21 +314,31 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gv_id
+            // gv_fApproverStaus
             // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "涓婚敭GUID";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Width = 94;
+            this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
+            this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_fApproverStaus.FieldName = "chkStatus";
+            this.gv_fApproverStaus.MinWidth = 50;
+            this.gv_fApproverStaus.Name = "gv_fApproverStaus";
+            this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
+            this.gv_fApproverStaus.Tag = "query_a.FApproverStaus";
+            this.gv_fApproverStaus.Visible = true;
+            this.gv_fApproverStaus.VisibleIndex = 0;
+            this.gv_fApproverStaus.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
+            this.gridColumn2.FieldName = "wjStatus";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 1;
+            this.gridColumn2.Width = 94;
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
             this.gv_billNo.FieldName = "billNo";
@@ -338,12 +347,11 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 0;
+            this.gv_billNo.VisibleIndex = 2;
             this.gv_billNo.Width = 94;
             // 
             // gv_fBillTypeID
             // 
-            this.gv_fBillTypeID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fBillTypeID.AppearanceCell.Options.UseFont = true;
             this.gv_fBillTypeID.Caption = "鍗曟嵁绫诲瀷 ";
             this.gv_fBillTypeID.FieldName = "fBillTypeID";
@@ -352,12 +360,11 @@
             this.gv_fBillTypeID.OptionsColumn.AllowEdit = false;
             this.gv_fBillTypeID.Tag = "query_a.FBillTypeID";
             this.gv_fBillTypeID.Visible = true;
-            this.gv_fBillTypeID.VisibleIndex = 1;
+            this.gv_fBillTypeID.VisibleIndex = 3;
             this.gv_fBillTypeID.Width = 94;
             // 
             // gv_fSaleOrgId
             // 
-            this.gv_fSaleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fSaleOrgId.AppearanceCell.Options.UseFont = true;
             this.gv_fSaleOrgId.Caption = "閿�鍞粍缁� ";
             this.gv_fSaleOrgId.FieldName = "xszzName";
@@ -366,12 +373,11 @@
             this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
             this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId";
             this.gv_fSaleOrgId.Visible = true;
-            this.gv_fSaleOrgId.VisibleIndex = 2;
+            this.gv_fSaleOrgId.VisibleIndex = 4;
             this.gv_fSaleOrgId.Width = 94;
             // 
             // gv_fCreatorId
             // 
-            this.gv_fCreatorId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fCreatorId.AppearanceCell.Options.UseFont = true;
             this.gv_fCreatorId.Caption = "鍒涘缓浜� ";
             this.gv_fCreatorId.FieldName = "fCreatorId";
@@ -380,12 +386,11 @@
             this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
             this.gv_fCreatorId.Tag = "query_a.FCreatorId";
             this.gv_fCreatorId.Visible = true;
-            this.gv_fCreatorId.VisibleIndex = 3;
+            this.gv_fCreatorId.VisibleIndex = 5;
             this.gv_fCreatorId.Width = 94;
             // 
             // gv_fApproverID
             // 
-            this.gv_fApproverID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
             this.gv_fApproverID.Caption = "瀹℃牳浜�";
             this.gv_fApproverID.FieldName = "fApproverID";
@@ -394,12 +399,11 @@
             this.gv_fApproverID.OptionsColumn.AllowEdit = false;
             this.gv_fApproverID.Tag = "query_a.FApproverID";
             this.gv_fApproverID.Visible = true;
-            this.gv_fApproverID.VisibleIndex = 4;
+            this.gv_fApproverID.VisibleIndex = 6;
             this.gv_fApproverID.Width = 94;
             // 
             // gv_fCreateDate
             // 
-            this.gv_fCreateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fCreateDate.AppearanceCell.Options.UseFont = true;
             this.gv_fCreateDate.Caption = "鍒涘缓鏃ユ湡 ";
             this.gv_fCreateDate.FieldName = "fCreateDate";
@@ -408,12 +412,11 @@
             this.gv_fCreateDate.OptionsColumn.AllowEdit = false;
             this.gv_fCreateDate.Tag = "query_a.FCreateDate";
             this.gv_fCreateDate.Visible = true;
-            this.gv_fCreateDate.VisibleIndex = 5;
+            this.gv_fCreateDate.VisibleIndex = 7;
             this.gv_fCreateDate.Width = 94;
             // 
             // gv_fApproveDate
             // 
-            this.gv_fApproveDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproveDate.AppearanceCell.Options.UseFont = true;
             this.gv_fApproveDate.Caption = "瀹℃牳鏃ユ湡 ";
             this.gv_fApproveDate.FieldName = "fApproveDate";
@@ -422,12 +425,11 @@
             this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
             this.gv_fApproveDate.Tag = "query_a.FApproveDate";
             this.gv_fApproveDate.Visible = true;
-            this.gv_fApproveDate.VisibleIndex = 6;
+            this.gv_fApproveDate.VisibleIndex = 8;
             this.gv_fApproveDate.Width = 94;
             // 
             // gv_fSalesManID
             // 
-            this.gv_fSalesManID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fSalesManID.AppearanceCell.Options.UseFont = true;
             this.gv_fSalesManID.Caption = "閿�鍞憳ID";
             this.gv_fSalesManID.FieldName = "fSalesManID";
@@ -439,7 +441,6 @@
             // 
             // gv_fCustomerID
             // 
-            this.gv_fCustomerID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fCustomerID.AppearanceCell.Options.UseFont = true;
             this.gv_fCustomerID.Caption = "瀹㈡埛ID";
             this.gv_fCustomerID.FieldName = "fCustomerID";
@@ -449,23 +450,8 @@
             this.gv_fCustomerID.Tag = "query_a.FCustomerID";
             this.gv_fCustomerID.Width = 94;
             // 
-            // gv_fDate
-            // 
-            this.gv_fDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fDate.Caption = "鏃ユ湡 ";
-            this.gv_fDate.FieldName = "fDate";
-            this.gv_fDate.MinWidth = 50;
-            this.gv_fDate.Name = "gv_fDate";
-            this.gv_fDate.OptionsColumn.AllowEdit = false;
-            this.gv_fDate.Tag = "query_a.FDate";
-            this.gv_fDate.Visible = true;
-            this.gv_fDate.VisibleIndex = 7;
-            this.gv_fDate.Width = 94;
-            // 
             // gv_fNote
             // 
-            this.gv_fNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fNote.AppearanceCell.Options.UseFont = true;
             this.gv_fNote.Caption = "澶囨敞 ";
             this.gv_fNote.FieldName = "fNote";
@@ -474,32 +460,8 @@
             this.gv_fNote.OptionsColumn.AllowEdit = false;
             this.gv_fNote.Tag = "query_a.FNote";
             this.gv_fNote.Visible = true;
-            this.gv_fNote.VisibleIndex = 8;
+            this.gv_fNote.VisibleIndex = 9;
             this.gv_fNote.Width = 94;
-            // 
-            // gv_fApproverStaus
-            // 
-            this.gv_fApproverStaus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
-            this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_fApproverStaus.FieldName = "chkStatus";
-            this.gv_fApproverStaus.MinWidth = 50;
-            this.gv_fApproverStaus.Name = "gv_fApproverStaus";
-            this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
-            this.gv_fApproverStaus.Tag = "query_a.FApproverStaus";
-            this.gv_fApproverStaus.Visible = true;
-            this.gv_fApproverStaus.VisibleIndex = 9;
-            this.gv_fApproverStaus.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
-            this.gridColumn2.FieldName = "wjStatus";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 10;
-            this.gridColumn2.Width = 94;
             // 
             // gridColumn33
             // 
@@ -508,7 +470,7 @@
             this.gridColumn33.MinWidth = 25;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 11;
+            this.gridColumn33.VisibleIndex = 10;
             this.gridColumn33.Width = 94;
             // 
             // gridColumn34
@@ -518,7 +480,7 @@
             this.gridColumn34.MinWidth = 25;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 12;
+            this.gridColumn34.VisibleIndex = 11;
             this.gridColumn34.Width = 94;
             // 
             // gridColumn35
@@ -528,14 +490,22 @@
             this.gridColumn35.MinWidth = 25;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 13;
+            this.gridColumn35.VisibleIndex = 12;
             this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "涓婚敭Guid";
+            this.gridColumn36.FieldName = "guid";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 468);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -611,10 +581,10 @@
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(825, 76);
+            this.txt_chkStatus.Location = new System.Drawing.Point(840, 72);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 376;
             this.txt_chkStatus.Tag = "readonly";
@@ -623,9 +593,8 @@
             // 
             this.txt_id.Location = new System.Drawing.Point(927, 218);
             this.txt_id.Name = "txt_id";
-            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_id.Properties.Appearance.Options.UseFont = true;
-            this.txt_id.Size = new System.Drawing.Size(187, 28);
+            this.txt_id.Size = new System.Drawing.Size(187, 24);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 211;
             this.txt_id.Tag = "readonly";
@@ -634,9 +603,8 @@
             // 
             this.txt_billNo.Location = new System.Drawing.Point(99, 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;
-            this.txt_billNo.Size = new System.Drawing.Size(180, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(185, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -644,24 +612,23 @@
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(99, 44);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(99, 42);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(180, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(185, 24);
             this.txt_fBillTypeID.StyleController = this.layoutMx1;
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(912, 12);
+            this.txt_fApproverID.Location = new System.Drawing.Point(927, 12);
             this.txt_fApproverID.Name = "txt_fApproverID";
-            this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverID.Size = new System.Drawing.Size(181, 28);
+            this.txt_fApproverID.Size = new System.Drawing.Size(187, 24);
             this.txt_fApproverID.StyleController = this.layoutMx1;
             this.txt_fApproverID.TabIndex = 222;
             this.txt_fApproverID.Tag = "readonly";
@@ -669,111 +636,104 @@
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(99, 76);
+            this.txt_salesId.Location = new System.Drawing.Point(99, 72);
             this.txt_salesId.Name = "txt_salesId";
-            this.txt_salesId.Size = new System.Drawing.Size(180, 28);
+            this.txt_salesId.Size = new System.Drawing.Size(185, 24);
             this.txt_salesId.TabIndex = 367;
             // 
             // txt_fSaleOrgIdTxt
             // 
-            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(370, 12);
+            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 12);
             this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
-            this.txt_fSaleOrgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(180, 28);
+            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(185, 24);
             this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
             this.txt_fSaleOrgIdTxt.TabIndex = 365;
             this.txt_fSaleOrgIdTxt.Tag = "readonly";
             // 
             // txt_fCreatorId
             // 
-            this.txt_fCreatorId.Location = new System.Drawing.Point(641, 12);
+            this.txt_fCreatorId.Location = new System.Drawing.Point(651, 12);
             this.txt_fCreatorId.Name = "txt_fCreatorId";
-            this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(180, 28);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(185, 24);
             this.txt_fCreatorId.StyleController = this.layoutMx1;
             this.txt_fCreatorId.TabIndex = 219;
             this.txt_fCreatorId.Tag = "readonly";
             // 
             // txt_fApproveDate
             // 
-            this.txt_fApproveDate.Location = new System.Drawing.Point(912, 44);
+            this.txt_fApproveDate.Location = new System.Drawing.Point(927, 42);
             this.txt_fApproveDate.Name = "txt_fApproveDate";
-            this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproveDate.Size = new System.Drawing.Size(181, 28);
+            this.txt_fApproveDate.Size = new System.Drawing.Size(187, 24);
             this.txt_fApproveDate.StyleController = this.layoutMx1;
             this.txt_fApproveDate.TabIndex = 228;
             this.txt_fApproveDate.Tag = "readonly";
             // 
             // txt_fNote
             // 
-            this.txt_fNote.Location = new System.Drawing.Point(99, 108);
+            this.txt_fNote.Location = new System.Drawing.Point(99, 102);
             this.txt_fNote.Name = "txt_fNote";
-            this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_fNote.Size = new System.Drawing.Size(451, 28);
+            this.txt_fNote.Size = new System.Drawing.Size(461, 24);
             this.txt_fNote.StyleController = this.layoutMx1;
             this.txt_fNote.TabIndex = 243;
             // 
             // txt_fSalesManIDTxt
             // 
-            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(641, 76);
+            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(651, 72);
             this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
-            this.txt_fSalesManIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(180, 28);
+            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(185, 24);
             this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
             this.txt_fSalesManIDTxt.TabIndex = 231;
             this.txt_fSalesManIDTxt.Tag = "readonly";
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(641, 44);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(651, 42);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
-            this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(180, 28);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(185, 24);
             this.txt_fCreateDate.StyleController = this.layoutMx1;
             this.txt_fCreateDate.TabIndex = 226;
             this.txt_fCreateDate.Tag = "readonly";
             // 
             // txt_fCustomerIDTxt
             // 
-            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(370, 44);
+            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(375, 42);
             this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
-            this.txt_fCustomerIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(180, 28);
+            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(185, 24);
             this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
             this.txt_fCustomerIDTxt.TabIndex = 368;
             this.txt_fCustomerIDTxt.Tag = "readonly";
             // 
             // txt_shf
             // 
-            this.txt_shf.Location = new System.Drawing.Point(370, 76);
+            this.txt_shf.Location = new System.Drawing.Point(375, 72);
             this.txt_shf.Name = "txt_shf";
-            this.txt_shf.Size = new System.Drawing.Size(180, 24);
+            this.txt_shf.Size = new System.Drawing.Size(185, 24);
             this.txt_shf.StyleController = this.layoutMx1;
             this.txt_shf.TabIndex = 373;
             this.txt_shf.Tag = "readonly";
             // 
             // txt_shName
             // 
-            this.txt_shName.Location = new System.Drawing.Point(641, 108);
+            this.txt_shName.Location = new System.Drawing.Point(651, 102);
             this.txt_shName.Name = "txt_shName";
-            this.txt_shName.Size = new System.Drawing.Size(180, 24);
+            this.txt_shName.Size = new System.Drawing.Size(185, 24);
             this.txt_shName.StyleController = this.layoutMx1;
             this.txt_shName.TabIndex = 374;
             this.txt_shName.Tag = "readonly";
             // 
             // txt_wjStatus
             // 
-            this.txt_wjStatus.Location = new System.Drawing.Point(825, 108);
+            this.txt_wjStatus.Location = new System.Drawing.Point(840, 102);
             this.txt_wjStatus.Name = "txt_wjStatus";
             this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��";
-            this.txt_wjStatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_wjStatus.Size = new System.Drawing.Size(274, 24);
             this.txt_wjStatus.StyleController = this.layoutMx1;
             this.txt_wjStatus.TabIndex = 372;
             this.txt_wjStatus.Tag = "readonly";
@@ -851,7 +811,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1105, 148);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 141);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem17
@@ -859,11 +819,11 @@
             this.layoutControlItem17.Control = this.txt_shName;
             this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
-            this.layoutControlItem17.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem17.Location = new System.Drawing.Point(552, 90);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
             this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -874,7 +834,7 @@
             this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem2.Text = "鐢宠缂栧彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -883,11 +843,11 @@
             this.layoutControlItem10.Control = this.txt_fApproverID;
             this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem10.Text = "瀹℃牳浜�";
+            this.layoutControlItem10.Size = new System.Drawing.Size(278, 30);
+            this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
@@ -895,22 +855,22 @@
             this.layoutControlItem11.Control = this.txt_fApproveDate;
             this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem11.Location = new System.Drawing.Point(828, 30);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(278, 30);
             this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_chkStatus;
-            this.layoutControlItem15.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem15.Location = new System.Drawing.Point(828, 60);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
             this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem15.TextVisible = false;
@@ -920,11 +880,11 @@
             this.layoutControlItem6.Control = this.txt_fCreatorId;
             this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
-            this.layoutControlItem6.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem6.Text = "鍒涘缓浜�";
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
@@ -932,11 +892,11 @@
             this.layoutControlItem7.Control = this.txt_fCreateDate;
             this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(552, 30);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -945,11 +905,11 @@
             this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
             this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem13.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem13.Location = new System.Drawing.Point(276, 30);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -958,12 +918,12 @@
             this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
             this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
-            this.layoutControlItem9.Location = new System.Drawing.Point(542, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(552, 60);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem9.Text = "閿�鍞憳";
+            this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem9.Text = "閿�鍞汉鍛�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem5
@@ -971,10 +931,10 @@
             this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
-            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem5.Text = "閿�鍞粍缁�";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -983,11 +943,11 @@
             this.layoutControlItem14.Control = this.txt_shf;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
-            this.layoutControlItem14.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem14.Location = new System.Drawing.Point(276, 60);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem14.Text = "鏀惰揣鏂�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -996,11 +956,11 @@
             this.layoutControlItem8.Control = this.txt_fNote;
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 90);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(542, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(552, 31);
             this.layoutControlItem8.Text = "鐢宠澶囨敞";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1009,10 +969,10 @@
             this.layoutControlItem4.Control = this.txt_salesId;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "閿�鍞鍗�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 60);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem4.Text = "閿�鍞鍗�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1021,10 +981,10 @@
             this.layoutControlItem3.Control = this.txt_fBillTypeID;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1033,11 +993,11 @@
             this.layoutControlItem12.Control = this.txt_wjStatus;
             this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem12.Location = new System.Drawing.Point(828, 90);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(278, 31);
             this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -1105,7 +1065,8 @@
             this.gvMx1pid,
             this.gvMx1salesDetailId,
             this.gvMx1fseq,
-            this.gvMxDel});
+            this.gvMxDel,
+            this.gridColumn37});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1143,6 +1104,9 @@
             // 
             // gridView2
             // 
+            this.gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView2.ColumnPanelRowHeight = 50;
             this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn10,
             this.gridColumn3,
@@ -1183,6 +1147,7 @@
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 50;
             // 
             // gridColumn5
             // 
@@ -1191,38 +1156,38 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 50;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "渚涘簲缁勭粐";
             this.gridColumn7.FieldName = "gyOrg";
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 4;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "搴撳瓨缁勭粐";
             this.gridColumn8.FieldName = "kcOrg";
             this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 5;
             // 
             // gridColumn9
             // 
-            this.gridColumn9.Caption = "鍓╀綑鏈嚭鏁伴噺";
+            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn9.Caption = "鏈彂璐ф暟閲�";
             this.gridColumn9.FieldName = "syQty";
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.VisibleIndex = 4;
+            this.gridColumn9.Width = 50;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "閿�鍞粍缁�";
             this.gridColumn6.FieldName = "salesOrgName";
             this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 7;
             // 
             // gridColumn30
             // 
@@ -1230,7 +1195,7 @@
             this.gridColumn30.FieldName = "itemName";
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 8;
+            this.gridColumn30.VisibleIndex = 5;
             // 
             // gridColumn31
             // 
@@ -1238,7 +1203,7 @@
             this.gridColumn31.FieldName = "itemModel";
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 9;
+            this.gridColumn31.VisibleIndex = 6;
             // 
             // gridColumn32
             // 
@@ -1246,11 +1211,11 @@
             this.gridColumn32.FieldName = "jjdw";
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 10;
+            this.gridColumn32.VisibleIndex = 7;
+            this.gridColumn32.Width = 50;
             // 
             // gvMx1fMustQty
             // 
-            this.gvMx1fMustQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1fMustQty.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1fMustQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1fMustQty.AppearanceCell.Options.UseForeColor = true;
@@ -1292,7 +1257,6 @@
             // 
             // gvMx1fEntrynote
             // 
-            this.gvMx1fEntrynote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1fEntrynote.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1fEntrynote.AppearanceCell.Options.UseFont = true;
             this.gvMx1fEntrynote.AppearanceCell.Options.UseForeColor = true;
@@ -1309,9 +1273,8 @@
             // 
             // gvMx1fRealQty
             // 
-            this.gvMx1fRealQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fRealQty.Caption = "瀹炲彂鏁伴噺 ";
+            this.gvMx1fRealQty.Caption = "鏈瀹炲彂鏁伴噺 ";
             this.gvMx1fRealQty.FieldName = "fRealQty";
             this.gvMx1fRealQty.MinWidth = 50;
             this.gvMx1fRealQty.Name = "gvMx1fRealQty";
@@ -1502,7 +1465,6 @@
             // 
             // gvMx1id
             // 
-            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "涓婚敭 ";
             this.gvMx1id.FieldName = "id";
@@ -1513,7 +1475,6 @@
             // 
             // gvMx1pid
             // 
-            this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
             this.gvMx1pid.Caption = "涓昏〃guid ";
             this.gvMx1pid.FieldName = "pid";
@@ -1524,7 +1485,6 @@
             // 
             // gvMx1salesDetailId
             // 
-            this.gvMx1salesDetailId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1salesDetailId.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesDetailId.Caption = "SALES_ORDER_DETAIL鐨凣uid ";
             this.gvMx1salesDetailId.FieldName = "salesDetailId";
@@ -1535,7 +1495,6 @@
             // 
             // gvMx1fseq
             // 
-            this.gvMx1fseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1fseq.AppearanceCell.Options.UseFont = true;
             this.gvMx1fseq.Caption = "鎺掑簭 ";
             this.gvMx1fseq.FieldName = "fseq";
@@ -1564,6 +1523,14 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "鐗╂枡ID";
+            this.gridColumn37.FieldName = "itemId";
+            this.gridColumn37.MinWidth = 25;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Width = 94;
             // 
             // picCheckBox
             // 
@@ -1660,7 +1627,6 @@
         private DevExpress.XtraEditors.SplitContainerControl split1;
         private DevExpress.XtraGrid.GridControl gcMain1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fBillTypeID;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId;
@@ -1670,7 +1636,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproveDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fSalesManID;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fCustomerID;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fNote;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -1763,5 +1728,8 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3