From c26069c9418efe9f9c0f963f43fb98b8a7440adf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 01 三月 2025 10:10:25 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs |  531 ++++++++++++----------------------------------------------
 1 files changed, 112 insertions(+), 419 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index e06d84e..0097fd0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1erpHeadId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1erpLineId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1orderBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -65,27 +65,24 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
             this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_billStatus = new DevExpress.XtraEditors.LabelControl();
             this.txt_billStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_billStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_erpId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
             this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_manualCloseFlag = new DevExpress.XtraEditors.LabelControl();
-            this.txt_manualCloseFlag = new DevExpress.XtraEditors.TextEdit();
             this.gv_manualCloseFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelledBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelledBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelledBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_cancelStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancelStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_approvedDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
@@ -93,14 +90,8 @@
             this.lb_approvedBy = new DevExpress.XtraEditors.LabelControl();
             this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeReason = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeReason = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closedBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closedBy = new DevExpress.XtraEditors.TextEdit();
             this.gv_closedBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_modifiedDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
@@ -156,8 +147,6 @@
             this.lb_returnReason = new DevExpress.XtraEditors.LabelControl();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
             this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_taobaoRemark = new DevExpress.XtraEditors.LabelControl();
-            this.txt_taobaoRemark = new DevExpress.XtraEditors.TextEdit();
             this.gv_taobaoRemark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_returnCustomer = new DevExpress.XtraEditors.LabelControl();
             this.txt_returnCustomer = new DevExpress.XtraEditors.TextEdit();
@@ -170,8 +159,6 @@
             this.lb_salesOrg = new DevExpress.XtraEditors.LabelControl();
             this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
             this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_currency = new DevExpress.XtraEditors.LabelControl();
-            this.txt_currency = new DevExpress.XtraEditors.TextEdit();
             this.gv_currency = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
@@ -199,32 +186,15 @@
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
@@ -243,11 +213,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_currency.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
@@ -262,7 +230,6 @@
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1erpHeadId
@@ -594,7 +561,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 137);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 236);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -606,7 +573,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 137);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 236);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -670,6 +637,7 @@
             this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+            this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
             this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
             // 
             // repositoryItemSearchLookUpEdit1View
@@ -687,6 +655,55 @@
             this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "閿�鍞崟鍙�";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 0;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 1;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 2;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 3;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 4;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 5;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "宸查��鏁伴噺";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 6;
+            // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "gridColumn3";
@@ -696,11 +713,30 @@
             this.gridColumn3.VisibleIndex = 26;
             this.gridColumn3.Width = 94;
             // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 27;
+            this.gvMxDel.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
             // lb_billStatus
             // 
             this.lb_billStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billStatus.Appearance.Options.UseFont = true;
-            this.lb_billStatus.Location = new System.Drawing.Point(770, 308);
+            this.lb_billStatus.Location = new System.Drawing.Point(770, 54);
             this.lb_billStatus.Name = "lb_billStatus";
             this.lb_billStatus.Size = new System.Drawing.Size(73, 21);
             this.lb_billStatus.TabIndex = 450;
@@ -708,7 +744,7 @@
             // 
             // txt_billStatus
             // 
-            this.txt_billStatus.Location = new System.Drawing.Point(830, 308);
+            this.txt_billStatus.Location = new System.Drawing.Point(830, 54);
             this.txt_billStatus.Name = "txt_billStatus";
             this.txt_billStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billStatus.Properties.Appearance.Options.UseFont = true;
@@ -729,25 +765,6 @@
             this.gv_billStatus.VisibleIndex = 39;
             this.gv_billStatus.Width = 94;
             // 
