From 1fdba70a907609c2966367fc8ad2db23d920e232 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 22 五月 2025 13:59:46 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/UserControl/UcLookSales.cs | 6
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 243 ++++++-------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 649 ++++++++++++++++-------------------
DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs | 59 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 5
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 90 ++--
6 files changed, 488 insertions(+), 564 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 4aa226f..935dab3 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 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -271,7 +271,7 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
@@ -512,8 +512,6 @@
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
@@ -800,32 +798,32 @@
this.layoutControlItem12});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 141);
this.layoutControlGroup1.TextVisible = false;
//
@@ -862,7 +860,7 @@
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem10.Text = "瀹℃牳浜�";
+ this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
@@ -899,7 +897,7 @@
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem6.Text = "鍒涘缓浜�";
+ this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
@@ -938,7 +936,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem9.Text = "閿�鍞憳";
+ this.layoutControlItem9.Text = "閿�鍞汉鍛�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
@@ -1541,10 +1539,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index bcb9db9..632ad0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -81,7 +81,6 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
@@ -90,19 +89,12 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,6 +125,12 @@
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -165,7 +163,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
@@ -174,19 +171,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -197,6 +187,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -237,6 +233,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -249,7 +246,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -530,7 +528,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -541,6 +539,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 171;
this.splitMx1.TabIndex = 0;
@@ -561,7 +560,6 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_checkUser);
- this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_sqRemark);
@@ -613,7 +611,7 @@
//
// txt_ckNo
//
- this.txt_ckNo.Location = new System.Drawing.Point(360, 102);
+ this.txt_ckNo.Location = new System.Drawing.Point(636, 72);
this.txt_ckNo.Name = "txt_ckNo";
this.txt_ckNo.Properties.Appearance.Options.UseFont = true;
this.txt_ckNo.Size = new System.Drawing.Size(200, 24);
@@ -649,10 +647,10 @@
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(912, 12);
+ this.txt_abtNo.Location = new System.Drawing.Point(360, 102);
this.txt_abtNo.Name = "txt_abtNo";
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(202, 24);
+ this.txt_abtNo.Size = new System.Drawing.Size(200, 24);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 387;
//
@@ -676,7 +674,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(912, 72);
+ this.txt_checkDate.Location = new System.Drawing.Point(912, 42);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
@@ -694,21 +692,12 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 42);
+ this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
- //
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(636, 72);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 24);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 243;
//
// txt_kcOrg
//
@@ -721,7 +710,7 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(840, 102);
+ this.txt_status.Location = new System.Drawing.Point(840, 72);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_status.Size = new System.Drawing.Size(274, 24);
@@ -756,20 +745,19 @@
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem14,
+ this.layoutControlItem18,
this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem18});
+ this.layoutControlItem14,
+ this.layoutControlItem4,
+ this.layoutControlItem8,
+ this.layoutControlItem12,
+ this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -830,18 +818,8 @@
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem3.Text = "鍒涘缓浜�";
+ this.layoutControlItem3.Text = "鍒涘缓浜哄憳";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_abtNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
@@ -875,17 +853,6 @@
this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_checkUser;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 30);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem8.Text = "瀹℃牳浜�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_kcOrg;
@@ -907,28 +874,6 @@
this.layoutControlItem10.Text = "瀹㈡埛缂栧彿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 60);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem11.Text = "澶囨敞淇℃伅";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_checkDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 60);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_xxNo;
@@ -938,40 +883,6 @@
this.layoutControlItem13.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem13.Text = "閿�鍞崟鍙�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_ckNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 90);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_ckName;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 90);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_status;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 90);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
//
// layoutControlItem18
//
@@ -1313,6 +1224,72 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_ckName;
+ this.layoutControlItem15.Location = new System.Drawing.Point(552, 90);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_ckNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(552, 60);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_abtNo;
+ this.layoutControlItem4.Location = new System.Drawing.Point(276, 90);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem4.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_checkDate;
+ this.layoutControlItem12.Location = new System.Drawing.Point(828, 30);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_status;
+ this.layoutControlItem16.Location = new System.Drawing.Point(828, 60);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
// Frm_SalesDeliverDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1355,7 +1332,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
@@ -1364,19 +1340,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -1387,6 +1356,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
@@ -1426,7 +1401,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.TextEdit txt_cusNo;
private DevExpress.XtraEditors.TextEdit txt_ckName;
private DevExpress.XtraEditors.TextEdit txt_xxNo;
@@ -1435,22 +1409,15 @@
private DevExpress.XtraEditors.TextEdit txt_cusName;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_kcOrg;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1484,5 +1451,11 @@
private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
index 8c815d4..6e4ec45 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -191,6 +191,11 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 4c47b66..fbd8f54 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.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.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -171,6 +171,13 @@
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -209,9 +216,6 @@
this.gvMx1custIno = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1custInm = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1custImd = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1mapId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1mapName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1mapSpec = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1supplyOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -227,13 +231,6 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -328,12 +325,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
@@ -341,6 +332,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -354,7 +351,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1256, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1570, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -365,7 +362,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1256, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1570, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -983,7 +980,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1254, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1568, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -1003,7 +1000,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1254, 570);
+ this.splitMx1.Size = new System.Drawing.Size(1568, 570);
this.splitMx1.SplitterPosition = 307;
this.splitMx1.TabIndex = 4;
//
@@ -1063,7 +1060,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1254, 307);
+ this.layoutMx1.Size = new System.Drawing.Size(1568, 307);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -1077,19 +1074,19 @@
//
// txt_receiveContact
//
- this.txt_receiveContact.Location = new System.Drawing.Point(1023, 171);
+ this.txt_receiveContact.Location = new System.Drawing.Point(1260, 171);
this.txt_receiveContact.Name = "txt_receiveContact";
this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
- this.txt_receiveContact.Size = new System.Drawing.Size(219, 24);
+ this.txt_receiveContact.Size = new System.Drawing.Size(296, 24);
this.txt_receiveContact.StyleController = this.layoutMx1;
this.txt_receiveContact.TabIndex = 427;
//
// txt_receiveId
//
- this.txt_receiveId.Location = new System.Drawing.Point(1023, 75);
+ this.txt_receiveId.Location = new System.Drawing.Point(1260, 75);
this.txt_receiveId.Name = "txt_receiveId";
this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
- this.txt_receiveId.Size = new System.Drawing.Size(219, 24);
+ this.txt_receiveId.Size = new System.Drawing.Size(296, 24);
this.txt_receiveId.StyleController = this.layoutMx1;
this.txt_receiveId.TabIndex = 425;
//
@@ -1113,10 +1110,10 @@
//
// txt_changerId
//
- this.txt_changerId.Location = new System.Drawing.Point(1023, 203);
+ this.txt_changerId.Location = new System.Drawing.Point(1260, 203);
this.txt_changerId.Name = "txt_changerId";
this.txt_changerId.Properties.Appearance.Options.UseFont = true;
- this.txt_changerId.Size = new System.Drawing.Size(219, 24);
+ this.txt_changerId.Size = new System.Drawing.Size(296, 24);
this.txt_changerId.StyleController = this.layoutMx1;
this.txt_changerId.TabIndex = 378;
//
@@ -1125,142 +1122,142 @@
this.txt_versionNo.Location = new System.Drawing.Point(99, 203);
this.txt_versionNo.Name = "txt_versionNo";
this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
- this.txt_versionNo.Size = new System.Drawing.Size(217, 24);
+ this.txt_versionNo.Size = new System.Drawing.Size(296, 24);
this.txt_versionNo.StyleController = this.layoutMx1;
this.txt_versionNo.TabIndex = 376;
//
// txt_cancellerId
//
- this.txt_cancellerId.Location = new System.Drawing.Point(407, 203);
+ this.txt_cancellerId.Location = new System.Drawing.Point(486, 203);
this.txt_cancellerId.Name = "txt_cancellerId";
this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
- this.txt_cancellerId.Size = new System.Drawing.Size(217, 24);
+ this.txt_cancellerId.Size = new System.Drawing.Size(296, 24);
this.txt_cancellerId.StyleController = this.layoutMx1;
this.txt_cancellerId.TabIndex = 374;
//
// txt_cancelStatusTxt
//
- this.txt_cancelStatusTxt.Location = new System.Drawing.Point(407, 235);
+ this.txt_cancelStatusTxt.Location = new System.Drawing.Point(486, 235);
this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt";
this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_cancelStatusTxt.Size = new System.Drawing.Size(217, 24);
+ this.txt_cancelStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_cancelStatusTxt.StyleController = this.layoutMx1;
this.txt_cancelStatusTxt.TabIndex = 372;
//
// txt_changeDate
//
- this.txt_changeDate.Location = new System.Drawing.Point(1023, 235);
+ this.txt_changeDate.Location = new System.Drawing.Point(1260, 235);
this.txt_changeDate.Name = "txt_changeDate";
this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
- this.txt_changeDate.Size = new System.Drawing.Size(219, 24);
+ this.txt_changeDate.Size = new System.Drawing.Size(296, 24);
this.txt_changeDate.StyleController = this.layoutMx1;
this.txt_changeDate.TabIndex = 344;
//
// txt_closeDate
//
- this.txt_closeDate.Location = new System.Drawing.Point(715, 267);
+ this.txt_closeDate.Location = new System.Drawing.Point(873, 267);
this.txt_closeDate.Name = "txt_closeDate";
this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
- this.txt_closeDate.Size = new System.Drawing.Size(217, 24);
+ this.txt_closeDate.Size = new System.Drawing.Size(296, 24);
this.txt_closeDate.StyleController = this.layoutMx1;
this.txt_closeDate.TabIndex = 342;
//
// txt_closerId
//
- this.txt_closerId.Location = new System.Drawing.Point(715, 235);
+ this.txt_closerId.Location = new System.Drawing.Point(873, 235);
this.txt_closerId.Name = "txt_closerId";
this.txt_closerId.Properties.Appearance.Options.UseFont = true;
- this.txt_closerId.Size = new System.Drawing.Size(217, 24);
+ this.txt_closerId.Size = new System.Drawing.Size(296, 24);
this.txt_closerId.StyleController = this.layoutMx1;
this.txt_closerId.TabIndex = 340;
//
// txt_approveDate
//
- this.txt_approveDate.Location = new System.Drawing.Point(407, 107);
+ this.txt_approveDate.Location = new System.Drawing.Point(486, 107);
this.txt_approveDate.Name = "txt_approveDate";
this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approveDate.Size = new System.Drawing.Size(217, 24);
+ this.txt_approveDate.Size = new System.Drawing.Size(296, 24);
this.txt_approveDate.StyleController = this.layoutMx1;
this.txt_approveDate.TabIndex = 338;
//
// txt_modifyDate
//
- this.txt_modifyDate.Location = new System.Drawing.Point(715, 171);
+ this.txt_modifyDate.Location = new System.Drawing.Point(873, 171);
this.txt_modifyDate.Name = "txt_modifyDate";
this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifyDate.Size = new System.Drawing.Size(217, 24);
+ this.txt_modifyDate.Size = new System.Drawing.Size(296, 24);
this.txt_modifyDate.StyleController = this.layoutMx1;
this.txt_modifyDate.TabIndex = 314;
//
// txt_modifierId
//
- this.txt_modifierId.Location = new System.Drawing.Point(715, 139);
+ this.txt_modifierId.Location = new System.Drawing.Point(873, 139);
this.txt_modifierId.Name = "txt_modifierId";
this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
- this.txt_modifierId.Size = new System.Drawing.Size(217, 24);
+ this.txt_modifierId.Size = new System.Drawing.Size(296, 24);
this.txt_modifierId.StyleController = this.layoutMx1;
this.txt_modifierId.TabIndex = 312;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(407, 171);
+ this.txt_createDate.Location = new System.Drawing.Point(486, 171);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(217, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(296, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 310;
//
// txt_creatorId
//
- this.txt_creatorId.Location = new System.Drawing.Point(407, 139);
+ this.txt_creatorId.Location = new System.Drawing.Point(486, 139);
this.txt_creatorId.Name = "txt_creatorId";
this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_creatorId.Size = new System.Drawing.Size(217, 24);
+ this.txt_creatorId.Size = new System.Drawing.Size(296, 24);
this.txt_creatorId.StyleController = this.layoutMx1;
this.txt_creatorId.TabIndex = 308;
//
// txt_linkPhone
//
- this.txt_linkPhone.Location = new System.Drawing.Point(1023, 139);
+ this.txt_linkPhone.Location = new System.Drawing.Point(1260, 139);
this.txt_linkPhone.Name = "txt_linkPhone";
this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
- this.txt_linkPhone.Size = new System.Drawing.Size(219, 24);
+ this.txt_linkPhone.Size = new System.Drawing.Size(296, 24);
this.txt_linkPhone.StyleController = this.layoutMx1;
this.txt_linkPhone.TabIndex = 288;
//
// txt_chargeId
//
- this.txt_chargeId.Location = new System.Drawing.Point(715, 75);
+ this.txt_chargeId.Location = new System.Drawing.Point(873, 75);
this.txt_chargeId.Name = "txt_chargeId";
this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
- this.txt_chargeId.Size = new System.Drawing.Size(217, 24);
+ this.txt_chargeId.Size = new System.Drawing.Size(296, 24);
this.txt_chargeId.StyleController = this.layoutMx1;
this.txt_chargeId.TabIndex = 286;
//
// txt_linkMan
//
- this.txt_linkMan.Location = new System.Drawing.Point(1023, 107);
+ this.txt_linkMan.Location = new System.Drawing.Point(1260, 107);
this.txt_linkMan.Name = "txt_linkMan";
this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
- this.txt_linkMan.Size = new System.Drawing.Size(219, 24);
+ this.txt_linkMan.Size = new System.Drawing.Size(296, 24);
this.txt_linkMan.StyleController = this.layoutMx1;
this.txt_linkMan.TabIndex = 284;
//
// txt_approverId
//
- this.txt_approverId.Location = new System.Drawing.Point(407, 75);
+ this.txt_approverId.Location = new System.Drawing.Point(486, 75);
this.txt_approverId.Name = "txt_approverId";
this.txt_approverId.Properties.Appearance.Options.UseFont = true;
- this.txt_approverId.Size = new System.Drawing.Size(217, 24);
+ this.txt_approverId.Size = new System.Drawing.Size(296, 24);
this.txt_approverId.StyleController = this.layoutMx1;
this.txt_approverId.TabIndex = 282;
//
// txt_settleId
//
- this.txt_settleId.Location = new System.Drawing.Point(715, 107);
+ this.txt_settleId.Location = new System.Drawing.Point(873, 107);
this.txt_settleId.Name = "txt_settleId";
this.txt_settleId.Properties.Appearance.Options.UseFont = true;
- this.txt_settleId.Size = new System.Drawing.Size(217, 24);
+ this.txt_settleId.Size = new System.Drawing.Size(296, 24);
this.txt_settleId.StyleController = this.layoutMx1;
this.txt_settleId.TabIndex = 265;
//
@@ -1269,16 +1266,16 @@
this.txt_note.Location = new System.Drawing.Point(99, 235);
this.txt_note.Name = "txt_note";
this.txt_note.Properties.Appearance.Options.UseFont = true;
- this.txt_note.Size = new System.Drawing.Size(217, 24);
+ this.txt_note.Size = new System.Drawing.Size(296, 24);
this.txt_note.StyleController = this.layoutMx1;
this.txt_note.TabIndex = 263;
//
// txt_changeReason
//
- this.txt_changeReason.Location = new System.Drawing.Point(1023, 267);
+ this.txt_changeReason.Location = new System.Drawing.Point(1260, 267);
this.txt_changeReason.Name = "txt_changeReason";
this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
- this.txt_changeReason.Size = new System.Drawing.Size(219, 24);
+ this.txt_changeReason.Size = new System.Drawing.Size(296, 24);
this.txt_changeReason.StyleController = this.layoutMx1;
this.txt_changeReason.TabIndex = 261;
//
@@ -1302,10 +1299,10 @@
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(715, 203);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(873, 203);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(217, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 247;
//
@@ -1320,55 +1317,55 @@
//
// txt_headLocId
//
- this.txt_headLocId.Location = new System.Drawing.Point(1023, 43);
+ this.txt_headLocId.Location = new System.Drawing.Point(1260, 43);
this.txt_headLocId.Name = "txt_headLocId";
this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
- this.txt_headLocId.Size = new System.Drawing.Size(219, 24);
+ this.txt_headLocId.Size = new System.Drawing.Size(296, 24);
this.txt_headLocId.StyleController = this.layoutMx1;
this.txt_headLocId.TabIndex = 243;
//
// txt_headDeliveryWay
//
- this.txt_headDeliveryWay.Location = new System.Drawing.Point(1023, 12);
+ this.txt_headDeliveryWay.Location = new System.Drawing.Point(1260, 12);
this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
- this.txt_headDeliveryWay.Size = new System.Drawing.Size(219, 24);
+ this.txt_headDeliveryWay.Size = new System.Drawing.Size(296, 24);
this.txt_headDeliveryWay.StyleController = this.layoutMx1;
this.txt_headDeliveryWay.TabIndex = 235;
//
// txt_businessTypeTxt
//
- this.txt_businessTypeTxt.Location = new System.Drawing.Point(715, 43);
+ this.txt_businessTypeTxt.Location = new System.Drawing.Point(873, 43);
this.txt_businessTypeTxt.Name = "txt_businessTypeTxt";
this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_businessTypeTxt.Size = new System.Drawing.Size(217, 24);
+ this.txt_businessTypeTxt.Size = new System.Drawing.Size(296, 24);
this.txt_businessTypeTxt.StyleController = this.layoutMx1;
this.txt_businessTypeTxt.TabIndex = 233;
//
// txt_fDate
//
- this.txt_fDate.Location = new System.Drawing.Point(407, 43);
+ this.txt_fDate.Location = new System.Drawing.Point(486, 43);
this.txt_fDate.Name = "txt_fDate";
this.txt_fDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fDate.Size = new System.Drawing.Size(217, 24);
+ this.txt_fDate.Size = new System.Drawing.Size(296, 24);
this.txt_fDate.StyleController = this.layoutMx1;
this.txt_fDate.TabIndex = 231;
//
// txt_billTypeId
//
- this.txt_billTypeId.Location = new System.Drawing.Point(715, 12);
+ this.txt_billTypeId.Location = new System.Drawing.Point(873, 12);
this.txt_billTypeId.Name = "txt_billTypeId";
this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
- this.txt_billTypeId.Size = new System.Drawing.Size(217, 24);
+ this.txt_billTypeId.Size = new System.Drawing.Size(296, 24);
this.txt_billTypeId.StyleController = this.layoutMx1;
this.txt_billTypeId.TabIndex = 219;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(407, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(486, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(217, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(296, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 216;
//
@@ -1377,7 +1374,7 @@
this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 43);
this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_documentStatusTxt.Size = new System.Drawing.Size(217, 24);
+ this.txt_documentStatusTxt.Size = new System.Drawing.Size(296, 24);
this.txt_documentStatusTxt.StyleController = this.layoutMx1;
this.txt_documentStatusTxt.TabIndex = 229;
//
@@ -1386,7 +1383,7 @@
this.txt_erpId.Location = new System.Drawing.Point(99, 12);
this.txt_erpId.Name = "txt_erpId";
this.txt_erpId.Properties.Appearance.Options.UseFont = true;
- this.txt_erpId.Size = new System.Drawing.Size(217, 24);
+ this.txt_erpId.Size = new System.Drawing.Size(296, 24);
this.txt_erpId.StyleController = this.layoutMx1;
this.txt_erpId.TabIndex = 214;
//
@@ -1404,7 +1401,7 @@
//
this.txt_xsOrgName.Location = new System.Drawing.Point(99, 107);
this.txt_xsOrgName.Name = "txt_xsOrgName";
- this.txt_xsOrgName.Size = new System.Drawing.Size(217, 24);
+ this.txt_xsOrgName.Size = new System.Drawing.Size(296, 24);
this.txt_xsOrgName.StyleController = this.layoutMx1;
this.txt_xsOrgName.TabIndex = 429;
//
@@ -1412,7 +1409,7 @@
//
this.txt_salerName.Location = new System.Drawing.Point(99, 171);
this.txt_salerName.Name = "txt_salerName";
- this.txt_salerName.Size = new System.Drawing.Size(217, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(296, 24);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 430;
//
@@ -1420,7 +1417,7 @@
//
this.txt_custName.Location = new System.Drawing.Point(99, 139);
this.txt_custName.Name = "txt_custName";
- this.txt_custName.Size = new System.Drawing.Size(217, 24);
+ this.txt_custName.Size = new System.Drawing.Size(296, 24);
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 431;
//
@@ -1428,7 +1425,7 @@
//
this.txt_saleDeptName.Location = new System.Drawing.Point(99, 75);
this.txt_saleDeptName.Name = "txt_saleDeptName";
- this.txt_saleDeptName.Size = new System.Drawing.Size(217, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(296, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 432;
//
@@ -1548,48 +1545,48 @@
this.layoutControlItem29});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.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;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.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;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1254, 307);
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18});
+ this.Root.Size = new System.Drawing.Size(1568, 307);
this.Root.TextVisible = false;
//
// layoutControlItem3
@@ -1598,40 +1595,40 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(308, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(387, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_businessTypeTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(616, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(774, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_linkPhone;
- this.layoutControlItem20.Location = new System.Drawing.Point(924, 127);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1161, 127);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1640,48 +1637,48 @@
this.layoutControlItem2.Control = this.txt_erpId;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(308, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(387, 31);
this.layoutControlItem2.Text = "ERPID";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_billNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(308, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(387, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(308, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(387, 31);
this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_billTypeId;
- this.layoutControlItem5.Location = new System.Drawing.Point(616, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(774, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(308, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(387, 31);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_headDeliveryWay;
- this.layoutControlItem8.Location = new System.Drawing.Point(924, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1161, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(310, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(387, 31);
this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_receiveContact;
- this.layoutControlItem37.Location = new System.Drawing.Point(924, 159);
+ this.layoutControlItem37.Location = new System.Drawing.Point(1161, 159);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem37.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�";
this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1691,7 +1688,7 @@
this.layoutControlItem41.Location = new System.Drawing.Point(0, 127);
this.layoutControlItem41.Name = "layoutControlItem41";
this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem41.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem41.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1701,7 +1698,7 @@
this.lab_saleDeptName.Location = new System.Drawing.Point(0, 63);
this.lab_saleDeptName.Name = "lab_saleDeptName";
this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_saleDeptName.Size = new System.Drawing.Size(308, 32);
+ this.lab_saleDeptName.Size = new System.Drawing.Size(387, 32);
this.lab_saleDeptName.Text = "閿�鍞儴闂�";
this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1711,7 +1708,7 @@
this.layoutControlItem39.Location = new System.Drawing.Point(0, 95);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem39.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem39.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem39.Text = "閿�鍞粍缁�";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1721,117 +1718,117 @@
this.layoutControlItem40.Location = new System.Drawing.Point(0, 159);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem40.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem40.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem40.Text = "閿�鍞憳鍚�";
this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_headLocId;
- this.layoutControlItem9.Location = new System.Drawing.Point(924, 31);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1161, 31);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txt_receiveId;
- this.layoutControlItem36.Location = new System.Drawing.Point(924, 63);
+ this.layoutControlItem36.Location = new System.Drawing.Point(1161, 63);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem36.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem36.Text = "鏀惰揣鏂�";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_linkMan;
- this.layoutControlItem18.Location = new System.Drawing.Point(924, 95);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1161, 95);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_chargeId;
- this.layoutControlItem19.Location = new System.Drawing.Point(616, 63);
+ this.layoutControlItem19.Location = new System.Drawing.Point(774, 63);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem19.Text = "浠樻鏂�";
this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_settleId;
- this.layoutControlItem16.Location = new System.Drawing.Point(616, 95);
+ this.layoutControlItem16.Location = new System.Drawing.Point(774, 95);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem16.Text = "缁撶畻鏂�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_modifierId;
- this.layoutControlItem23.Location = new System.Drawing.Point(616, 127);
+ this.layoutControlItem23.Location = new System.Drawing.Point(774, 127);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem23.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem23.Text = "淇敼浜哄憳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_modifyDate;
- this.layoutControlItem24.Location = new System.Drawing.Point(616, 159);
+ this.layoutControlItem24.Location = new System.Drawing.Point(774, 159);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem24.Text = "淇敼鏃ユ湡";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_closeDate;
- this.layoutControlItem27.Location = new System.Drawing.Point(616, 255);
+ this.layoutControlItem27.Location = new System.Drawing.Point(774, 255);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem27.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem27.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_closerId;
- this.layoutControlItem26.Location = new System.Drawing.Point(616, 223);
+ this.layoutControlItem26.Location = new System.Drawing.Point(774, 223);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem26.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_closeStatusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(616, 191);
+ this.layoutControlItem11.Location = new System.Drawing.Point(774, 191);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem11.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1841,42 +1838,118 @@
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(308, 32);
+ this.layoutControlItem31.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem31.Text = "鐗堟湰鍙�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_changerId;
- this.layoutControlItem32.Location = new System.Drawing.Point(924, 191);
+ this.layoutControlItem32.Location = new System.Drawing.Point(1161, 191);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem32.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem32.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem32.Text = "鍙樻洿浜哄憳";
this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_changeDate;
- this.layoutControlItem28.Location = new System.Drawing.Point(924, 223);
+ this.layoutControlItem28.Location = new System.Drawing.Point(1161, 223);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem28.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem28.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_changeReason;
- this.layoutControlItem14.Location = new System.Drawing.Point(924, 255);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1161, 255);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem14.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(387, 32);
this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_note;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 223);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem15.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_approverId;
+ this.layoutControlItem17.Location = new System.Drawing.Point(387, 63);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_approveDate;
+ this.layoutControlItem25.Location = new System.Drawing.Point(387, 95);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem25.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_creatorId;
+ this.layoutControlItem21.Location = new System.Drawing.Point(387, 127);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem21.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_createDate;
+ this.layoutControlItem22.Location = new System.Drawing.Point(387, 159);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem22.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txt_cancellerId;
+ this.layoutControlItem30.Location = new System.Drawing.Point(387, 191);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem30.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem30.Text = "浣滃簾浜哄憳";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
+ this.layoutControlItem29.Location = new System.Drawing.Point(387, 223);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem29.Size = new System.Drawing.Size(387, 32);
+ this.layoutControlItem29.Text = "浣滃簾鐘舵��";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -1884,7 +1957,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1254, 251);
+ this.tabMx.Size = new System.Drawing.Size(1568, 251);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1893,7 +1966,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1252, 219);
+ this.tabMxPage1.Size = new System.Drawing.Size(1566, 219);
this.tabMxPage1.Text = "閿�鍞槑缁�";
//
// gcMx1
@@ -1902,7 +1975,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1252, 219);
+ this.gcMx1.Size = new System.Drawing.Size(1566, 219);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1944,9 +2017,6 @@
this.gvMx1custIno,
this.gvMx1custInm,
this.gvMx1custImd,
- this.gvMx1mapId,
- this.gvMx1mapName,
- this.gvMx1mapSpec,
this.gvMx1supplyOrgId,
this.gvMx1stockOrgId,
this.gvMx1settleOrgIds,
@@ -2039,7 +2109,7 @@
this.gvMx1qty.Name = "gvMx1qty";
this.gvMx1qty.Tag = "query_a.qty";
this.gvMx1qty.Visible = true;
- this.gvMx1qty.VisibleIndex = 2;
+ this.gvMx1qty.VisibleIndex = 5;
this.gvMx1qty.Width = 94;
//
// gvMx1priceUnitId
@@ -2061,7 +2131,7 @@
this.gvMx1priceUnitQty.Name = "gvMx1priceUnitQty";
this.gvMx1priceUnitQty.Tag = "query_a.price_unit_qty";
this.gvMx1priceUnitQty.Visible = true;
- this.gvMx1priceUnitQty.VisibleIndex = 3;
+ this.gvMx1priceUnitQty.VisibleIndex = 6;
this.gvMx1priceUnitQty.Width = 94;
//
// gvMx1deliveryDate
@@ -2073,7 +2143,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 4;
+ this.gvMx1deliveryDate.VisibleIndex = 7;
this.gvMx1deliveryDate.Width = 94;
//
// gvMx1isFree
@@ -2085,7 +2155,7 @@
this.gvMx1isFree.Name = "gvMx1isFree";
this.gvMx1isFree.Tag = "query_a.is_free";
this.gvMx1isFree.Visible = true;
- this.gvMx1isFree.VisibleIndex = 5;
+ this.gvMx1isFree.VisibleIndex = 8;
this.gvMx1isFree.Width = 94;
//
// gvMx1ownerTypeId
@@ -2097,7 +2167,7 @@
this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
this.gvMx1ownerTypeId.Visible = true;
- this.gvMx1ownerTypeId.VisibleIndex = 6;
+ this.gvMx1ownerTypeId.VisibleIndex = 9;
this.gvMx1ownerTypeId.Width = 94;
//
// gvMx1ownerId
@@ -2109,7 +2179,7 @@
this.gvMx1ownerId.Name = "gvMx1ownerId";
this.gvMx1ownerId.Tag = "query_a.owner_id";
this.gvMx1ownerId.Visible = true;
- this.gvMx1ownerId.VisibleIndex = 7;
+ this.gvMx1ownerId.VisibleIndex = 10;
this.gvMx1ownerId.Width = 94;
//
// gvMx1entryNote
@@ -2121,7 +2191,7 @@
this.gvMx1entryNote.Name = "gvMx1entryNote";
this.gvMx1entryNote.Tag = "query_a.entry_note";
this.gvMx1entryNote.Visible = true;
- this.gvMx1entryNote.VisibleIndex = 8;
+ this.gvMx1entryNote.VisibleIndex = 11;
this.gvMx1entryNote.Width = 94;
//
// gvMx1mtoNo
@@ -2133,7 +2203,7 @@
this.gvMx1mtoNo.Name = "gvMx1mtoNo";
this.gvMx1mtoNo.Tag = "query_a.mto_no";
this.gvMx1mtoNo.Visible = true;
- this.gvMx1mtoNo.VisibleIndex = 9;
+ this.gvMx1mtoNo.VisibleIndex = 12;
this.gvMx1mtoNo.Width = 94;
//
// gvMx1lot
@@ -2145,7 +2215,7 @@
this.gvMx1lot.Name = "gvMx1lot";
this.gvMx1lot.Tag = "query_a.lot";
this.gvMx1lot.Visible = true;
- this.gvMx1lot.VisibleIndex = 10;
+ this.gvMx1lot.VisibleIndex = 13;
this.gvMx1lot.Width = 94;
//
// gvMx1deliveryMaxQty
@@ -2157,7 +2227,7 @@
this.gvMx1deliveryMaxQty.Name = "gvMx1deliveryMaxQty";
this.gvMx1deliveryMaxQty.Tag = "query_a.delivery_max_qty";
this.gvMx1deliveryMaxQty.Visible = true;
- this.gvMx1deliveryMaxQty.VisibleIndex = 11;
+ this.gvMx1deliveryMaxQty.VisibleIndex = 14;
this.gvMx1deliveryMaxQty.Width = 94;
//
// gvMx1deliveryMinQty
@@ -2169,7 +2239,7 @@
this.gvMx1deliveryMinQty.Name = "gvMx1deliveryMinQty";
this.gvMx1deliveryMinQty.Tag = "query_a.delivery_min_qty";
this.gvMx1deliveryMinQty.Visible = true;
- this.gvMx1deliveryMinQty.VisibleIndex = 12;
+ this.gvMx1deliveryMinQty.VisibleIndex = 15;
this.gvMx1deliveryMinQty.Width = 94;
//
// gvMx1outLmtUnitId
@@ -2186,24 +2256,24 @@
//
this.gvMx1mrpCloseStatus.AppearanceCell.Options.UseFont = true;
this.gvMx1mrpCloseStatus.Caption = "涓氬姟鍏抽棴 ";
- this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatus";
+ this.gvMx1mrpCloseStatus.FieldName = "mrpCloseStatusTxt";
this.gvMx1mrpCloseStatus.MinWidth = 50;
this.gvMx1mrpCloseStatus.Name = "gvMx1mrpCloseStatus";
this.gvMx1mrpCloseStatus.Tag = "query_a.mrp_close_status";
this.gvMx1mrpCloseStatus.Visible = true;
- this.gvMx1mrpCloseStatus.VisibleIndex = 13;
+ this.gvMx1mrpCloseStatus.VisibleIndex = 16;
this.gvMx1mrpCloseStatus.Width = 94;
//
// gvMx1mrpTerminateStatus
//
this.gvMx1mrpTerminateStatus.AppearanceCell.Options.UseFont = true;
this.gvMx1mrpTerminateStatus.Caption = "涓氬姟缁堟 ";
- this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatus";
+ this.gvMx1mrpTerminateStatus.FieldName = "mrpTerminateStatusTxt";
this.gvMx1mrpTerminateStatus.MinWidth = 50;
this.gvMx1mrpTerminateStatus.Name = "gvMx1mrpTerminateStatus";
this.gvMx1mrpTerminateStatus.Tag = "query_a.mrp_terminate_status";
this.gvMx1mrpTerminateStatus.Visible = true;
- this.gvMx1mrpTerminateStatus.VisibleIndex = 14;
+ this.gvMx1mrpTerminateStatus.VisibleIndex = 17;
this.gvMx1mrpTerminateStatus.Width = 94;
//
// gvMx1terminateDate
@@ -2215,7 +2285,7 @@
this.gvMx1terminateDate.Name = "gvMx1terminateDate";
this.gvMx1terminateDate.Tag = "query_a.terminate_date";
this.gvMx1terminateDate.Visible = true;
- this.gvMx1terminateDate.VisibleIndex = 15;
+ this.gvMx1terminateDate.VisibleIndex = 18;
this.gvMx1terminateDate.Width = 94;
//
// gvMx1terminaterId
@@ -2227,7 +2297,7 @@
this.gvMx1terminaterId.Name = "gvMx1terminaterId";
this.gvMx1terminaterId.Tag = "query_a.terminater_id";
this.gvMx1terminaterId.Visible = true;
- this.gvMx1terminaterId.VisibleIndex = 16;
+ this.gvMx1terminaterId.VisibleIndex = 19;
this.gvMx1terminaterId.Width = 94;
//
// gvMx1srcType
@@ -2239,7 +2309,7 @@
this.gvMx1srcType.Name = "gvMx1srcType";
this.gvMx1srcType.Tag = "query_a.src_type";
this.gvMx1srcType.Visible = true;
- this.gvMx1srcType.VisibleIndex = 17;
+ this.gvMx1srcType.VisibleIndex = 20;
this.gvMx1srcType.Width = 94;
//
// gvMx1srcBillNo
@@ -2251,7 +2321,7 @@
this.gvMx1srcBillNo.Name = "gvMx1srcBillNo";
this.gvMx1srcBillNo.Tag = "query_a.src_bill_no";
this.gvMx1srcBillNo.Visible = true;
- this.gvMx1srcBillNo.VisibleIndex = 18;
+ this.gvMx1srcBillNo.VisibleIndex = 21;
this.gvMx1srcBillNo.Width = 94;
//
// gvMx1deliQty
@@ -2263,7 +2333,7 @@
this.gvMx1deliQty.Name = "gvMx1deliQty";
this.gvMx1deliQty.Tag = "query_a.deli_qty";
this.gvMx1deliQty.Visible = true;
- this.gvMx1deliQty.VisibleIndex = 19;
+ this.gvMx1deliQty.VisibleIndex = 22;
this.gvMx1deliQty.Width = 94;
//
// gvMx1stockOutQty
@@ -2275,7 +2345,7 @@
this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
this.gvMx1stockOutQty.Visible = true;
- this.gvMx1stockOutQty.VisibleIndex = 20;
+ this.gvMx1stockOutQty.VisibleIndex = 23;
this.gvMx1stockOutQty.Width = 94;
//
// gvMx1baseRetNoticeQty
@@ -2287,7 +2357,7 @@
this.gvMx1baseRetNoticeQty.Name = "gvMx1baseRetNoticeQty";
this.gvMx1baseRetNoticeQty.Tag = "query_a.base_ret_notice_qty";
this.gvMx1baseRetNoticeQty.Visible = true;
- this.gvMx1baseRetNoticeQty.VisibleIndex = 21;
+ this.gvMx1baseRetNoticeQty.VisibleIndex = 24;
this.gvMx1baseRetNoticeQty.Width = 94;
//
// gvMx1baseReturnQty
@@ -2299,7 +2369,7 @@
this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
this.gvMx1baseReturnQty.Visible = true;
- this.gvMx1baseReturnQty.VisibleIndex = 22;
+ this.gvMx1baseReturnQty.VisibleIndex = 25;
this.gvMx1baseReturnQty.Width = 94;
//
// gvMx1baseRemainOutQty
@@ -2311,7 +2381,7 @@
this.gvMx1baseRemainOutQty.Name = "gvMx1baseRemainOutQty";
this.gvMx1baseRemainOutQty.Tag = "query_a.base_remain_out_qty";
this.gvMx1baseRemainOutQty.Visible = true;
- this.gvMx1baseRemainOutQty.VisibleIndex = 23;
+ this.gvMx1baseRemainOutQty.VisibleIndex = 26;
this.gvMx1baseRemainOutQty.Width = 94;
//
// gvMx1basearqty
@@ -2323,7 +2393,7 @@
this.gvMx1basearqty.Name = "gvMx1basearqty";
this.gvMx1basearqty.Tag = "query_a.basearqty";
this.gvMx1basearqty.Visible = true;
- this.gvMx1basearqty.VisibleIndex = 24;
+ this.gvMx1basearqty.VisibleIndex = 27;
this.gvMx1basearqty.Width = 94;
//
// gvMx1custIno
@@ -2334,8 +2404,6 @@
this.gvMx1custIno.MinWidth = 50;
this.gvMx1custIno.Name = "gvMx1custIno";
this.gvMx1custIno.Tag = "query_a.cust_ino";
- this.gvMx1custIno.Visible = true;
- this.gvMx1custIno.VisibleIndex = 25;
this.gvMx1custIno.Width = 94;
//
// gvMx1custInm
@@ -2346,8 +2414,6 @@
this.gvMx1custInm.MinWidth = 50;
this.gvMx1custInm.Name = "gvMx1custInm";
this.gvMx1custInm.Tag = "query_a.cust_inm";
- this.gvMx1custInm.Visible = true;
- this.gvMx1custInm.VisibleIndex = 26;
this.gvMx1custInm.Width = 94;
//
// gvMx1custImd
@@ -2358,45 +2424,7 @@
this.gvMx1custImd.MinWidth = 50;
this.gvMx1custImd.Name = "gvMx1custImd";
this.gvMx1custImd.Tag = "query_a.cust_imd";
- this.gvMx1custImd.Visible = true;
- this.gvMx1custImd.VisibleIndex = 27;
this.gvMx1custImd.Width = 94;
- //
- // gvMx1mapId
- //
- this.gvMx1mapId.AppearanceCell.Options.UseFont = true;
- this.gvMx1mapId.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
- this.gvMx1mapId.FieldName = "mapId";
- this.gvMx1mapId.MinWidth = 50;
- this.gvMx1mapId.Name = "gvMx1mapId";
- this.gvMx1mapId.Tag = "query_a.MAP_ID";
- this.gvMx1mapId.Visible = true;
- this.gvMx1mapId.VisibleIndex = 28;
- this.gvMx1mapId.Width = 94;
- //
- // gvMx1mapName
- //
- this.gvMx1mapName.AppearanceCell.Options.UseFont = true;
- this.gvMx1mapName.Caption = "瀹㈡埛鐗╂枡鍚嶇О ";
- this.gvMx1mapName.FieldName = "mapName";
- this.gvMx1mapName.MinWidth = 50;
- this.gvMx1mapName.Name = "gvMx1mapName";
- this.gvMx1mapName.Tag = "query_a.MAP_NAME";
- this.gvMx1mapName.Visible = true;
- this.gvMx1mapName.VisibleIndex = 29;
- this.gvMx1mapName.Width = 94;
- //
- // gvMx1mapSpec
- //
- this.gvMx1mapSpec.AppearanceCell.Options.UseFont = true;
- this.gvMx1mapSpec.Caption = "瀹㈡埛鐗╂枡瑙勬牸 ";
- this.gvMx1mapSpec.FieldName = "mapSpec";
- this.gvMx1mapSpec.MinWidth = 50;
- this.gvMx1mapSpec.Name = "gvMx1mapSpec";
- this.gvMx1mapSpec.Tag = "query_a.MAP_SPEC";
- this.gvMx1mapSpec.Visible = true;
- this.gvMx1mapSpec.VisibleIndex = 30;
- this.gvMx1mapSpec.Width = 94;
//
// gvMx1supplyOrgId
//
@@ -2441,11 +2469,11 @@
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡缂栫爜";
- this.gridColumn5.FieldName = "itemName";
+ this.gridColumn5.FieldName = "itemNo";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 31;
+ this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -2455,7 +2483,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 32;
+ this.gridColumn6.VisibleIndex = 3;
this.gridColumn6.Width = 94;
//
// gridColumn7
@@ -2465,7 +2493,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 33;
+ this.gridColumn7.VisibleIndex = 4;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -2475,7 +2503,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 34;
+ this.gridColumn8.VisibleIndex = 28;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -2485,7 +2513,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 35;
+ this.gridColumn9.VisibleIndex = 29;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -2495,7 +2523,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 36;
+ this.gridColumn10.VisibleIndex = 30;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -2505,7 +2533,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 37;
+ this.gridColumn11.VisibleIndex = 31;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -2515,7 +2543,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 38;
+ this.gridColumn12.VisibleIndex = 32;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -2525,7 +2553,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 39;
+ this.gridColumn13.VisibleIndex = 33;
this.gridColumn13.Width = 94;
//
// picCheckBox
@@ -2539,87 +2567,11 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_note;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 223);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem15.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_approverId;
- this.layoutControlItem17.Location = new System.Drawing.Point(308, 63);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_approveDate;
- this.layoutControlItem25.Location = new System.Drawing.Point(308, 95);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_creatorId;
- this.layoutControlItem21.Location = new System.Drawing.Point(308, 127);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_createDate;
- this.layoutControlItem22.Location = new System.Drawing.Point(308, 159);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem30
- //
- this.layoutControlItem30.Control = this.txt_cancellerId;
- this.layoutControlItem30.Location = new System.Drawing.Point(308, 191);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem30.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem30.Text = "浣滃簾浜哄憳";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem29
- //
- this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
- this.layoutControlItem29.Location = new System.Drawing.Point(308, 223);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem29.Size = new System.Drawing.Size(308, 32);
- this.layoutControlItem29.Text = "浣滃簾鐘舵��";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
- //
// Frm_SalesOrder
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1256, 682);
+ this.ClientSize = new System.Drawing.Size(1570, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -2719,12 +2671,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
@@ -2732,6 +2678,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -2778,9 +2730,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custIno;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custInm;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1custImd;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1mapSpec;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1seq;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyOrgId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOrgId;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
index 3cc243a..cc6b945 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
@@ -31,11 +31,11 @@
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -46,23 +46,22 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
-
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(234, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(234, 24);
this.lookSearchSupplier.TabIndex = 12;
//
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn5,
- this.gridColumn2,
this.gridColumn8,
- this.gridColumn3,
- this.gridColumn1,
- this.gridColumn7});
+ this.gridColumn4,
+ this.gridColumn7,
+ this.gridColumn2,
+ this.gridColumn3});
this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -76,13 +75,29 @@
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 0;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瀹㈡埛缂栧彿";
+ this.gridColumn4.FieldName = "cusNo";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 2;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "瀹㈡埛鍚嶇О";
+ this.gridColumn7.FieldName = "custName";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ //
// gridColumn2
//
- this.gridColumn2.Caption = "鍗曟嵁绫诲瀷";
- this.gridColumn2.FieldName = "billTypeId";
+ this.gridColumn2.Caption = "浜よ揣鏂瑰紡";
+ this.gridColumn2.FieldName = "headDeliveryWayTxt";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 4;
//
// gridColumn8
//
@@ -90,7 +105,7 @@
this.gridColumn8.FieldName = "documentStatusTxt";
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 2;
+ this.gridColumn8.VisibleIndex = 1;
//
// gridColumn3
//
@@ -99,24 +114,8 @@
this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 100;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鏀惰揣鏂�";
- this.gridColumn1.FieldName = "receiveId";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "瀹㈡埛鍚嶇О";
- this.gridColumn7.FieldName = "custName";
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 5;
//
// UcLookSales
//
@@ -139,7 +138,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index 9ad1124..747e0a6 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -32,14 +32,14 @@
/// <summary>
/// 璇诲彇閿�鍞鍗�
/// </summary>
- /// <param name="orgId"></param>
- /// <param name="_dftVale"></param>
+ /// <param name="orgId">閿�鍞粍缁�</param>
+ /// <param name="_dftVale">榛樿鍊�</param>
public void getSuppler(string orgId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
string _keyWhere = "";
if (!string.IsNullOrEmpty(orgId))
- _keyWhere = " and a.erp_sczz ='" + orgId + "'";
+ _keyWhere = " and a.SALE_ORG_ID ='" + orgId + "'";
var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "",
" and 1=1" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3