From ce5738884e2830f2e299670f6a2c5bc821f5c9e2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 28 十月 2025 08:14:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 653 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 346 insertions(+), 307 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 4cab475..8adf5b2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -30,25 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 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.RowDefinition rowDefinition10 = 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = 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.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -84,10 +84,10 @@
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_fApproverID = new DevExpress.XtraEditors.TextEdit();
+ this.txt_shUserName1 = new DevExpress.XtraEditors.TextEdit();
this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
this.txt_fSaleOrgIdTxt = new DevExpress.XtraEditors.TextEdit();
- this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_cjUserName3 = new DevExpress.XtraEditors.TextEdit();
this.txt_fApproveDate = new DevExpress.XtraEditors.TextEdit();
this.txt_fNote = new DevExpress.XtraEditors.TextEdit();
this.txt_fSalesManIDTxt = new DevExpress.XtraEditors.TextEdit();
@@ -96,7 +96,7 @@
this.txt_shf = new DevExpress.XtraEditors.TextEdit();
this.txt_shName = new DevExpress.XtraEditors.TextEdit();
this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_cwUserName2 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
this.txt_SaleOrgId = new DevExpress.XtraEditors.TextEdit();
@@ -186,9 +186,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjUserName3.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManIDTxt.Properties)).BeginInit();
@@ -197,7 +197,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cwUserName2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_SaleOrgId.Properties)).BeginInit();
@@ -245,9 +245,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1362, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1702, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -255,10 +256,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1362, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1702, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -267,8 +269,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1360, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1700, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -277,6 +280,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -289,17 +293,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1360, 570);
+ this.split1.Size = new System.Drawing.Size(1700, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1360, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1700, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -327,8 +333,9 @@
this.gridColumn38,
this.gridColumn39,
this.gridColumn40});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -339,235 +346,236 @@
this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
this.gv_fApproverStaus.Caption = "鍒跺崟瀹℃牳";
this.gv_fApproverStaus.FieldName = "chkStatus";
- this.gv_fApproverStaus.MinWidth = 50;
+ this.gv_fApproverStaus.MinWidth = 62;
this.gv_fApproverStaus.Name = "gv_fApproverStaus";
this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
this.gv_fApproverStaus.Tag = "query_a.FApproverStaus";
this.gv_fApproverStaus.Visible = true;
this.gv_fApproverStaus.VisibleIndex = 0;
- this.gv_fApproverStaus.Width = 94;
+ this.gv_fApproverStaus.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
this.gridColumn2.FieldName = "txtColor";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鐢宠鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 62;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 94;
+ this.gv_billNo.Width = 117;
//
// gv_fBillTypeID
//
this.gv_fBillTypeID.AppearanceCell.Options.UseFont = true;
this.gv_fBillTypeID.Caption = "鍗曟嵁绫诲瀷 ";
this.gv_fBillTypeID.FieldName = "fBillTypeID";
- this.gv_fBillTypeID.MinWidth = 50;
+ this.gv_fBillTypeID.MinWidth = 62;
this.gv_fBillTypeID.Name = "gv_fBillTypeID";
this.gv_fBillTypeID.OptionsColumn.AllowEdit = false;
this.gv_fBillTypeID.Tag = "query_a.FBillTypeID";
this.gv_fBillTypeID.Visible = true;
this.gv_fBillTypeID.VisibleIndex = 14;
- this.gv_fBillTypeID.Width = 94;
+ this.gv_fBillTypeID.Width = 117;
//
// gv_fSaleOrgId
//
this.gv_fSaleOrgId.AppearanceCell.Options.UseFont = true;
this.gv_fSaleOrgId.Caption = "閿�鍞粍缁� ";
this.gv_fSaleOrgId.FieldName = "xszzName";
- this.gv_fSaleOrgId.MinWidth = 50;
+ this.gv_fSaleOrgId.MinWidth = 62;
this.gv_fSaleOrgId.Name = "gv_fSaleOrgId";
this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId";
this.gv_fSaleOrgId.Visible = true;
this.gv_fSaleOrgId.VisibleIndex = 15;
- this.gv_fSaleOrgId.Width = 94;
+ this.gv_fSaleOrgId.Width = 117;
//
// gv_fCreatorId
//
this.gv_fCreatorId.AppearanceCell.Options.UseFont = true;
this.gv_fCreatorId.Caption = "鍒涘缓浜� ";
this.gv_fCreatorId.FieldName = "cjPeople";
- this.gv_fCreatorId.MinWidth = 50;
+ this.gv_fCreatorId.MinWidth = 62;
this.gv_fCreatorId.Name = "gv_fCreatorId";
this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
this.gv_fCreatorId.Tag = "query_a.FCreatorId";
this.gv_fCreatorId.Visible = true;
this.gv_fCreatorId.VisibleIndex = 7;
- this.gv_fCreatorId.Width = 94;
+ this.gv_fCreatorId.Width = 117;
//
// gv_fApproverID
//
this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
this.gv_fApproverID.Caption = "瀹℃牳浜�";
this.gv_fApproverID.FieldName = "shPeople";
- this.gv_fApproverID.MinWidth = 50;
+ this.gv_fApproverID.MinWidth = 62;
this.gv_fApproverID.Name = "gv_fApproverID";
this.gv_fApproverID.OptionsColumn.AllowEdit = false;
this.gv_fApproverID.Tag = "query_a.FApproverID";
this.gv_fApproverID.Visible = true;
this.gv_fApproverID.VisibleIndex = 9;
- this.gv_fApproverID.Width = 94;
+ this.gv_fApproverID.Width = 117;
//
// gv_fCreateDate
//
this.gv_fCreateDate.AppearanceCell.Options.UseFont = true;
this.gv_fCreateDate.Caption = "鍒涘缓鏃ユ湡 ";
this.gv_fCreateDate.FieldName = "fCreateDate";
- this.gv_fCreateDate.MinWidth = 50;
+ this.gv_fCreateDate.MinWidth = 62;
this.gv_fCreateDate.Name = "gv_fCreateDate";
this.gv_fCreateDate.OptionsColumn.AllowEdit = false;
this.gv_fCreateDate.Tag = "query_a.FCreateDate";
this.gv_fCreateDate.Visible = true;
this.gv_fCreateDate.VisibleIndex = 8;
- this.gv_fCreateDate.Width = 94;
+ this.gv_fCreateDate.Width = 117;
//
// gv_fApproveDate
//
this.gv_fApproveDate.AppearanceCell.Options.UseFont = true;
this.gv_fApproveDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_fApproveDate.FieldName = "fApproveDate";
- this.gv_fApproveDate.MinWidth = 50;
+ this.gv_fApproveDate.MinWidth = 62;
this.gv_fApproveDate.Name = "gv_fApproveDate";
this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
this.gv_fApproveDate.Tag = "query_a.FApproveDate";
this.gv_fApproveDate.Visible = true;
this.gv_fApproveDate.VisibleIndex = 10;
- this.gv_fApproveDate.Width = 94;
+ this.gv_fApproveDate.Width = 117;
//
// gv_fSalesManID
//
this.gv_fSalesManID.AppearanceCell.Options.UseFont = true;
this.gv_fSalesManID.Caption = "閿�鍞憳ID";
this.gv_fSalesManID.FieldName = "fSalesManID";
- this.gv_fSalesManID.MinWidth = 50;
+ this.gv_fSalesManID.MinWidth = 62;
this.gv_fSalesManID.Name = "gv_fSalesManID";
this.gv_fSalesManID.OptionsColumn.AllowEdit = false;
this.gv_fSalesManID.Tag = "query_a.FSalesManID";
- this.gv_fSalesManID.Width = 94;
+ this.gv_fSalesManID.Width = 117;
//
// gv_fCustomerID
//
this.gv_fCustomerID.AppearanceCell.Options.UseFont = true;
this.gv_fCustomerID.Caption = "瀹㈡埛ID";
this.gv_fCustomerID.FieldName = "fCustomerID";
- this.gv_fCustomerID.MinWidth = 50;
+ this.gv_fCustomerID.MinWidth = 62;
this.gv_fCustomerID.Name = "gv_fCustomerID";
this.gv_fCustomerID.OptionsColumn.AllowEdit = false;
this.gv_fCustomerID.Tag = "query_a.FCustomerID";
- this.gv_fCustomerID.Width = 94;
+ this.gv_fCustomerID.Width = 117;
//
// gv_fNote
//
this.gv_fNote.AppearanceCell.Options.UseFont = true;
this.gv_fNote.Caption = "澶囨敞 ";
this.gv_fNote.FieldName = "fNote";
- this.gv_fNote.MinWidth = 50;
+ this.gv_fNote.MinWidth = 62;
this.gv_fNote.Name = "gv_fNote";
this.gv_fNote.OptionsColumn.AllowEdit = false;
this.gv_fNote.Tag = "query_a.FNote";
this.gv_fNote.Visible = true;
this.gv_fNote.VisibleIndex = 11;
- this.gv_fNote.Width = 94;
+ this.gv_fNote.Width = 117;
//
// gridColumn33
//
this.gridColumn33.Caption = "閿�鍞憳鍚�";
this.gridColumn33.FieldName = "xsyName";
- this.gridColumn33.MinWidth = 25;
+ this.gridColumn33.MinWidth = 31;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Visible = true;
this.gridColumn33.VisibleIndex = 6;
- this.gridColumn33.Width = 94;
+ this.gridColumn33.Width = 117;
//
// gridColumn34
//
this.gridColumn34.Caption = "瀹㈡埛鍚嶇О";
this.gridColumn34.FieldName = "khName";
- this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.MinWidth = 31;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 5;
- this.gridColumn34.Width = 94;
+ this.gridColumn34.Width = 117;
//
// gridColumn35
//
this.gridColumn35.Caption = "閿�鍞崟鍙�";
this.gridColumn35.FieldName = "xsNo";
- this.gridColumn35.MinWidth = 25;
+ this.gridColumn35.MinWidth = 31;
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 4;
- this.gridColumn35.Width = 94;
+ this.gridColumn35.Width = 117;
//
// gridColumn36
//
this.gridColumn36.Caption = "涓婚敭Guid";
this.gridColumn36.FieldName = "guid";
- this.gridColumn36.MinWidth = 25;
+ this.gridColumn36.MinWidth = 31;
this.gridColumn36.Name = "gridColumn36";
- this.gridColumn36.Width = 94;
+ this.gridColumn36.Width = 117;
//
// gridColumn38
//
this.gridColumn38.Caption = "璐㈠姟瀹℃牳";
this.gridColumn38.FieldName = "isCwChk";
- this.gridColumn38.MinWidth = 25;
+ this.gridColumn38.MinWidth = 31;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 1;
- this.gridColumn38.Width = 94;
+ this.gridColumn38.Width = 117;
//
// gridColumn39
//
this.gridColumn39.Caption = "璐㈠姟瀹℃牳浜�";
this.gridColumn39.FieldName = "cwPeople";
- this.gridColumn39.MinWidth = 25;
+ this.gridColumn39.MinWidth = 31;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
this.gridColumn39.VisibleIndex = 12;
- this.gridColumn39.Width = 94;
+ this.gridColumn39.Width = 117;
//
// gridColumn40
//
this.gridColumn40.Caption = "璐㈠姟瀹℃牳鏃ユ湡";
this.gridColumn40.FieldName = "qt030";
- this.gridColumn40.MinWidth = 25;
+ this.gridColumn40.MinWidth = 31;
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 13;
- this.gridColumn40.Width = 94;
+ this.gridColumn40.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1360, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1700, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1360, 570);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1700, 698);
this.xtraTabPage3.Text = "鏁版嵁璇︾粏";
//
// splitContainerControl1
@@ -575,6 +583,7 @@
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Horizontal = false;
this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
@@ -586,8 +595,8 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.tabMx);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1360, 570);
- this.splitContainerControl1.SplitterPosition = 174;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1700, 698);
+ this.splitContainerControl1.SplitterPosition = 213;
this.splitContainerControl1.TabIndex = 0;
//
// layoutMx1
@@ -598,10 +607,10 @@
this.layoutMx1.Controls.Add(this.txt_id);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_fBillTypeID);
- this.layoutMx1.Controls.Add(this.txt_fApproverID);
+ this.layoutMx1.Controls.Add(this.txt_shUserName1);
this.layoutMx1.Controls.Add(this.txt_salesId);
this.layoutMx1.Controls.Add(this.txt_fSaleOrgIdTxt);
- this.layoutMx1.Controls.Add(this.txt_fCreatorId);
+ this.layoutMx1.Controls.Add(this.txt_cjUserName3);
this.layoutMx1.Controls.Add(this.txt_fApproveDate);
this.layoutMx1.Controls.Add(this.txt_fNote);
this.layoutMx1.Controls.Add(this.txt_fSalesManIDTxt);
@@ -610,7 +619,7 @@
this.layoutMx1.Controls.Add(this.txt_shf);
this.layoutMx1.Controls.Add(this.txt_shName);
this.layoutMx1.Controls.Add(this.txt_wjStatus);
- this.layoutMx1.Controls.Add(this.txt_qt031);
+ this.layoutMx1.Controls.Add(this.txt_cwUserName2);
this.layoutMx1.Controls.Add(this.txt_qt030);
this.layoutMx1.Controls.Add(this.txt_qt029);
this.layoutMx1.Controls.Add(this.txt_SaleOrgId);
@@ -621,57 +630,63 @@
this.layoutControlItem12,
this.layoutControlItem22});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
this.layoutMx1.Root = this.layoutControlGroup1;
- this.layoutMx1.Size = new System.Drawing.Size(1360, 174);
+ this.layoutMx1.Size = new System.Drawing.Size(1700, 213);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(14, 166);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.Size = new System.Drawing.Size(146, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 444;
this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 138);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 169);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 39);
+ this.lbGuid.Size = new System.Drawing.Size(342, 48);
this.lbGuid.TabIndex = 377;
this.lbGuid.Text = "lbGuid";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(682, 74);
+ this.txt_chkStatus.Location = new System.Drawing.Point(838, 90);
+ this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(408, 27);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 376;
this.txt_chkStatus.Tag = "readonly";
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(927, 218);
+ this.txt_id.Location = new System.Drawing.Point(1159, 266);
+ this.txt_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(187, 24);
+ this.txt_id.Size = new System.Drawing.Size(234, 28);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 211;
this.txt_id.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(137, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(285, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -679,168 +694,185 @@
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 43);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(137, 52);
+ this.txt_fBillTypeID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(285, 28);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 362;
//
- // txt_fApproverID
+ // txt_shUserName1
//
- this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
- this.txt_fApproverID.Name = "txt_fApproverID";
- this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
- this.txt_fApproverID.StyleController = this.layoutMx1;
- this.txt_fApproverID.TabIndex = 222;
- this.txt_fApproverID.Tag = "readonly";
+ this.txt_shUserName1.Location = new System.Drawing.Point(961, 14);
+ this.txt_shUserName1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_shUserName1.Name = "txt_shUserName1";
+ this.txt_shUserName1.Properties.Appearance.Options.UseFont = true;
+ this.txt_shUserName1.Size = new System.Drawing.Size(285, 28);
+ this.txt_shUserName1.StyleController = this.layoutMx1;
+ this.txt_shUserName1.TabIndex = 222;
+ this.txt_shUserName1.Tag = "readonly";
//
// txt_salesId
//
this.txt_salesId.IsReadly = false;
- this.txt_salesId.Location = new System.Drawing.Point(114, 74);
+ this.txt_salesId.Location = new System.Drawing.Point(137, 90);
+ this.txt_salesId.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_salesId.Name = "txt_salesId";
- this.txt_salesId.Size = new System.Drawing.Size(229, 24);
+ this.txt_salesId.Size = new System.Drawing.Size(285, 28);
this.txt_salesId.TabIndex = 367;
//
// txt_fSaleOrgIdTxt
//
- this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
+ this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(549, 14);
+ this.txt_fSaleOrgIdTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(285, 28);
this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
this.txt_fSaleOrgIdTxt.TabIndex = 365;
this.txt_fSaleOrgIdTxt.Tag = "readonly";
//
- // txt_fCreatorId
+ // txt_cjUserName3
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 105);
- this.txt_fCreatorId.Name = "txt_fCreatorId";
- this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
- this.txt_fCreatorId.StyleController = this.layoutMx1;
- this.txt_fCreatorId.TabIndex = 219;
- this.txt_fCreatorId.Tag = "readonly";
+ this.txt_cjUserName3.Location = new System.Drawing.Point(1373, 128);
+ this.txt_cjUserName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_cjUserName3.Name = "txt_cjUserName3";
+ this.txt_cjUserName3.Properties.Appearance.Options.UseFont = true;
+ this.txt_cjUserName3.Size = new System.Drawing.Size(287, 28);
+ this.txt_cjUserName3.StyleController = this.layoutMx1;
+ this.txt_cjUserName3.TabIndex = 219;
+ this.txt_cjUserName3.Tag = "readonly";
//
// txt_fApproveDate
//
- this.txt_fApproveDate.Location = new System.Drawing.Point(784, 43);
+ this.txt_fApproveDate.Location = new System.Drawing.Point(961, 52);
+ this.txt_fApproveDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fApproveDate.Name = "txt_fApproveDate";
this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_fApproveDate.Size = new System.Drawing.Size(285, 28);
this.txt_fApproveDate.StyleController = this.layoutMx1;
this.txt_fApproveDate.TabIndex = 228;
this.txt_fApproveDate.Tag = "readonly";
//
// txt_fNote
//
- this.txt_fNote.Location = new System.Drawing.Point(114, 105);
+ this.txt_fNote.Location = new System.Drawing.Point(137, 128);
+ this.txt_fNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(229, 24);
+ this.txt_fNote.Size = new System.Drawing.Size(285, 28);
this.txt_fNote.StyleController = this.layoutMx1;
this.txt_fNote.TabIndex = 243;
//
// txt_fSalesManIDTxt
//
- this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 105);
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(961, 128);
+ this.txt_fSalesManIDTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(285, 28);
this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
this.txt_fSalesManIDTxt.TabIndex = 231;
this.txt_fSalesManIDTxt.Tag = "readonly";
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 136);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(1373, 166);
+ this.txt_fCreateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(287, 28);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 226;
this.txt_fCreateDate.Tag = "readonly";
//
// txt_fCustomerIDTxt
//
- this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 43);
+ this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(549, 52);
+ this.txt_fCustomerIDTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(285, 28);
this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
this.txt_fCustomerIDTxt.TabIndex = 368;
this.txt_fCustomerIDTxt.Tag = "readonly";
//
// txt_shf
//
- this.txt_shf.Location = new System.Drawing.Point(449, 74);
+ this.txt_shf.Location = new System.Drawing.Point(549, 90);
+ this.txt_shf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_shf.Name = "txt_shf";
- this.txt_shf.Size = new System.Drawing.Size(229, 24);
+ this.txt_shf.Size = new System.Drawing.Size(285, 28);
this.txt_shf.StyleController = this.layoutMx1;
this.txt_shf.TabIndex = 373;
this.txt_shf.Tag = "readonly";
//
// txt_shName
//
- this.txt_shName.Location = new System.Drawing.Point(449, 105);
+ this.txt_shName.Location = new System.Drawing.Point(549, 128);
+ this.txt_shName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_shName.Name = "txt_shName";
- this.txt_shName.Size = new System.Drawing.Size(229, 24);
+ this.txt_shName.Size = new System.Drawing.Size(285, 28);
this.txt_shName.StyleController = this.layoutMx1;
this.txt_shName.TabIndex = 374;
this.txt_shName.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(1017, 104);
+ this.txt_wjStatus.Location = new System.Drawing.Point(1271, 127);
+ this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��";
- this.txt_wjStatus.Size = new System.Drawing.Size(331, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(414, 27);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 372;
this.txt_wjStatus.Tag = "readonly";
//
- // txt_qt031
+ // txt_cwUserName2
//
- this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
- this.txt_qt031.Name = "txt_qt031";
- this.txt_qt031.Properties.ReadOnly = true;
- this.txt_qt031.Size = new System.Drawing.Size(229, 24);
- this.txt_qt031.StyleController = this.layoutMx1;
- this.txt_qt031.TabIndex = 378;
- this.txt_qt031.Tag = "readonly";
+ this.txt_cwUserName2.Location = new System.Drawing.Point(1373, 14);
+ this.txt_cwUserName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_cwUserName2.Name = "txt_cwUserName2";
+ this.txt_cwUserName2.Properties.ReadOnly = true;
+ this.txt_cwUserName2.Size = new System.Drawing.Size(287, 28);
+ this.txt_cwUserName2.StyleController = this.layoutMx1;
+ this.txt_cwUserName2.TabIndex = 378;
+ this.txt_cwUserName2.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(1119, 43);
+ this.txt_qt030.Location = new System.Drawing.Point(1373, 52);
+ this.txt_qt030.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt030.Name = "txt_qt030";
this.txt_qt030.Properties.ReadOnly = true;
- this.txt_qt030.Size = new System.Drawing.Size(229, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(287, 28);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 379;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(1017, 74);
+ this.txt_qt029.Location = new System.Drawing.Point(1250, 90);
+ this.txt_qt029.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
this.txt_qt029.Properties.ReadOnly = true;
- this.txt_qt029.Size = new System.Drawing.Size(331, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(410, 27);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 380;
this.txt_qt029.Tag = "readonly";
//
// txt_SaleOrgId
//
- this.txt_SaleOrgId.Location = new System.Drawing.Point(443, 136);
+ this.txt_SaleOrgId.Location = new System.Drawing.Point(554, 166);
+ this.txt_SaleOrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_SaleOrgId.Name = "txt_SaleOrgId";
- this.txt_SaleOrgId.Size = new System.Drawing.Size(224, 24);
+ this.txt_SaleOrgId.Size = new System.Drawing.Size(280, 28);
this.txt_SaleOrgId.StyleController = this.layoutMx1;
this.txt_SaleOrgId.TabIndex = 445;
this.txt_SaleOrgId.Tag = "readonly";
@@ -856,7 +888,7 @@
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem1.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem1.Text = "涓婚敭GUID";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(94, 22);
//
// layoutControlItem16
//
@@ -893,7 +925,7 @@
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(112, 22);
//
// layoutControlGroup1
//
@@ -920,36 +952,36 @@
this.layoutControlItem21});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
+ 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[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- 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;
- rowDefinition10.Height = 100D;
- rowDefinition10.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;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 175);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1674, 214);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem13
@@ -957,196 +989,196 @@
this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(412, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(412, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem5.Text = "閿�鍞粍缁�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_shf;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(335, 62);
+ this.layoutControlItem14.Location = new System.Drawing.Point(412, 76);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem14.Text = "鏀惰揣鏂�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fNote;
this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞";
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 114);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem8.Text = "鐢宠澶囨敞";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_salesId;
this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem4.CustomizationFormText = "閿�鍞鍗�";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem4.Text = "閿�鍞鍗�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
- this.layoutControlItem10.Control = this.txt_fApproverID;
+ this.layoutControlItem10.Control = this.txt_shUserName1;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
- this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(824, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_fApproveDate;
this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
- this.layoutControlItem11.Location = new System.Drawing.Point(670, 31);
+ this.layoutControlItem11.Location = new System.Drawing.Point(824, 38);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_chkStatus;
- this.layoutControlItem15.Location = new System.Drawing.Point(670, 62);
+ this.layoutControlItem15.Location = new System.Drawing.Point(824, 76);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
// layoutControlItem18
//
- this.layoutControlItem18.Control = this.txt_qt031;
- this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
+ this.layoutControlItem18.Control = this.txt_cwUserName2;
+ this.layoutControlItem18.Location = new System.Drawing.Point(1236, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(414, 38);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt030;
- this.layoutControlItem19.Location = new System.Drawing.Point(1005, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1236, 38);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(414, 38);
this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt029;
- this.layoutControlItem20.Location = new System.Drawing.Point(1005, 62);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1236, 76);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(414, 38);
this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem20.TextVisible = false;
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_fCreatorId;
+ this.layoutControlItem6.Control = this.txt_cjUserName3;
this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
- this.layoutControlItem6.Location = new System.Drawing.Point(1005, 93);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1236, 114);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(414, 38);
this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fCreateDate;
this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.Location = new System.Drawing.Point(1005, 124);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1236, 152);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(414, 38);
this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_shName;
this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.Location = new System.Drawing.Point(335, 93);
+ this.layoutControlItem17.Location = new System.Drawing.Point(412, 114);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(670, 93);
+ this.layoutControlItem9.Location = new System.Drawing.Point(824, 114);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem9.Text = "閿�鍞汉鍛�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fBillTypeID;
this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
@@ -1155,20 +1187,20 @@
this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem2.Text = "鐢宠缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.btnSelect;
this.layoutControlItem21.CustomizationFormText = "閫夋嫨鐗╂枡";
- this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 152);
+ this.layoutControlItem21.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem21.MinSize = new System.Drawing.Size(119, 38);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1177,9 +1209,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1360, 384);
+ this.tabMx.Size = new System.Drawing.Size(1700, 470);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1187,21 +1220,24 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1358, 352);
+ this.tabMxPage1.Size = new System.Drawing.Size(1698, 432);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemDateEdit1,
this.rptCk});
- this.gcMx1.Size = new System.Drawing.Size(1358, 352);
+ this.gcMx1.Size = new System.Drawing.Size(1698, 432);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1240,6 +1276,7 @@
this.gridColumn1,
this.gridColumn3,
this.gridColumn4});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1255,12 +1292,12 @@
this.gvMx1fMustQty.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fMustQty.Caption = "鐢宠鏁伴噺 ";
this.gvMx1fMustQty.FieldName = "fMustQty";
- this.gvMx1fMustQty.MinWidth = 50;
+ this.gvMx1fMustQty.MinWidth = 62;
this.gvMx1fMustQty.Name = "gvMx1fMustQty";
this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
this.gvMx1fMustQty.Visible = true;
this.gvMx1fMustQty.VisibleIndex = 2;
- this.gvMx1fMustQty.Width = 94;
+ this.gvMx1fMustQty.Width = 117;
//
// gridColumn11
//
@@ -1271,12 +1308,12 @@
this.gridColumn11.Caption = "棰勮鍙戣揣鏃堕棿";
this.gridColumn11.ColumnEdit = this.repositoryItemDateEdit1;
this.gridColumn11.FieldName = "yjfhDate";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 5;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// repositoryItemDateEdit1
//
@@ -1296,250 +1333,250 @@
this.gvMx1fEntrynote.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fEntrynote.Caption = "澶囨敞 ";
this.gvMx1fEntrynote.FieldName = "fEntrynote";
- this.gvMx1fEntrynote.MinWidth = 50;
+ this.gvMx1fEntrynote.MinWidth = 62;
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
this.gvMx1fEntrynote.VisibleIndex = 6;
- this.gvMx1fEntrynote.Width = 94;
+ this.gvMx1fEntrynote.Width = 117;
//
// gvMx1fRealQty
//
this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fRealQty.Caption = "鏈瀹炲彂鏁伴噺 ";
this.gvMx1fRealQty.FieldName = "fRealQty";
- this.gvMx1fRealQty.MinWidth = 50;
+ this.gvMx1fRealQty.MinWidth = 62;
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
this.gvMx1fRealQty.VisibleIndex = 7;
- this.gvMx1fRealQty.Width = 94;
+ this.gvMx1fRealQty.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "閿�鍞鍗曞彿";
this.gridColumn12.FieldName = "billNo";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 8;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "鐗╂枡缂栫爜";
this.gridColumn13.FieldName = "itemNo";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
this.gridColumn14.FieldName = "itemName";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 1;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "鐗╂枡瑙勬牸";
this.gridColumn15.FieldName = "itemModel";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 17;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "閿�鍞崟浣�";
this.gridColumn16.FieldName = "dwXs";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 9;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "閿�鍞暟閲�";
this.gridColumn17.FieldName = "xsSl";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 10;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "璁′环鍗曚綅";
this.gridColumn18.FieldName = "dwJj";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "璁′环鏁伴噺";
this.gridColumn19.FieldName = "jjSl";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 11;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "瑕佽揣鏃ユ湡";
this.gridColumn20.FieldName = "deliveryDate";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 14;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鏄惁璧犲搧";
this.gridColumn21.FieldName = "isFree";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 15;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "璐т富绫诲瀷";
this.gridColumn22.FieldName = "hzlx";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "璐т富";
this.gridColumn23.FieldName = "hz";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "閿�鍞娉�";
this.gridColumn24.FieldName = "xxbz";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 16;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "鍙戣揣涓婇檺";
this.gridColumn25.FieldName = "fhsx";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 12;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "鍙戣揣涓嬮檺";
this.gridColumn26.FieldName = "fhxx";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 13;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "渚涘簲缁勭粐";
this.gridColumn27.FieldName = "gyOrg";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "搴撳瓨缁勭粐";
this.gridColumn28.FieldName = "kcOrg";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Width = 94;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "缁撶畻缁勭粐";
this.gridColumn29.FieldName = "jsOrg";
- this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
- this.gridColumn29.Width = 94;
+ this.gridColumn29.Width = 117;
//
// gvMx1id
//
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "涓婚敭 ";
this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
+ this.gvMx1id.MinWidth = 62;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Width = 94;
+ this.gvMx1id.Width = 117;
//
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
this.gvMx1pid.Caption = "涓昏〃guid ";
this.gvMx1pid.FieldName = "pid";
- this.gvMx1pid.MinWidth = 50;
+ this.gvMx1pid.MinWidth = 62;
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Width = 94;
+ this.gvMx1pid.Width = 117;
//
// gvMx1salesDetailId
//
this.gvMx1salesDetailId.AppearanceCell.Options.UseFont = true;
this.gvMx1salesDetailId.Caption = "SALES_ORDER_DETAIL鐨凣uid ";
this.gvMx1salesDetailId.FieldName = "salesDetailId";
- this.gvMx1salesDetailId.MinWidth = 50;
+ this.gvMx1salesDetailId.MinWidth = 62;
this.gvMx1salesDetailId.Name = "gvMx1salesDetailId";
this.gvMx1salesDetailId.Tag = "query_a.SalesDetailId";
- this.gvMx1salesDetailId.Width = 94;
+ this.gvMx1salesDetailId.Width = 117;
//
// gvMx1fseq
//
this.gvMx1fseq.AppearanceCell.Options.UseFont = true;
this.gvMx1fseq.Caption = "鎺掑簭 ";
this.gvMx1fseq.FieldName = "fseq";
- this.gvMx1fseq.MinWidth = 50;
+ this.gvMx1fseq.MinWidth = 62;
this.gvMx1fseq.Name = "gvMx1fseq";
this.gvMx1fseq.Tag = "query_a.FSEQ";
- this.gvMx1fseq.Width = 94;
+ this.gvMx1fseq.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 18;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.Width = 117;
//
// 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);
@@ -1548,9 +1585,9 @@
//
this.gridColumn37.Caption = "鐗╂枡ID";
this.gridColumn37.FieldName = "itemId";
- this.gridColumn37.MinWidth = 25;
+ this.gridColumn37.MinWidth = 31;
this.gridColumn37.Name = "gridColumn37";
- this.gridColumn37.Width = 94;
+ this.gridColumn37.Width = 117;
//
// gridColumn1
//
@@ -1560,11 +1597,11 @@
this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn1.Caption = "Mes/Erp搴撳瓨";
this.gridColumn1.FieldName = "kcQty";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn3
//
@@ -1575,18 +1612,18 @@
this.gridColumn3.Caption = "閫夋嫨浠撳簱";
this.gridColumn3.ColumnEdit = this.rptCk;
this.gridColumn3.FieldName = "depotName";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1594,16 +1631,17 @@
//
this.gridColumn4.Caption = "浠撳簱ID";
this.gridColumn4.FieldName = "depotId";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(970, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1212, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
@@ -1611,12 +1649,13 @@
//
// Frm_SalesDeliver
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1362, 682);
+ this.ClientSize = new System.Drawing.Size(1702, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_SalesDeliver";
this.Text = "閿�鍞嚭搴撶敵璇峰崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1642,9 +1681,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjUserName3.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManIDTxt.Properties)).EndInit();
@@ -1653,7 +1692,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cwUserName2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_SaleOrgId.Properties)).EndInit();
@@ -1757,10 +1796,10 @@
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
- private DevExpress.XtraEditors.TextEdit txt_fApproverID;
+ private DevExpress.XtraEditors.TextEdit txt_shUserName1;
private UserControl.UcLookSales txt_salesId;
private DevExpress.XtraEditors.TextEdit txt_fSaleOrgIdTxt;
- private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
+ private DevExpress.XtraEditors.TextEdit txt_cjUserName3;
private DevExpress.XtraEditors.TextEdit txt_fApproveDate;
private DevExpress.XtraEditors.TextEdit txt_fNote;
private DevExpress.XtraEditors.TextEdit txt_fSalesManIDTxt;
@@ -1782,7 +1821,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
- private DevExpress.XtraEditors.TextEdit txt_qt031;
+ private DevExpress.XtraEditors.TextEdit txt_cwUserName2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.TextEdit txt_qt030;
private DevExpress.XtraEditors.CheckEdit txt_qt029;
--
Gitblit v1.9.3