-            // lb_erpId
-            // 
-            this.lb_erpId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpId.Appearance.Options.UseFont = true;
-            this.lb_erpId.Location = new System.Drawing.Point(520, 308);
-            this.lb_erpId.Name = "lb_erpId";
-            this.lb_erpId.Size = new System.Drawing.Size(70, 21);
-            this.lb_erpId.TabIndex = 438;
-            this.lb_erpId.Text = "ERP澶碔D ";
-            // 
-            // txt_erpId
-            // 
-            this.txt_erpId.Location = new System.Drawing.Point(580, 308);
-            this.txt_erpId.Name = "txt_erpId";
-            this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpId.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpId.Size = new System.Drawing.Size(150, 28);
-            this.txt_erpId.TabIndex = 438;
-            // 
             // gv_erpId
             // 
             this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -761,25 +778,6 @@
             this.gv_erpId.Visible = true;
             this.gv_erpId.VisibleIndex = 38;
             this.gv_erpId.Width = 94;
-            // 
-            // lb_manualCloseFlag
-            // 
-            this.lb_manualCloseFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_manualCloseFlag.Appearance.Options.UseFont = true;
-            this.lb_manualCloseFlag.Location = new System.Drawing.Point(270, 308);
-            this.lb_manualCloseFlag.Name = "lb_manualCloseFlag";
-            this.lb_manualCloseFlag.Size = new System.Drawing.Size(107, 21);
-            this.lb_manualCloseFlag.TabIndex = 427;
-            this.lb_manualCloseFlag.Text = "鏄惁鎵嬪姩鍏抽棴 ";
-            // 
-            // txt_manualCloseFlag
-            // 
-            this.txt_manualCloseFlag.Location = new System.Drawing.Point(330, 308);
-            this.txt_manualCloseFlag.Name = "txt_manualCloseFlag";
-            this.txt_manualCloseFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_manualCloseFlag.Properties.Appearance.Options.UseFont = true;
-            this.txt_manualCloseFlag.Size = new System.Drawing.Size(150, 28);
-            this.txt_manualCloseFlag.TabIndex = 427;
             // 
             // gv_manualCloseFlag
             // 
@@ -795,25 +793,6 @@
             this.gv_manualCloseFlag.VisibleIndex = 37;
             this.gv_manualCloseFlag.Width = 94;
             // 
-            // lb_closeStatus
-            // 
-            this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeStatus.Appearance.Options.UseFont = true;
-            this.lb_closeStatus.Location = new System.Drawing.Point(20, 308);
-            this.lb_closeStatus.Name = "lb_closeStatus";
-            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeStatus.TabIndex = 417;
-            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
-            // 
-            // txt_closeStatus
-            // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(80, 308);
-            this.txt_closeStatus.Name = "txt_closeStatus";
-            this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeStatus.TabIndex = 417;
-            // 
             // gv_closeStatus
             // 
             this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -827,25 +806,6 @@
             this.gv_closeStatus.Visible = true;
             this.gv_closeStatus.VisibleIndex = 36;
             this.gv_closeStatus.Width = 94;
-            // 
-            // lb_cancelDate
-            // 
-            this.lb_cancelDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelDate.Appearance.Options.UseFont = true;
-            this.lb_cancelDate.Location = new System.Drawing.Point(770, 276);
-            this.lb_cancelDate.Name = "lb_cancelDate";
-            this.lb_cancelDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancelDate.TabIndex = 408;
-            this.lb_cancelDate.Text = "浣滃簾鏃ユ湡 ";
-            // 
-            // txt_cancelDate
-            // 
-            this.txt_cancelDate.Location = new System.Drawing.Point(830, 276);
-            this.txt_cancelDate.Name = "txt_cancelDate";
-            this.txt_cancelDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelDate.TabIndex = 408;
             // 
             // gv_cancelDate
             // 
@@ -861,25 +821,6 @@
             this.gv_cancelDate.VisibleIndex = 35;
             this.gv_cancelDate.Width = 94;
             // 
-            // lb_cancelledBy
-            // 
-            this.lb_cancelledBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelledBy.Appearance.Options.UseFont = true;
-            this.lb_cancelledBy.Location = new System.Drawing.Point(520, 276);
-            this.lb_cancelledBy.Name = "lb_cancelledBy";
-            this.lb_cancelledBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_cancelledBy.TabIndex = 397;
-            this.lb_cancelledBy.Text = "浣滃簾浜� ";
-            // 
-            // txt_cancelledBy
-            // 
-            this.txt_cancelledBy.Location = new System.Drawing.Point(580, 276);
-            this.txt_cancelledBy.Name = "txt_cancelledBy";
-            this.txt_cancelledBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelledBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelledBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelledBy.TabIndex = 397;
-            // 
             // gv_cancelledBy
             // 
             this.gv_cancelledBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -893,25 +834,6 @@
             this.gv_cancelledBy.Visible = true;
             this.gv_cancelledBy.VisibleIndex = 34;
             this.gv_cancelledBy.Width = 94;
