From bbb164cca79acfd4cfb901f50e6847c84ed26b11 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 09:05:11 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs | 55 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 27
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 810 ++++++++++++++++++------------------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 147 +++---
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs | 12
DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs | 18
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 149 +++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 12
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 31
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs | 40
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 3
11 files changed, 686 insertions(+), 618 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 2ccfd20..ef703cc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -30,19 +30,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.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.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -61,11 +61,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.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();
@@ -152,6 +152,7 @@
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();
@@ -303,11 +304,11 @@
this.gv_fApproveDate,
this.gv_fSalesManID,
this.gv_fCustomerID,
- this.gv_fDate,
this.gv_fNote,
this.gridColumn33,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn36});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -462,19 +463,6 @@
this.gv_fCustomerID.Tag = "query_a.FCustomerID";
this.gv_fCustomerID.Width = 94;
//
- // gv_fDate
- //
- 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 = 9;
- this.gv_fDate.Width = 94;
- //
// gv_fNote
//
this.gv_fNote.AppearanceCell.Options.UseFont = true;
@@ -485,7 +473,7 @@
this.gv_fNote.OptionsColumn.AllowEdit = false;
this.gv_fNote.Tag = "query_a.FNote";
this.gv_fNote.Visible = true;
- this.gv_fNote.VisibleIndex = 10;
+ this.gv_fNote.VisibleIndex = 9;
this.gv_fNote.Width = 94;
//
// gridColumn33
@@ -495,7 +483,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
@@ -505,7 +493,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
@@ -515,8 +503,18 @@
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.Visible = true;
+ this.gridColumn36.VisibleIndex = 13;
+ this.gridColumn36.Width = 94;
//
// pageBar1
//
@@ -802,32 +800,32 @@
this.layoutControlItem12});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 141);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1082,7 +1080,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;
@@ -1120,6 +1119,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,
@@ -1157,17 +1159,21 @@
//
this.gridColumn4.Caption = "閿�鍞崟浣�";
this.gridColumn4.FieldName = "xxdw";
+ this.gridColumn4.MaxWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.Width = 50;
//
// gridColumn5
//
this.gridColumn5.Caption = "閿�鍞暟閲�";
this.gridColumn5.FieldName = "qty";
+ this.gridColumn5.MaxWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 50;
//
// gridColumn7
//
@@ -1187,11 +1193,17 @@
//
// 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.MaxWidth = 50;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 50;
//
// gridColumn6
//
@@ -1221,9 +1233,11 @@
//
this.gridColumn32.Caption = "璁′环鍗曚綅";
this.gridColumn32.FieldName = "jjdw";
+ this.gridColumn32.MaxWidth = 50;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 10;
+ this.gridColumn32.Width = 50;
//
// gvMx1fMustQty
//
@@ -1527,13 +1541,21 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn37
+ //
+ this.gridColumn37.Caption = "鐗╂枡ID";
+ this.gridColumn37.FieldName = "itemId";
+ this.gridColumn37.MinWidth = 25;
+ this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.Width = 94;
//
// picCheckBox
//
@@ -1640,7 +1662,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;
@@ -1734,5 +1755,7 @@
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
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 9f539d3..1a51109 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -142,43 +142,43 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -301,43 +301,43 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -1063,7 +1063,8 @@
this.layoutControlItem1,
this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem35});
+ this.layoutControlItem35,
+ this.layoutControlItem34});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500);
@@ -1091,7 +1092,7 @@
//
// txt_receiveId
//
- this.txt_receiveId.Location = new System.Drawing.Point(947, 107);
+ this.txt_receiveId.Location = new System.Drawing.Point(947, 75);
this.txt_receiveId.Name = "txt_receiveId";
this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
this.txt_receiveId.Size = new System.Drawing.Size(167, 24);
@@ -1118,7 +1119,7 @@
//
// txt_entryNote
//
- this.txt_entryNote.Location = new System.Drawing.Point(119, 267);
+ this.txt_entryNote.Location = new System.Drawing.Point(119, 235);
this.txt_entryNote.Name = "txt_entryNote";
this.txt_entryNote.Properties.Appearance.Options.UseFont = true;
this.txt_entryNote.Size = new System.Drawing.Size(165, 24);
@@ -1127,7 +1128,7 @@
//
// txt_changerId
//
- this.txt_changerId.Location = new System.Drawing.Point(947, 235);
+ this.txt_changerId.Location = new System.Drawing.Point(947, 203);
this.txt_changerId.Name = "txt_changerId";
this.txt_changerId.Properties.Appearance.Options.UseFont = true;
this.txt_changerId.Size = new System.Drawing.Size(167, 24);
@@ -1136,7 +1137,7 @@
//
// txt_versionNo
//
- this.txt_versionNo.Location = new System.Drawing.Point(671, 235);
+ this.txt_versionNo.Location = new System.Drawing.Point(119, 203);
this.txt_versionNo.Name = "txt_versionNo";
this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
this.txt_versionNo.Size = new System.Drawing.Size(165, 24);
@@ -1154,7 +1155,7 @@
//
// txt_cancelStatus
//
- this.txt_cancelStatus.Location = new System.Drawing.Point(119, 235);
+ this.txt_cancelStatus.Location = new System.Drawing.Point(395, 267);
this.txt_cancelStatus.Name = "txt_cancelStatus";
this.txt_cancelStatus.Properties.Appearance.Options.UseFont = true;
this.txt_cancelStatus.Size = new System.Drawing.Size(165, 24);
@@ -1163,7 +1164,7 @@
//
// txt_changeDate
//
- this.txt_changeDate.Location = new System.Drawing.Point(947, 267);
+ this.txt_changeDate.Location = new System.Drawing.Point(947, 235);
this.txt_changeDate.Name = "txt_changeDate";
this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
this.txt_changeDate.Size = new System.Drawing.Size(167, 24);
@@ -1172,7 +1173,7 @@
//
// txt_closeDate
//
- this.txt_closeDate.Location = new System.Drawing.Point(671, 203);
+ this.txt_closeDate.Location = new System.Drawing.Point(671, 267);
this.txt_closeDate.Name = "txt_closeDate";
this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
this.txt_closeDate.Size = new System.Drawing.Size(165, 24);
@@ -1181,7 +1182,7 @@
//
// txt_closerId
//
- this.txt_closerId.Location = new System.Drawing.Point(395, 203);
+ this.txt_closerId.Location = new System.Drawing.Point(671, 235);
this.txt_closerId.Name = "txt_closerId";
this.txt_closerId.Properties.Appearance.Options.UseFont = true;
this.txt_closerId.Size = new System.Drawing.Size(165, 24);
@@ -1190,7 +1191,7 @@
//
// txt_approveDate
//
- this.txt_approveDate.Location = new System.Drawing.Point(119, 203);
+ this.txt_approveDate.Location = new System.Drawing.Point(395, 139);
this.txt_approveDate.Name = "txt_approveDate";
this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
this.txt_approveDate.Size = new System.Drawing.Size(165, 24);
@@ -1199,7 +1200,7 @@
//
// txt_modifyDate
//
- this.txt_modifyDate.Location = new System.Drawing.Point(671, 267);
+ this.txt_modifyDate.Location = new System.Drawing.Point(671, 171);
this.txt_modifyDate.Name = "txt_modifyDate";
this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
this.txt_modifyDate.Size = new System.Drawing.Size(165, 24);
@@ -1208,7 +1209,7 @@
//
// txt_modifierId
//
- this.txt_modifierId.Location = new System.Drawing.Point(671, 171);
+ this.txt_modifierId.Location = new System.Drawing.Point(671, 139);
this.txt_modifierId.Name = "txt_modifierId";
this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
this.txt_modifierId.Size = new System.Drawing.Size(165, 24);
@@ -1217,7 +1218,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(395, 171);
+ this.txt_createDate.Location = new System.Drawing.Point(395, 203);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(165, 24);
@@ -1226,7 +1227,7 @@
//
// txt_creatorId
//
- this.txt_creatorId.Location = new System.Drawing.Point(119, 171);
+ this.txt_creatorId.Location = new System.Drawing.Point(395, 171);
this.txt_creatorId.Name = "txt_creatorId";
this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
this.txt_creatorId.Size = new System.Drawing.Size(165, 24);
@@ -1244,25 +1245,25 @@
//
// txt_chargeId
//
- this.txt_chargeId.Location = new System.Drawing.Point(947, 75);
+ this.txt_chargeId.Location = new System.Drawing.Point(671, 75);
this.txt_chargeId.Name = "txt_chargeId";
this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
- this.txt_chargeId.Size = new System.Drawing.Size(167, 24);
+ this.txt_chargeId.Size = new System.Drawing.Size(165, 24);
this.txt_chargeId.StyleController = this.layoutMx1;
this.txt_chargeId.TabIndex = 286;
//
// txt_linkMan
//
- this.txt_linkMan.Location = new System.Drawing.Point(395, 75);
+ this.txt_linkMan.Location = new System.Drawing.Point(947, 107);
this.txt_linkMan.Name = "txt_linkMan";
this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
- this.txt_linkMan.Size = new System.Drawing.Size(165, 24);
+ this.txt_linkMan.Size = new System.Drawing.Size(167, 24);
this.txt_linkMan.StyleController = this.layoutMx1;
this.txt_linkMan.TabIndex = 284;
//
// txt_approverId
//
- this.txt_approverId.Location = new System.Drawing.Point(671, 139);
+ this.txt_approverId.Location = new System.Drawing.Point(395, 107);
this.txt_approverId.Name = "txt_approverId";
this.txt_approverId.Properties.Appearance.Options.UseFont = true;
this.txt_approverId.Size = new System.Drawing.Size(165, 24);
@@ -1271,16 +1272,16 @@
//
// txt_settleId
//
- this.txt_settleId.Location = new System.Drawing.Point(947, 43);
+ this.txt_settleId.Location = new System.Drawing.Point(671, 107);
this.txt_settleId.Name = "txt_settleId";
this.txt_settleId.Properties.Appearance.Options.UseFont = true;
- this.txt_settleId.Size = new System.Drawing.Size(167, 24);
+ this.txt_settleId.Size = new System.Drawing.Size(165, 24);
this.txt_settleId.StyleController = this.layoutMx1;
this.txt_settleId.TabIndex = 265;
//
// txt_note
//
- this.txt_note.Location = new System.Drawing.Point(671, 107);
+ this.txt_note.Location = new System.Drawing.Point(395, 75);
this.txt_note.Name = "txt_note";
this.txt_note.Properties.Appearance.Options.UseFont = true;
this.txt_note.Size = new System.Drawing.Size(165, 24);
@@ -1289,10 +1290,10 @@
//
// txt_changeReason
//
- this.txt_changeReason.Location = new System.Drawing.Point(119, 107);
+ this.txt_changeReason.Location = new System.Drawing.Point(947, 267);
this.txt_changeReason.Name = "txt_changeReason";
this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
- this.txt_changeReason.Size = new System.Drawing.Size(165, 24);
+ this.txt_changeReason.Size = new System.Drawing.Size(167, 24);
this.txt_changeReason.StyleController = this.layoutMx1;
this.txt_changeReason.TabIndex = 261;
//
@@ -1316,7 +1317,7 @@
//
// txt_closeStatus
//
- this.txt_closeStatus.Location = new System.Drawing.Point(671, 75);
+ this.txt_closeStatus.Location = new System.Drawing.Point(671, 203);
this.txt_closeStatus.Name = "txt_closeStatus";
this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
this.txt_closeStatus.Size = new System.Drawing.Size(165, 24);
@@ -1334,10 +1335,10 @@
//
// txt_headLocId
//
- this.txt_headLocId.Location = new System.Drawing.Point(119, 75);
+ this.txt_headLocId.Location = new System.Drawing.Point(947, 43);
this.txt_headLocId.Name = "txt_headLocId";
this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
- this.txt_headLocId.Size = new System.Drawing.Size(165, 24);
+ this.txt_headLocId.Size = new System.Drawing.Size(167, 24);
this.txt_headLocId.StyleController = this.layoutMx1;
this.txt_headLocId.TabIndex = 243;
//
@@ -1416,7 +1417,7 @@
//
// txt_xsOrgName
//
- this.txt_xsOrgName.Location = new System.Drawing.Point(395, 139);
+ this.txt_xsOrgName.Location = new System.Drawing.Point(119, 107);
this.txt_xsOrgName.Name = "txt_xsOrgName";
this.txt_xsOrgName.Size = new System.Drawing.Size(165, 24);
this.txt_xsOrgName.StyleController = this.layoutMx1;
@@ -1424,9 +1425,9 @@
//
// txt_salerName
//
- this.txt_salerName.Location = new System.Drawing.Point(947, 203);
+ this.txt_salerName.Location = new System.Drawing.Point(119, 171);
this.txt_salerName.Name = "txt_salerName";
- this.txt_salerName.Size = new System.Drawing.Size(167, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(165, 24);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 430;
//
@@ -1440,7 +1441,7 @@
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(395, 107);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(119, 75);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Size = new System.Drawing.Size(165, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
@@ -1510,6 +1511,17 @@
this.layoutControlItem35.Text = "閿�鍞粍缁嘔D";
this.layoutControlItem35.TextSize = new System.Drawing.Size(95, 18);
//
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_fbilltype;
+ this.layoutControlItem34.Location = new System.Drawing.Point(276, 255);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem34.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem34.Text = "fbilltype ";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(95, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1518,39 +1530,38 @@
this.layoutControlItem3,
this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem9,
- this.layoutControlItem11,
- this.layoutControlItem15,
this.layoutControlItem20,
- this.layoutControlItem21,
- this.layoutControlItem22,
- this.layoutControlItem23,
- this.layoutControlItem25,
- this.layoutControlItem26,
- this.layoutControlItem27,
- this.layoutControlItem29,
- this.layoutControlItem30,
- this.layoutControlItem31,
- this.layoutControlItem32,
- this.layoutControlItem33,
- this.layoutControlItem34,
this.layoutControlItem2,
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem8,
- this.layoutControlItem16,
- this.layoutControlItem19,
- this.layoutControlItem36,
- this.layoutControlItem14,
- this.layoutControlItem24,
- this.layoutControlItem28,
this.layoutControlItem37,
- this.layoutControlItem18,
- this.layoutControlItem17,
this.layoutControlItem41,
this.lab_saleDeptName,
this.layoutControlItem39,
- this.layoutControlItem40});
+ this.layoutControlItem40,
+ this.layoutControlItem9,
+ this.layoutControlItem36,
+ this.layoutControlItem18,
+ this.layoutControlItem19,
+ this.layoutControlItem16,
+ this.layoutControlItem23,
+ this.layoutControlItem24,
+ this.layoutControlItem15,
+ this.layoutControlItem17,
+ this.layoutControlItem25,
+ this.layoutControlItem27,
+ this.layoutControlItem26,
+ this.layoutControlItem11,
+ this.layoutControlItem29,
+ this.layoutControlItem30,
+ this.layoutControlItem22,
+ this.layoutControlItem21,
+ this.layoutControlItem31,
+ this.layoutControlItem33,
+ this.layoutControlItem32,
+ this.layoutControlItem28,
+ this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1629,38 +1640,6 @@
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_headLocId;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 63);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_closeStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 63);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_note;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 95);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem15.Text = "澶囨敞";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_linkPhone;
@@ -1671,134 +1650,6 @@
this.layoutControlItem20.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_creatorId;
- this.layoutControlItem21.Location = new System.Drawing.Point(0, 159);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem21.Text = "鍒涘缓浜�";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_createDate;
- this.layoutControlItem22.Location = new System.Drawing.Point(276, 159);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡 ";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_modifierId;
- this.layoutControlItem23.Location = new System.Drawing.Point(552, 159);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem23.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem23.Text = "鏈�鍚庝慨鏀逛汉 ";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_approveDate;
- this.layoutControlItem25.Location = new System.Drawing.Point(0, 191);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_closerId;
- this.layoutControlItem26.Location = new System.Drawing.Point(276, 191);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem26.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem26.Text = "鍏抽棴浜�";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_closeDate;
- this.layoutControlItem27.Location = new System.Drawing.Point(552, 191);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem29
- //
- this.layoutControlItem29.Control = this.txt_cancelStatus;
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 223);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem29.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem29.Text = "浣滃簾鐘舵��";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem30
- //
- this.layoutControlItem30.Control = this.txt_cancellerId;
- this.layoutControlItem30.Location = new System.Drawing.Point(276, 223);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem30.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem30.Text = "浣滃簾浜�";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_versionNo;
- this.layoutControlItem31.Location = new System.Drawing.Point(552, 223);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem31.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem31.Text = "鐗堟湰鍙�";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.txt_changerId;
- this.layoutControlItem32.Location = new System.Drawing.Point(828, 223);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem32.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem32.Text = "鍙樻洿浜�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_entryNote;
- this.layoutControlItem33.Location = new System.Drawing.Point(0, 255);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem33.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem33.Text = "澶囨敞";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_fbilltype;
- this.layoutControlItem34.Location = new System.Drawing.Point(276, 255);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem34.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem34.Text = "fbilltype ";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem2
//
@@ -1839,71 +1690,6 @@
this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_settleId;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 31);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem16.Text = "缁撶畻鏂�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_chargeId;
- this.layoutControlItem19.Location = new System.Drawing.Point(828, 63);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem19.Text = "浠樻鏂�";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem36
- //
- this.layoutControlItem36.Control = this.txt_receiveId;
- this.layoutControlItem36.Location = new System.Drawing.Point(828, 95);
- this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem36.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem36.Text = "鏀惰揣鏂�";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_changeReason;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 95);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.txt_modifyDate;
- this.layoutControlItem24.Location = new System.Drawing.Point(552, 255);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem24.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem24.Text = "鏈�鍚庝慨鏀规棩鏈� ";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_changeDate;
- this.layoutControlItem28.Location = new System.Drawing.Point(828, 255);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem28.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_receiveContact;
@@ -1914,28 +1700,6 @@
this.layoutControlItem37.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem37.Text = "鏀惰揣鏂硅仈绯讳汉";
this.layoutControlItem37.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_linkMan;
- this.layoutControlItem18.Location = new System.Drawing.Point(276, 63);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_approverId;
- this.layoutControlItem17.Location = new System.Drawing.Point(552, 127);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem17.Text = "瀹℃牳浜� ";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem41
//
@@ -1950,10 +1714,9 @@
// lab_saleDeptName
//
this.lab_saleDeptName.Control = this.txt_saleDeptName;
- this.lab_saleDeptName.Location = new System.Drawing.Point(276, 95);
+ this.lab_saleDeptName.Location = new System.Drawing.Point(0, 63);
this.lab_saleDeptName.Name = "lab_saleDeptName";
- this.lab_saleDeptName.OptionsTableLayoutItem.ColumnIndex = 1;
- this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
this.lab_saleDeptName.Size = new System.Drawing.Size(276, 32);
this.lab_saleDeptName.Text = "閿�鍞儴闂ㄥ悕绉�";
this.lab_saleDeptName.TextSize = new System.Drawing.Size(95, 18);
@@ -1961,10 +1724,9 @@
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_xsOrgName;
- this.layoutControlItem39.Location = new System.Drawing.Point(276, 127);
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 95);
this.layoutControlItem39.Name = "layoutControlItem39";
- this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem39.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem39.Text = "閿�鍞粍缁囧悕";
this.layoutControlItem39.TextSize = new System.Drawing.Size(95, 18);
@@ -1972,13 +1734,252 @@
// layoutControlItem40
//
this.layoutControlItem40.Control = this.txt_salerName;
- this.layoutControlItem40.Location = new System.Drawing.Point(828, 191);
+ this.layoutControlItem40.Location = new System.Drawing.Point(0, 159);
this.layoutControlItem40.Name = "layoutControlItem40";
- this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem40.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem40.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem40.Text = "閿�鍞憳鍚�";
this.layoutControlItem40.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_headLocId;
+ this.layoutControlItem9.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txt_receiveId;
+ this.layoutControlItem36.Location = new System.Drawing.Point(828, 63);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem36.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem36.Text = "鏀惰揣鏂�";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_linkMan;
+ this.layoutControlItem18.Location = new System.Drawing.Point(828, 95);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem18.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_chargeId;
+ this.layoutControlItem19.Location = new System.Drawing.Point(552, 63);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem19.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem19.Text = "浠樻鏂�";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_settleId;
+ this.layoutControlItem16.Location = new System.Drawing.Point(552, 95);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem16.Text = "缁撶畻鏂�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_modifierId;
+ this.layoutControlItem23.Location = new System.Drawing.Point(552, 127);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem23.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem23.Text = "鏈�鍚庝慨鏀逛汉 ";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.txt_modifyDate;
+ this.layoutControlItem24.Location = new System.Drawing.Point(552, 159);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem24.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem24.Text = "鏈�鍚庝慨鏀规棩鏈� ";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_note;
+ this.layoutControlItem15.Location = new System.Drawing.Point(276, 63);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem15.Text = "澶囨敞";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_approverId;
+ this.layoutControlItem17.Location = new System.Drawing.Point(276, 95);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem17.Text = "瀹℃牳浜� ";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_approveDate;
+ this.layoutControlItem25.Location = new System.Drawing.Point(276, 127);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem25.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_closeDate;
+ this.layoutControlItem27.Location = new System.Drawing.Point(552, 255);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem27.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_closerId;
+ this.layoutControlItem26.Location = new System.Drawing.Point(552, 223);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem26.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem26.Text = "鍏抽棴浜�";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_closeStatus;
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 191);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_cancelStatus;
+ this.layoutControlItem29.Location = new System.Drawing.Point(276, 255);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem29.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem29.Text = "浣滃簾鐘舵��";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txt_cancellerId;
+ this.layoutControlItem30.Location = new System.Drawing.Point(276, 223);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem30.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem30.Text = "浣滃簾浜�";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_createDate;
+ this.layoutControlItem22.Location = new System.Drawing.Point(276, 191);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡 ";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_creatorId;
+ this.layoutControlItem21.Location = new System.Drawing.Point(276, 159);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem21.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem21.Text = "鍒涘缓浜�";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_versionNo;
+ this.layoutControlItem31.Location = new System.Drawing.Point(0, 191);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem31.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem31.Text = "鐗堟湰鍙�";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_entryNote;
+ this.layoutControlItem33.Location = new System.Drawing.Point(0, 223);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem33.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem33.Text = "澶囨敞";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_changerId;
+ this.layoutControlItem32.Location = new System.Drawing.Point(828, 191);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem32.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem32.Text = "鍙樻洿浜�";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_changeDate;
+ this.layoutControlItem28.Location = new System.Drawing.Point(828, 223);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem28.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_changeReason;
+ this.layoutControlItem14.Location = new System.Drawing.Point(828, 255);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem14.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
//
// tabMx
//
@@ -2066,7 +2067,6 @@
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvMx1id
@@ -2718,43 +2718,43 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2875,16 +2875,13 @@
private DevExpress.XtraEditors.TextEdit txt_closeStatus;
private DevExpress.XtraEditors.TextEdit txt_custId;
private DevExpress.XtraEditors.TextEdit txt_headLocId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.TextEdit txt_settleId;
private DevExpress.XtraEditors.TextEdit txt_note;
private DevExpress.XtraEditors.TextEdit txt_changeReason;
private DevExpress.XtraEditors.TextEdit txt_salerId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.TextEdit txt_receiveContact;
private DevExpress.XtraEditors.TextEdit txt_receiveId;
private DevExpress.XtraEditors.TextEdit txt_saleOrgId;
@@ -2907,17 +2904,6 @@
private DevExpress.XtraEditors.TextEdit txt_linkMan;
private DevExpress.XtraEditors.TextEdit txt_approverId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private System.Windows.Forms.Label lbGuid;
@@ -2943,19 +2929,33 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+ private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraLayout.LayoutControlItem lab_saleDeptName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
- private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 94cc762..0b8b697 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -198,6 +198,7 @@
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -715,7 +716,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fIsLink.Size = new System.Drawing.Size(200, 32);
+ this.txt_fIsLink.Size = new System.Drawing.Size(195, 32);
this.txt_fIsLink.StyleController = this.layoutMx1;
this.txt_fIsLink.TabIndex = 534;
//
@@ -725,7 +726,7 @@
this.txt_fstockid.Location = new System.Drawing.Point(84, 120);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
- this.txt_fstockid.Size = new System.Drawing.Size(200, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(195, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -738,20 +739,20 @@
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(564, 156);
+ this.txt_wjStatus.Location = new System.Drawing.Point(554, 156);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(272, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 453;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(840, 156);
+ this.txt_chkStatus.Location = new System.Drawing.Point(825, 156);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -759,14 +760,14 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(360, 120);
+ this.txt_billType.Location = new System.Drawing.Point(355, 120);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_billType.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(200, 24);
+ this.txt_billType.Size = new System.Drawing.Size(195, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
@@ -775,15 +776,15 @@
this.txt_salesOrderId.IsReadly = false;
this.txt_salesOrderId.Location = new System.Drawing.Point(84, 84);
this.txt_salesOrderId.Name = "txt_salesOrderId";
- this.txt_salesOrderId.Size = new System.Drawing.Size(200, 24);
+ this.txt_salesOrderId.Size = new System.Drawing.Size(195, 24);
this.txt_salesOrderId.TabIndex = 0;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(912, 120);
+ this.txt_approvedDate.Location = new System.Drawing.Point(897, 120);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(202, 24);
+ this.txt_approvedDate.Size = new System.Drawing.Size(196, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -800,40 +801,40 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(912, 84);
+ this.txt_approvedBy.Location = new System.Drawing.Point(897, 84);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(202, 24);
+ this.txt_approvedBy.Size = new System.Drawing.Size(196, 24);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
//
// txt_xsOrgName
//
- this.txt_xsOrgName.Location = new System.Drawing.Point(360, 12);
+ this.txt_xsOrgName.Location = new System.Drawing.Point(355, 12);
this.txt_xsOrgName.Name = "txt_xsOrgName";
this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
- this.txt_xsOrgName.Size = new System.Drawing.Size(200, 24);
+ this.txt_xsOrgName.Size = new System.Drawing.Size(195, 24);
this.txt_xsOrgName.StyleController = this.layoutMx1;
this.txt_xsOrgName.TabIndex = 219;
this.txt_xsOrgName.Tag = "readonly";
//
// txt_inventoryOrg
//
- this.txt_inventoryOrg.Location = new System.Drawing.Point(636, 12);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(626, 12);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_inventoryOrg.Size = new System.Drawing.Size(200, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(195, 24);
this.txt_inventoryOrg.StyleController = this.layoutMx1;
this.txt_inventoryOrg.TabIndex = 243;
this.txt_inventoryOrg.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(912, 48);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(897, 48);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(202, 24);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(196, 24);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
@@ -843,57 +844,57 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
//
// txt_salerName
//
- this.txt_salerName.Location = new System.Drawing.Point(360, 48);
+ this.txt_salerName.Location = new System.Drawing.Point(355, 48);
this.txt_salerName.Name = "txt_salerName";
this.txt_salerName.Properties.Appearance.Options.UseFont = true;
- this.txt_salerName.Size = new System.Drawing.Size(200, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(195, 24);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 267;
this.txt_salerName.Tag = "readonly";
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(912, 12);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(897, 12);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(202, 24);
+ this.txt_modifiedBy.Size = new System.Drawing.Size(196, 24);
this.txt_modifiedBy.StyleController = this.layoutMx1;
this.txt_modifiedBy.TabIndex = 327;
this.txt_modifiedBy.Tag = "readonly";
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(360, 84);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(355, 84);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
- this.txt_saleDeptName.Size = new System.Drawing.Size(200, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(195, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
//
// txt_custName
//
- this.txt_custName.Location = new System.Drawing.Point(636, 48);
+ this.txt_custName.Location = new System.Drawing.Point(626, 48);
this.txt_custName.Name = "txt_custName";
this.txt_custName.Properties.Appearance.Options.UseFont = true;
- this.txt_custName.Size = new System.Drawing.Size(200, 24);
+ this.txt_custName.Size = new System.Drawing.Size(195, 24);
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 252;
this.txt_custName.Tag = "readonly";
//
// txt_createdDate
//
- this.txt_createdDate.Location = new System.Drawing.Point(636, 120);
+ this.txt_createdDate.Location = new System.Drawing.Point(626, 120);
this.txt_createdDate.Name = "txt_createdDate";
this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createdDate.Size = new System.Drawing.Size(200, 24);
+ this.txt_createdDate.Size = new System.Drawing.Size(195, 24);
this.txt_createdDate.StyleController = this.layoutMx1;
this.txt_createdDate.TabIndex = 319;
this.txt_createdDate.Tag = "readonly";
@@ -903,16 +904,16 @@
this.txt_returnReason.Location = new System.Drawing.Point(84, 156);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(476, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(466, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(636, 84);
+ this.txt_createdBy.Location = new System.Drawing.Point(626, 84);
this.txt_createdBy.Name = "txt_createdBy";
this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createdBy.Size = new System.Drawing.Size(200, 24);
+ this.txt_createdBy.Size = new System.Drawing.Size(195, 24);
this.txt_createdBy.StyleController = this.layoutMx1;
this.txt_createdBy.TabIndex = 312;
this.txt_createdBy.Tag = "readonly";
@@ -993,146 +994,146 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1126, 200);
+ this.Root.Size = new System.Drawing.Size(1105, 200);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_xsOrgName;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem2.Text = "閿�鍞粍缁�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_inventoryOrg;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_salerName;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 36);
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 36);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem6.Text = "閿�鍞憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 72);
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 72);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_custName;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 36);
+ this.layoutControlItem8.Location = new System.Drawing.Point(542, 36);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 108);
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 108);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createdBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 72);
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 72);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem11.Text = "鍒涘缓浜�";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createdDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 108);
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 108);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem13.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem13.Text = "淇敼浜�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(828, 36);
+ this.layoutControlItem14.Location = new System.Drawing.Point(813, 36);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem14.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 72);
+ this.layoutControlItem15.Location = new System.Drawing.Point(813, 72);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem15.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem15.Text = "瀹℃牳浜�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 108);
+ this.layoutControlItem16.Location = new System.Drawing.Point(813, 108);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem16.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(828, 144);
+ this.layoutControlItem17.Location = new System.Drawing.Point(813, 144);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem17.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1140,11 +1141,11 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_wjStatus;
- this.layoutControlItem18.Location = new System.Drawing.Point(552, 144);
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 144);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -1154,7 +1155,7 @@
this.layoutControlItem4.Control = this.txt_billNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1165,7 +1166,7 @@
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(552, 36);
+ this.layoutControlItem9.Size = new System.Drawing.Size(542, 36);
this.layoutControlItem9.Text = "閫�璐у師鍥�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1175,7 +1176,7 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 108);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1185,7 +1186,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem5.Text = "閿�鍞鍗�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1195,7 +1196,7 @@
this.layoutControlItem21.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 36);
+ this.layoutControlItem21.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem21.Text = "鏈夋棤婧愬崟";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1247,6 +1248,7 @@
this.gridColumn20,
this.gvMx1salesUnitId,
this.gvMx1salesQuantity,
+ this.gridColumn32,
this.gvMx1note,
this.gridColumn13,
this.gvMx1returnDate,
@@ -2007,6 +2009,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "鍙戣揣鎬婚噺";
+ this.gridColumn32.FieldName = "fhQuantity";
+ this.gridColumn32.MinWidth = 25;
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 15;
+ this.gridColumn32.Width = 94;
+ //
// Frm_SalesReturnNotice
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2256,5 +2268,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index f878e29..2c16df1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -100,7 +100,7 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,7 +113,7 @@
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -123,6 +123,7 @@
this.gvMx2unit = 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.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -180,10 +181,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
+ this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- this.tabMxPage2.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -940,15 +941,15 @@
this.tabMx.Size = new System.Drawing.Size(1346, 382);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage2,
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.tabMxPage2});
//
- // tabMxPage1
+ // tabMxPage2
//
- this.tabMxPage1.Controls.Add(this.gcMx2);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
- this.tabMxPage1.Text = "鍏ュ簱鏉＄爜";
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
+ this.tabMxPage2.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
//
@@ -1098,12 +1099,12 @@
this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 94;
//
- // tabMxPage2
+ // tabMxPage1
//
- this.tabMxPage2.Controls.Add(this.gcMx1);
- this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
- this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
+ this.tabMxPage1.Text = "鍏ュ簱鏄庣粏";
//
// gcMx1
//
@@ -1125,7 +1126,8 @@
this.gvMx2quantity,
this.gvMx2unit,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1210,6 +1212,16 @@
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 94;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "澶囨敞淇℃伅";
+ this.gridColumn7.FieldName = "sqRemark";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 94;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1286,10 +1298,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
+ this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- this.tabMxPage2.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1348,7 +1360,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1361,7 +1373,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1384,5 +1396,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index ebe4dde..60d9d73 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -210,6 +210,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.btnTest1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
@@ -283,6 +284,7 @@
((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.btnTest1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
this.SuspendLayout();
@@ -797,13 +799,12 @@
//
// txt_fOwnerTypeInIdHead
//
- this.txt_fOwnerTypeInIdHead.EditValue = "-璇烽�夋嫨-";
+ this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 101);
this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fOwnerTypeInIdHead.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
@@ -824,13 +825,12 @@
//
// txt_fOwnerTypeIdHead
//
- this.txt_fOwnerTypeIdHead.EditValue = "-璇烽�夋嫨-";
+ this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 71);
this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fOwnerTypeIdHead.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
@@ -1258,7 +1258,8 @@
this.rptDrCk,
this.rptDrCw,
this.rptDrHz,
- this.rptDcHz});
+ this.rptDcHz,
+ this.btnTest1});
this.gcMx1.Size = new System.Drawing.Size(1124, 357);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1373,7 +1374,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 50;
+ this.gridColumn2.Width = 41;
//
// gridColumn3
//
@@ -1382,7 +1383,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 50;
+ this.gridColumn3.Width = 41;
//
// gridColumn4
//
@@ -1391,7 +1392,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 110;
+ this.gridColumn4.Width = 91;
//
// gridColumn5
//
@@ -1400,7 +1401,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 110;
+ this.gridColumn5.Width = 100;
//
// gridColumn7
//
@@ -1409,6 +1410,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 4;
+ this.gridColumn7.Width = 56;
//
// gridColumn6
//
@@ -1417,7 +1419,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 52;
+ this.gridColumn6.Width = 43;
//
// gvMx1bld002
//
@@ -1789,6 +1791,13 @@
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Width = 94;
//
+ // btnTest1
+ //
+ this.btnTest1.AutoHeight = false;
+ this.btnTest1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.btnTest1.Name = "btnTest1";
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1889,6 +1898,7 @@
((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.btnTest1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
this.ResumeLayout(false);
@@ -2024,5 +2034,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit btnTest1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index ef32c1b..ed7d618 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Repository;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -62,6 +63,8 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
}
catch (Exception ex)
{
@@ -259,18 +262,18 @@
txt_fapporgid.Focus();
return;
}
- if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
- txt_fOwnerTypeIdHead.Focus();
- return;
- }
- if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
- txt_fOwnerTypeInIdHead.Focus();
- return;
- }
+ //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+ // txt_fOwnerTypeIdHead.Focus();
+ // return;
+ //}
+ //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
+ // txt_fOwnerTypeInIdHead.Focus();
+ // return;
+ //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index ba631d7..3ccd521 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -637,6 +637,18 @@
txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
+ else {
+ lbMxGuid.Text = "";
+ ucBtnPrint1.guidKey = "";
+ txtWlid.Text = "";
+ txtWlgg.Text = "";
+ txtWlmc.Text = "";
+ txtQuantity.Text = "";
+ txtYdy.Text = "";
+ txtKdy.Text = "";
+ txt_psnQty_1.Text = "";
+ txt_iCount_1.Text = "";
+ }
}
/// <summary>
/// 绉诲嚭鏉＄爜
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
index 7a19884..ba58a72 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
@@ -99,7 +99,7 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -112,7 +112,7 @@
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -175,10 +175,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
+ this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- this.tabMxPage2.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -923,15 +923,15 @@
this.tabMx.Size = new System.Drawing.Size(1346, 416);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage2,
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.tabMxPage2});
//
- // tabMxPage1
+ // tabMxPage2
//
- this.tabMxPage1.Controls.Add(this.gcMx2);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1344, 384);
- this.tabMxPage1.Text = "鍏ュ簱鏉＄爜";
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 384);
+ this.tabMxPage2.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
//
@@ -1081,12 +1081,12 @@
this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 94;
//
- // tabMxPage2
+ // tabMxPage1
//
- this.tabMxPage2.Controls.Add(this.gcMx1);
- this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 384);
- this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1344, 384);
+ this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
//
@@ -1265,10 +1265,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
+ this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- this.tabMxPage2.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1326,7 +1326,7 @@
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1339,7 +1339,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f9529c2..82c75bc 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -17,6 +17,7 @@
using DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraEditors.Repository;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
@@ -1872,7 +1873,7 @@
column.Width = 500;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs
index 7ef2f5b..764c61c 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs
@@ -60,11 +60,10 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 607);
+ this.gcMain.Size = new System.Drawing.Size(1054, 607);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -73,7 +72,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -99,7 +97,6 @@
//
// gv_guid
//
-
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "rkmxGuid";
@@ -134,7 +131,6 @@
//
// gv_supplierItemCode
//
-
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "itemNo";
@@ -148,7 +144,6 @@
//
// gv_supplierItemName
//
-
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "itemName";
@@ -212,7 +207,6 @@
//
// gv_purchaseUnit
//
-
this.gv_purchaseUnit.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.AppearanceCell.Options.UseForeColor = true;
@@ -262,7 +256,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 682);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1056, 682);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -272,7 +266,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.panelControl1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 650);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1054, 650);
this.xtraTabPage1.Text = "璇烽�夋嫨閲囬渶瑕侀��璐х殑鏄庣粏";
//
// panelControl1
@@ -282,7 +276,7 @@
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panelControl1.Location = new System.Drawing.Point(0, 607);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1126, 43);
+ this.panelControl1.Size = new System.Drawing.Size(1054, 43);
this.panelControl1.TabIndex = 4;
//
// btnIn
@@ -299,7 +293,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
- this.pageBar1.Location = new System.Drawing.Point(140, 2);
+ this.pageBar1.Location = new System.Drawing.Point(68, 2);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -311,7 +305,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1056, 682);
this.Controls.Add(this.xtraTabControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index b84be5b..2ab8ac7 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -342,7 +342,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 1;
+ this.gridColumn10.VisibleIndex = 0;
this.gridColumn10.Width = 94;
//
// repositoryItemSearchLookUpEdit1
@@ -389,7 +389,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 2;
+ this.gridColumn13.VisibleIndex = 1;
this.gridColumn13.Width = 94;
//
// gridColumn11
@@ -400,7 +400,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.OptionsColumn.ReadOnly = true;
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.VisibleIndex = 2;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -414,7 +414,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.VisibleIndex = 3;
this.gridColumn12.Width = 94;
//
// gridColumn14
@@ -424,7 +424,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 5;
+ this.gridColumn14.VisibleIndex = 4;
this.gridColumn14.Width = 94;
//
// repositoryItemButtonEdit2
@@ -444,8 +444,6 @@
this.gridColumn19.FieldName = "guid";
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 0;
this.gridColumn19.Width = 94;
//
// panQueryTable
--
Gitblit v1.9.3