-            // 
-            // lb_cancelStatus
-            // 
-            this.lb_cancelStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancelStatus.Appearance.Options.UseFont = true;
-            this.lb_cancelStatus.Location = new System.Drawing.Point(270, 276);
-            this.lb_cancelStatus.Name = "lb_cancelStatus";
-            this.lb_cancelStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancelStatus.TabIndex = 387;
-            this.lb_cancelStatus.Text = "浣滃簾鐘舵�� ";
-            // 
-            // txt_cancelStatus
-            // 
-            this.txt_cancelStatus.Location = new System.Drawing.Point(330, 276);
-            this.txt_cancelStatus.Name = "txt_cancelStatus";
-            this.txt_cancelStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancelStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancelStatus.TabIndex = 387;
             // 
             // gv_cancelStatus
             // 
@@ -931,7 +853,7 @@
             // 
             this.lb_approvedDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_approvedDate.Appearance.Options.UseFont = true;
-            this.lb_approvedDate.Location = new System.Drawing.Point(20, 276);
+            this.lb_approvedDate.Location = new System.Drawing.Point(20, 218);
             this.lb_approvedDate.Name = "lb_approvedDate";
             this.lb_approvedDate.Size = new System.Drawing.Size(73, 21);
             this.lb_approvedDate.TabIndex = 378;
@@ -939,7 +861,7 @@
             // 
             // txt_approvedDate
             // 
-            this.txt_approvedDate.Location = new System.Drawing.Point(80, 276);
+            this.txt_approvedDate.Location = new System.Drawing.Point(80, 218);
             this.txt_approvedDate.Name = "txt_approvedDate";
             this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
@@ -993,25 +915,6 @@
             this.gv_approvedBy.VisibleIndex = 31;
             this.gv_approvedBy.Width = 94;
             // 
-            // lb_closeDate
-            // 
-            this.lb_closeDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeDate.Appearance.Options.UseFont = true;
-            this.lb_closeDate.Location = new System.Drawing.Point(520, 244);
-            this.lb_closeDate.Name = "lb_closeDate";
-            this.lb_closeDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeDate.TabIndex = 360;
-            this.lb_closeDate.Text = "鍏抽棴鏃ユ湡 ";
-            // 
-            // txt_closeDate
-            // 
-            this.txt_closeDate.Location = new System.Drawing.Point(580, 244);
-            this.txt_closeDate.Name = "txt_closeDate";
-            this.txt_closeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeDate.TabIndex = 360;
-            // 
             // gv_closeDate
             // 
             this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1026,25 +929,6 @@
             this.gv_closeDate.VisibleIndex = 30;
             this.gv_closeDate.Width = 94;
             // 
-            // lb_closeReason
-            // 
-            this.lb_closeReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeReason.Appearance.Options.UseFont = true;
-            this.lb_closeReason.Location = new System.Drawing.Point(270, 244);
-            this.lb_closeReason.Name = "lb_closeReason";
-            this.lb_closeReason.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeReason.TabIndex = 351;
-            this.lb_closeReason.Text = "鍏抽棴鍘熷洜 ";
-            // 
-            // txt_closeReason
-            // 
-            this.txt_closeReason.Location = new System.Drawing.Point(330, 244);
-            this.txt_closeReason.Name = "txt_closeReason";
-            this.txt_closeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeReason.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeReason.TabIndex = 351;
-            // 
             // gv_closeReason
             // 
             this.gv_closeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1058,25 +942,6 @@
             this.gv_closeReason.Visible = true;
             this.gv_closeReason.VisibleIndex = 29;
             this.gv_closeReason.Width = 94;
-            // 
-            // lb_closedBy
-            // 
-            this.lb_closedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closedBy.Appearance.Options.UseFont = true;
-            this.lb_closedBy.Location = new System.Drawing.Point(20, 244);
-            this.lb_closedBy.Name = "lb_closedBy";
-            this.lb_closedBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_closedBy.TabIndex = 343;
-            this.lb_closedBy.Text = "鍏抽棴浜� ";
-            // 
-            // txt_closedBy
-            // 
-            this.txt_closedBy.Location = new System.Drawing.Point(80, 244);
-            this.txt_closedBy.Name = "txt_closedBy";
-            this.txt_closedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_closedBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_closedBy.TabIndex = 343;
             // 
             // gv_closedBy
             // 
@@ -1195,7 +1060,7 @@
             // 
             this.lb_createdBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createdBy.Appearance.Options.UseFont = true;
-            this.lb_createdBy.Location = new System.Drawing.Point(20, 212);
+            this.lb_createdBy.Location = new System.Drawing.Point(20, 180);
             this.lb_createdBy.Name = "lb_createdBy";
             this.lb_createdBy.Size = new System.Drawing.Size(56, 21);
             this.lb_createdBy.TabIndex = 312;
@@ -1203,7 +1068,7 @@
             // 
             // txt_createdBy
             // 
-            this.txt_createdBy.Location = new System.Drawing.Point(80, 212);
+            this.txt_createdBy.Location = new System.Drawing.Point(80, 180);
             this.txt_createdBy.Name = "txt_createdBy";
             this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
@@ -1327,7 +1192,7 @@
             // 
             this.lb_receiverContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_receiverContact.Appearance.Options.UseFont = true;
-            this.lb_receiverContact.Location = new System.Drawing.Point(20, 180);
+            this.lb_receiverContact.Location = new System.Drawing.Point(20, 148);
             this.lb_receiverContact.Name = "lb_receiverContact";
             this.lb_receiverContact.Size = new System.Drawing.Size(107, 21);
             this.lb_receiverContact.TabIndex = 285;
@@ -1335,7 +1200,7 @@
             // 
             // txt_receiverContact
             // 
-            this.txt_receiverContact.Location = new System.Drawing.Point(80, 180);
+            this.txt_receiverContact.Location = new System.Drawing.Point(80, 148);
             this.txt_receiverContact.Name = "txt_receiverContact";
             this.txt_receiverContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_receiverContact.Properties.Appearance.Options.UseFont = true;
@@ -1459,7 +1324,7 @@
             // 
             this.lb_salesGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_salesGroup.Appearance.Options.UseFont = true;
-            this.lb_salesGroup.Location = new System.Drawing.Point(20, 148);
+            this.lb_salesGroup.Location = new System.Drawing.Point(20, 116);
             this.lb_salesGroup.Name = "lb_salesGroup";
             this.lb_salesGroup.Size = new System.Drawing.Size(56, 21);
             this.lb_salesGroup.TabIndex = 262;
@@ -1467,7 +1332,7 @@
             // 
             // txt_salesGroup
             // 
-            this.txt_salesGroup.Location = new System.Drawing.Point(80, 148);
+            this.txt_salesGroup.Location = new System.Drawing.Point(80, 116);
             this.txt_salesGroup.Name = "txt_salesGroup";
             this.txt_salesGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_salesGroup.Properties.Appearance.Options.UseFont = true;
@@ -1591,7 +1456,7 @@
             // 
             this.lb_inventoryOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_inventoryOrg.Appearance.Options.UseFont = true;
-            this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 116);
+            this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 84);
             this.lb_inventoryOrg.Name = "lb_inventoryOrg";
             this.lb_inventoryOrg.Size = new System.Drawing.Size(73, 21);
             this.lb_inventoryOrg.TabIndex = 243;
@@ -1599,7 +1464,7 @@
             // 
             // txt_inventoryOrg
             // 
-            this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 116);
+            this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 84);
             this.txt_inventoryOrg.Name = "txt_inventoryOrg";
             this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
@@ -1657,7 +1522,7 @@
             // 
             this.lb_returnReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_returnReason.Appearance.Options.UseFont = true;
-            this.lb_returnReason.Location = new System.Drawing.Point(418, 361);
+            this.lb_returnReason.Location = new System.Drawing.Point(388, 263);
             this.lb_returnReason.Name = "lb_returnReason";
             this.lb_returnReason.Size = new System.Drawing.Size(73, 21);
             this.lb_returnReason.TabIndex = 235;
@@ -1665,7 +1530,7 @@
             // 
             // txt_returnReason
             // 
-            this.txt_returnReason.Location = new System.Drawing.Point(478, 357);
+            this.txt_returnReason.Location = new System.Drawing.Point(448, 259);
             this.txt_returnReason.Name = "txt_returnReason";
             this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
@@ -1686,25 +1551,6 @@
             this.gv_returnReason.VisibleIndex = 10;
             this.gv_returnReason.Width = 94;
             // 
-            // lb_taobaoRemark
-            // 
-            this.lb_taobaoRemark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_taobaoRemark.Appearance.Options.UseFont = true;
-            this.lb_taobaoRemark.Location = new System.Drawing.Point(270, 84);
-            this.lb_taobaoRemark.Name = "lb_taobaoRemark";
-            this.lb_taobaoRemark.Size = new System.Drawing.Size(107, 21);
-            this.lb_taobaoRemark.TabIndex = 231;
-            this.lb_taobaoRemark.Text = "娣樺疂瀹㈡埛澶囨敞 ";
-            // 
-            // txt_taobaoRemark
-            // 
-            this.txt_taobaoRemark.Location = new System.Drawing.Point(330, 84);
-            this.txt_taobaoRemark.Name = "txt_taobaoRemark";
-            this.txt_taobaoRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_taobaoRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_taobaoRemark.Size = new System.Drawing.Size(150, 28);
-            this.txt_taobaoRemark.TabIndex = 231;
-            // 
             // gv_taobaoRemark
             // 
             this.gv_taobaoRemark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1723,7 +1569,7 @@
             // 
             this.lb_returnCustomer.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_returnCustomer.Appearance.Options.UseFont = true;
-            this.lb_returnCustomer.Location = new System.Drawing.Point(20, 84);
+            this.lb_returnCustomer.Location = new System.Drawing.Point(20, 52);
             this.lb_returnCustomer.Name = "lb_returnCustomer";
             this.lb_returnCustomer.Size = new System.Drawing.Size(73, 21);
             this.lb_returnCustomer.TabIndex = 228;
@@ -1731,7 +1577,7 @@
             // 
             // txt_returnCustomer
             // 
-            this.txt_returnCustomer.Location = new System.Drawing.Point(80, 84);
+            this.txt_returnCustomer.Location = new System.Drawing.Point(80, 52);
             this.txt_returnCustomer.Name = "txt_returnCustomer";
             this.txt_returnCustomer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_returnCustomer.Properties.Appearance.Options.UseFont = true;
@@ -1756,7 +1602,7 @@
             // 
             this.lb_customerOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_customerOrderNo.Appearance.Options.UseFont = true;
-            this.lb_customerOrderNo.Location = new System.Drawing.Point(50, 361);
+            this.lb_customerOrderNo.Location = new System.Drawing.Point(20, 263);
             this.lb_customerOrderNo.Name = "lb_customerOrderNo";
             this.lb_customerOrderNo.Size = new System.Drawing.Size(73, 21);
             this.lb_customerOrderNo.TabIndex = 226;
@@ -1842,25 +1688,6 @@
             this.gv_salesOrg.VisibleIndex = 5;
             this.gv_salesOrg.Width = 94;
             // 
-            // lb_currency
-            // 
-            this.lb_currency.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_currency.Appearance.Options.UseFont = true;
-            this.lb_currency.Location = new System.Drawing.Point(20, 52);
-            this.lb_currency.Name = "lb_currency";
-            this.lb_currency.Size = new System.Drawing.Size(73, 21);
-            this.lb_currency.TabIndex = 217;
-            this.lb_currency.Text = "缁撶畻甯佸埆 ";
-            // 
-            // txt_currency
-            // 
-            this.txt_currency.Location = new System.Drawing.Point(80, 52);
-            this.txt_currency.Name = "txt_currency";
-            this.txt_currency.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_currency.Properties.Appearance.Options.UseFont = true;
-            this.txt_currency.Size = new System.Drawing.Size(150, 28);
-            this.txt_currency.TabIndex = 217;
-            // 
             // gv_currency
             // 
             this.gv_currency.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1945,7 +1772,7 @@
             // 
             this.lb_billType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billType.Appearance.Options.UseFont = true;
-            this.lb_billType.Location = new System.Drawing.Point(661, 361);
+            this.lb_billType.Location = new System.Drawing.Point(631, 263);
             this.lb_billType.Name = "lb_billType";
             this.lb_billType.Size = new System.Drawing.Size(73, 21);
             this.lb_billType.TabIndex = 211;
@@ -1953,7 +1780,7 @@
             // 
             // txt_billType
             // 
-            this.txt_billType.Location = new System.Drawing.Point(721, 357);
+            this.txt_billType.Location = new System.Drawing.Point(691, 259);
             this.txt_billType.Name = "txt_billType";
             this.txt_billType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billType.Properties.Appearance.Options.UseFont = true;
@@ -2141,10 +1968,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 401);
+            this.tabMx.Location = new System.Drawing.Point(0, 302);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 169);
+            this.tabMx.Size = new System.Drawing.Size(1126, 268);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -2157,28 +1984,10 @@
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_billStatus);
             this.panel1.Controls.Add(this.txt_billStatus);
-            this.panel1.Controls.Add(this.lb_erpId);
-            this.panel1.Controls.Add(this.txt_erpId);
-            this.panel1.Controls.Add(this.lb_manualCloseFlag);
-            this.panel1.Controls.Add(this.txt_manualCloseFlag);
-            this.panel1.Controls.Add(this.lb_closeStatus);
-            this.panel1.Controls.Add(this.txt_closeStatus);
-            this.panel1.Controls.Add(this.lb_cancelDate);
-            this.panel1.Controls.Add(this.txt_cancelDate);
-            this.panel1.Controls.Add(this.lb_cancelledBy);
-            this.panel1.Controls.Add(this.txt_cancelledBy);
-            this.panel1.Controls.Add(this.lb_cancelStatus);
-            this.panel1.Controls.Add(this.txt_cancelStatus);
             this.panel1.Controls.Add(this.lb_approvedDate);
             this.panel1.Controls.Add(this.txt_approvedDate);
             this.panel1.Controls.Add(this.lb_approvedBy);
             this.panel1.Controls.Add(this.txt_approvedBy);
-            this.panel1.Controls.Add(this.lb_closeDate);
-            this.panel1.Controls.Add(this.txt_closeDate);
-            this.panel1.Controls.Add(this.lb_closeReason);
-            this.panel1.Controls.Add(this.txt_closeReason);
-            this.panel1.Controls.Add(this.lb_closedBy);
-            this.panel1.Controls.Add(this.txt_closedBy);
             this.panel1.Controls.Add(this.lb_modifiedDate);
             this.panel1.Controls.Add(this.txt_modifiedDate);
             this.panel1.Controls.Add(this.lb_modifiedBy);
@@ -2215,8 +2024,6 @@
             this.panel1.Controls.Add(this.txt_deliveryLocation);
             this.panel1.Controls.Add(this.lb_returnReason);
             this.panel1.Controls.Add(this.txt_returnReason);
-            this.panel1.Controls.Add(this.lb_taobaoRemark);
-            this.panel1.Controls.Add(this.txt_taobaoRemark);
             this.panel1.Controls.Add(this.lb_returnCustomer);
             this.panel1.Controls.Add(this.txt_returnCustomer);
             this.panel1.Controls.Add(this.lb_customerOrderNo);
@@ -2224,8 +2031,6 @@
             this.panel1.Controls.Add(this.txt_salesDept);
             this.panel1.Controls.Add(this.lb_salesOrg);
             this.panel1.Controls.Add(this.txt_salesOrg);
-            this.panel1.Controls.Add(this.lb_currency);
-            this.panel1.Controls.Add(this.txt_currency);
             this.panel1.Controls.Add(this.lb_fDate);
             this.panel1.Controls.Add(this.txt_fDate);
             this.panel1.Controls.Add(this.lb_billNo);
@@ -2238,20 +2043,20 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 401);
+            this.panel1.Size = new System.Drawing.Size(1126, 302);
             this.panel1.TabIndex = 1;
             // 
             // txt_customerOrderNo
             // 
             this.txt_customerOrderNo.IsReadly = false;
-            this.txt_customerOrderNo.Location = new System.Drawing.Point(143, 357);
+            this.txt_customerOrderNo.Location = new System.Drawing.Point(113, 259);
             this.txt_customerOrderNo.Name = "txt_customerOrderNo";
             this.txt_customerOrderNo.Size = new System.Drawing.Size(234, 29);
             this.txt_customerOrderNo.TabIndex = 0;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(807, 343);
+            this.labelControl11.Location = new System.Drawing.Point(999, 171);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2261,7 +2066,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(858, 343);
+            this.lbGuid.Location = new System.Drawing.Point(1050, 171);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -2276,74 +2081,6 @@
             this.picCheckBox.TabIndex = 451;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "閿�鍞崟鍙�";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 0;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 1;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 4;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 5;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "宸查��鏁伴噺";
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 6;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 27;
-            this.gvMxDel.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // Frm_SalesReturnNotice
             // 
@@ -2360,18 +2097,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
@@ -2390,11 +2119,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_currency.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
@@ -2410,7 +2137,6 @@
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2459,29 +2185,11 @@
         private DevExpress.XtraEditors.LabelControl lb_billStatus;
         private DevExpress.XtraEditors.TextEdit txt_billStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpId;
-        private DevExpress.XtraEditors.TextEdit txt_erpId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-
-        private DevExpress.XtraEditors.LabelControl lb_manualCloseFlag;
-        private DevExpress.XtraEditors.TextEdit txt_manualCloseFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gv_manualCloseFlag;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelDate;
-        private DevExpress.XtraEditors.TextEdit txt_cancelDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelledBy;
-        private DevExpress.XtraEditors.TextEdit txt_cancelledBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelledBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancelStatus;
-        private DevExpress.XtraEditors.TextEdit txt_cancelStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
 
         private DevExpress.XtraEditors.LabelControl lb_approvedDate;
@@ -2491,17 +2199,8 @@
         private DevExpress.XtraEditors.LabelControl lb_approvedBy;
         private DevExpress.XtraEditors.TextEdit txt_approvedBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_approvedBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeDate;
-        private DevExpress.XtraEditors.TextEdit txt_closeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeReason;
-        private DevExpress.XtraEditors.TextEdit txt_closeReason;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeReason;
-
-        private DevExpress.XtraEditors.LabelControl lb_closedBy;
-        private DevExpress.XtraEditors.TextEdit txt_closedBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closedBy;
 
         private DevExpress.XtraEditors.LabelControl lb_modifiedDate;
@@ -2575,9 +2274,6 @@
         private DevExpress.XtraEditors.LabelControl lb_returnReason;
         private DevExpress.XtraEditors.TextEdit txt_returnReason;
         private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
-
-        private DevExpress.XtraEditors.LabelControl lb_taobaoRemark;
-        private DevExpress.XtraEditors.TextEdit txt_taobaoRemark;
         private DevExpress.XtraGrid.Columns.GridColumn gv_taobaoRemark;
 
         private DevExpress.XtraEditors.LabelControl lb_returnCustomer;
@@ -2594,9 +2290,6 @@
         private DevExpress.XtraEditors.LabelControl lb_salesOrg;
         private DevExpress.XtraEditors.TextEdit txt_salesOrg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrg;
-
-        private DevExpress.XtraEditors.LabelControl lb_currency;
-        private DevExpress.XtraEditors.TextEdit txt_currency;
         private DevExpress.XtraGrid.Columns.GridColumn gv_currency;
 
         private DevExpress.XtraEditors.LabelControl lb_fDate;

--
Gitblit v1.9.3