From 337d942a0b32356ad06e5a66f82b8498959b89d7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 28 三月 2025 10:08:27 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 3
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 180 ++++++---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 760 +++++++++++++++++++++---------------------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 132 +++---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 1
6 files changed, 563 insertions(+), 515 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 6765d3b..b4da196 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -291,6 +291,8 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_fApproverStaus,
+ this.gridColumn2,
this.gv_id,
this.gv_billNo,
this.gv_fBillTypeID,
@@ -303,8 +305,6 @@
this.gv_fCustomerID,
this.gv_fDate,
this.gv_fNote,
- this.gv_fApproverStaus,
- this.gridColumn2,
this.gridColumn33,
this.gridColumn34,
this.gridColumn35});
@@ -338,7 +338,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 0;
+ this.gv_billNo.VisibleIndex = 2;
this.gv_billNo.Width = 94;
//
// gv_fBillTypeID
@@ -352,7 +352,7 @@
this.gv_fBillTypeID.OptionsColumn.AllowEdit = false;
this.gv_fBillTypeID.Tag = "query_a.FBillTypeID";
this.gv_fBillTypeID.Visible = true;
- this.gv_fBillTypeID.VisibleIndex = 1;
+ this.gv_fBillTypeID.VisibleIndex = 3;
this.gv_fBillTypeID.Width = 94;
//
// gv_fSaleOrgId
@@ -366,7 +366,7 @@
this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId";
this.gv_fSaleOrgId.Visible = true;
- this.gv_fSaleOrgId.VisibleIndex = 2;
+ this.gv_fSaleOrgId.VisibleIndex = 4;
this.gv_fSaleOrgId.Width = 94;
//
// gv_fCreatorId
@@ -380,7 +380,7 @@
this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
this.gv_fCreatorId.Tag = "query_a.FCreatorId";
this.gv_fCreatorId.Visible = true;
- this.gv_fCreatorId.VisibleIndex = 3;
+ this.gv_fCreatorId.VisibleIndex = 5;
this.gv_fCreatorId.Width = 94;
//
// gv_fApproverID
@@ -394,7 +394,7 @@
this.gv_fApproverID.OptionsColumn.AllowEdit = false;
this.gv_fApproverID.Tag = "query_a.FApproverID";
this.gv_fApproverID.Visible = true;
- this.gv_fApproverID.VisibleIndex = 4;
+ this.gv_fApproverID.VisibleIndex = 6;
this.gv_fApproverID.Width = 94;
//
// gv_fCreateDate
@@ -408,7 +408,7 @@
this.gv_fCreateDate.OptionsColumn.AllowEdit = false;
this.gv_fCreateDate.Tag = "query_a.FCreateDate";
this.gv_fCreateDate.Visible = true;
- this.gv_fCreateDate.VisibleIndex = 5;
+ this.gv_fCreateDate.VisibleIndex = 7;
this.gv_fCreateDate.Width = 94;
//
// gv_fApproveDate
@@ -422,7 +422,7 @@
this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
this.gv_fApproveDate.Tag = "query_a.FApproveDate";
this.gv_fApproveDate.Visible = true;
- this.gv_fApproveDate.VisibleIndex = 6;
+ this.gv_fApproveDate.VisibleIndex = 8;
this.gv_fApproveDate.Width = 94;
//
// gv_fSalesManID
@@ -460,7 +460,7 @@
this.gv_fDate.OptionsColumn.AllowEdit = false;
this.gv_fDate.Tag = "query_a.FDate";
this.gv_fDate.Visible = true;
- this.gv_fDate.VisibleIndex = 7;
+ this.gv_fDate.VisibleIndex = 9;
this.gv_fDate.Width = 94;
//
// gv_fNote
@@ -474,7 +474,7 @@
this.gv_fNote.OptionsColumn.AllowEdit = false;
this.gv_fNote.Tag = "query_a.FNote";
this.gv_fNote.Visible = true;
- this.gv_fNote.VisibleIndex = 8;
+ this.gv_fNote.VisibleIndex = 10;
this.gv_fNote.Width = 94;
//
// gv_fApproverStaus
@@ -488,7 +488,7 @@
this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
this.gv_fApproverStaus.Tag = "query_a.FApproverStaus";
this.gv_fApproverStaus.Visible = true;
- this.gv_fApproverStaus.VisibleIndex = 9;
+ this.gv_fApproverStaus.VisibleIndex = 0;
this.gv_fApproverStaus.Width = 94;
//
// gridColumn2
@@ -498,7 +498,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
//
// gridColumn33
@@ -611,10 +611,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(825, 76);
+ this.txt_chkStatus.Location = new System.Drawing.Point(840, 76);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 376;
this.txt_chkStatus.Tag = "readonly";
@@ -636,7 +636,7 @@
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(180, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(185, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -651,17 +651,17 @@
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(180, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(185, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 362;
//
// txt_fApproverID
//
- this.txt_fApproverID.Location = new System.Drawing.Point(912, 12);
+ this.txt_fApproverID.Location = new System.Drawing.Point(927, 12);
this.txt_fApproverID.Name = "txt_fApproverID";
this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverID.Size = new System.Drawing.Size(181, 28);
+ this.txt_fApproverID.Size = new System.Drawing.Size(187, 28);
this.txt_fApproverID.StyleController = this.layoutMx1;
this.txt_fApproverID.TabIndex = 222;
this.txt_fApproverID.Tag = "readonly";
@@ -671,38 +671,38 @@
this.txt_salesId.IsReadly = false;
this.txt_salesId.Location = new System.Drawing.Point(99, 76);
this.txt_salesId.Name = "txt_salesId";
- this.txt_salesId.Size = new System.Drawing.Size(180, 28);
+ this.txt_salesId.Size = new System.Drawing.Size(185, 28);
this.txt_salesId.TabIndex = 367;
//
// txt_fSaleOrgIdTxt
//
- this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(370, 12);
+ this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 12);
this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
this.txt_fSaleOrgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(180, 28);
+ this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(185, 28);
this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
this.txt_fSaleOrgIdTxt.TabIndex = 365;
this.txt_fSaleOrgIdTxt.Tag = "readonly";
//
// txt_fCreatorId
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(641, 12);
+ this.txt_fCreatorId.Location = new System.Drawing.Point(651, 12);
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(180, 28);
+ this.txt_fCreatorId.Size = new System.Drawing.Size(185, 28);
this.txt_fCreatorId.StyleController = this.layoutMx1;
this.txt_fCreatorId.TabIndex = 219;
this.txt_fCreatorId.Tag = "readonly";
//
// txt_fApproveDate
//
- this.txt_fApproveDate.Location = new System.Drawing.Point(912, 44);
+ this.txt_fApproveDate.Location = new System.Drawing.Point(927, 44);
this.txt_fApproveDate.Name = "txt_fApproveDate";
this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproveDate.Size = new System.Drawing.Size(181, 28);
+ this.txt_fApproveDate.Size = new System.Drawing.Size(187, 28);
this.txt_fApproveDate.StyleController = this.layoutMx1;
this.txt_fApproveDate.TabIndex = 228;
this.txt_fApproveDate.Tag = "readonly";
@@ -713,67 +713,67 @@
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(451, 28);
+ this.txt_fNote.Size = new System.Drawing.Size(461, 28);
this.txt_fNote.StyleController = this.layoutMx1;
this.txt_fNote.TabIndex = 243;
//
// txt_fSalesManIDTxt
//
- this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(641, 76);
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(651, 76);
this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
this.txt_fSalesManIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(180, 28);
+ this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(185, 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(641, 44);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(651, 44);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(180, 28);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(185, 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(370, 44);
+ this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(375, 44);
this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
this.txt_fCustomerIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(180, 28);
+ this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(185, 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(370, 76);
+ this.txt_shf.Location = new System.Drawing.Point(375, 76);
this.txt_shf.Name = "txt_shf";
- this.txt_shf.Size = new System.Drawing.Size(180, 24);
+ this.txt_shf.Size = new System.Drawing.Size(185, 24);
this.txt_shf.StyleController = this.layoutMx1;
this.txt_shf.TabIndex = 373;
this.txt_shf.Tag = "readonly";
//
// txt_shName
//
- this.txt_shName.Location = new System.Drawing.Point(641, 108);
+ this.txt_shName.Location = new System.Drawing.Point(651, 108);
this.txt_shName.Name = "txt_shName";
- this.txt_shName.Size = new System.Drawing.Size(180, 24);
+ this.txt_shName.Size = new System.Drawing.Size(185, 24);
this.txt_shName.StyleController = this.layoutMx1;
this.txt_shName.TabIndex = 374;
this.txt_shName.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(825, 108);
+ this.txt_wjStatus.Location = new System.Drawing.Point(840, 108);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��";
- this.txt_wjStatus.Size = new System.Drawing.Size(268, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(274, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 372;
this.txt_wjStatus.Tag = "readonly";
@@ -851,7 +851,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1105, 148);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 148);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem17
@@ -859,11 +859,11 @@
this.layoutControlItem17.Control = this.txt_shName;
this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem17.Location = new System.Drawing.Point(552, 96);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
@@ -874,7 +874,7 @@
this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem2.Text = "鐢宠缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
@@ -883,10 +883,10 @@
this.layoutControlItem10.Control = this.txt_fApproverID;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem10.Text = "瀹℃牳浜�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
@@ -895,22 +895,22 @@
this.layoutControlItem11.Control = this.txt_fApproveDate;
this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem11.Location = new System.Drawing.Point(828, 32);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_chkStatus;
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 64);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -920,10 +920,10 @@
this.layoutControlItem6.Control = this.txt_fCreatorId;
this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
- this.layoutControlItem6.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem6.Text = "鍒涘缓浜�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
@@ -932,11 +932,11 @@
this.layoutControlItem7.Control = this.txt_fCreateDate;
this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
@@ -945,11 +945,11 @@
this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
- this.layoutControlItem13.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 32);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
@@ -958,11 +958,11 @@
this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(552, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem9.Text = "閿�鍞憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
@@ -971,10 +971,10 @@
this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem5.Text = "閿�鍞粍缁�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
@@ -983,11 +983,11 @@
this.layoutControlItem14.Control = this.txt_shf;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 64);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem14.Text = "鏀惰揣鏂�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1000,7 +1000,7 @@
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(552, 32);
this.layoutControlItem8.Text = "鐢宠澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1012,7 +1012,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem4.Text = "閿�鍞鍗�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1024,7 +1024,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1033,11 +1033,11 @@
this.layoutControlItem12.Control = this.txt_wjStatus;
this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem12.Location = new System.Drawing.Point(828, 96);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(278, 32);
this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index e0321aa..f502791 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -76,7 +76,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -414,6 +414,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index f1439f0..8513e6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -30,15 +30,15 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -61,6 +61,7 @@
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -82,6 +83,8 @@
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();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,7 +102,7 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -163,6 +166,8 @@
((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();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -180,7 +185,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -196,6 +201,7 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -243,7 +249,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 570);
- this.split1.SplitterPosition = 263;
+ this.split1.SplitterPosition = 558;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -253,7 +259,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 224);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -281,7 +287,8 @@
this.gv_remark,
this.gv_reason,
this.gridColumn1,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -405,7 +412,7 @@
//
this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_receiver.AppearanceCell.Options.UseFont = true;
- this.gv_receiver.Caption = "鍑哄簱缂栧彿";
+ this.gv_receiver.Caption = "浠撳簱缂栧彿";
this.gv_receiver.FieldName = "ckNo";
this.gv_receiver.MinWidth = 25;
this.gv_receiver.Name = "gv_receiver";
@@ -419,7 +426,7 @@
//
this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "鍑哄簱鍚嶇О";
+ this.gv_outPart.Caption = "浠撳簱鍚嶇О";
this.gv_outPart.FieldName = "ckName";
this.gv_outPart.MinWidth = 25;
this.gv_outPart.Name = "gv_outPart";
@@ -462,7 +469,7 @@
this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
+ this.gv_remark.FieldName = "sqRemark";
this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -505,11 +512,19 @@
this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 94;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婚敭Guid";
+ this.gridColumn7.FieldName = "guid";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 224);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -541,7 +556,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 161;
+ this.splitMx1.SplitterPosition = 171;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -563,20 +578,23 @@
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);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem17});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(764, 426, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 161);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 171);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 140);
+ this.lbGuid.Location = new System.Drawing.Point(840, 154);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 28);
+ this.lbGuid.Size = new System.Drawing.Size(274, 32);
this.lbGuid.TabIndex = 591;
this.lbGuid.Text = "lbGuid";
//
@@ -739,6 +757,26 @@
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 590;
//
+ // txt_sqRemark
+ //
+ this.txt_sqRemark.Location = new System.Drawing.Point(84, 140);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Size = new System.Drawing.Size(476, 24);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 592;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(828, 142);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -760,38 +798,38 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem17});
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.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.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition26.Height = 100D;
- rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition27.Height = 100D;
- rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition28.Height = 100D;
- rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition29.Height = 100D;
- rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition30.Height = 100D;
- rowDefinition30.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.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition26,
- rowDefinition27,
- rowDefinition28,
- rowDefinition29,
- rowDefinition30});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1126, 180);
this.Root.TextVisible = false;
//
@@ -964,17 +1002,16 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
- // layoutControlItem17
+ // layoutControlItem18
//
- this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(828, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem17.Text = "lbGuid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem18.Control = this.txt_sqRemark;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(552, 32);
+ this.layoutControlItem18.Text = "澶囨敞鍘熷洜";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -982,7 +1019,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(1126, 397);
+ this.tabMx.Size = new System.Drawing.Size(1126, 387);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -992,7 +1029,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
@@ -1001,13 +1038,15 @@
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(1124, 365);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 355);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1workNo,
@@ -1133,7 +1172,7 @@
this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
- this.gvMx1remark.FieldName = "remark";
+ this.gvMx1remark.FieldName = "sqRemark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
@@ -1165,7 +1204,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1174,13 +1213,15 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 365);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 355);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2itemBarcode,
this.gvMx2itemNo,
@@ -1364,6 +1405,8 @@
((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();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1381,7 +1424,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1484,5 +1527,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ 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 1d4d5f8..d5241bf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -230,6 +230,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -247,6 +248,7 @@
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 827d037..f239231 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -29,19 +29,19 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition45 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -135,16 +135,18 @@
this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
this.txt_custName = new DevExpress.XtraEditors.TextEdit();
this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -159,13 +161,29 @@
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1seq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1erpId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -201,7 +219,6 @@
this.gvMx1mapId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1mapName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1mapSpec = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1seq = 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();
@@ -216,23 +233,6 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -293,16 +293,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -317,14 +319,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).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.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -342,6 +336,12 @@
((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).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
@@ -928,8 +928,6 @@
this.gv_fbilltype.Name = "gv_fbilltype";
this.gv_fbilltype.OptionsColumn.AllowEdit = false;
this.gv_fbilltype.Tag = "query_a.fbilltype";
- this.gv_fbilltype.Visible = true;
- this.gv_fbilltype.VisibleIndex = 29;
this.gv_fbilltype.Width = 94;
//
// gv_saleOrgId
@@ -955,7 +953,7 @@
this.gv_receiveId.OptionsColumn.AllowEdit = false;
this.gv_receiveId.Tag = "query_a.RECEIVE_ID";
this.gv_receiveId.Visible = true;
- this.gv_receiveId.VisibleIndex = 30;
+ this.gv_receiveId.VisibleIndex = 29;
this.gv_receiveId.Width = 94;
//
// gv_receiveContact
@@ -969,7 +967,7 @@
this.gv_receiveContact.OptionsColumn.AllowEdit = false;
this.gv_receiveContact.Tag = "query_a.RECEIVE_CONTACT";
this.gv_receiveContact.Visible = true;
- this.gv_receiveContact.VisibleIndex = 31;
+ this.gv_receiveContact.VisibleIndex = 30;
this.gv_receiveContact.Width = 94;
//
// gridColumn1
@@ -979,7 +977,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 32;
+ this.gridColumn1.VisibleIndex = 31;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -989,7 +987,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 33;
+ this.gridColumn2.VisibleIndex = 32;
this.gridColumn2.Width = 94;
//
// gridColumn3
@@ -999,7 +997,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 34;
+ this.gridColumn3.VisibleIndex = 33;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -1009,7 +1007,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 35;
+ this.gridColumn4.VisibleIndex = 34;
this.gridColumn4.Width = 94;
//
// pageBar1
@@ -1522,6 +1520,70 @@
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 432;
//
+ // layoutControlItem38
+ //
+ this.layoutControlItem38.Control = this.lbGuid;
+ this.layoutControlItem38.Location = new System.Drawing.Point(271, 288);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem38.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem38.Text = "lbGuid";
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem38.TextVisible = false;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_custId;
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem10.Text = "瀹㈡埛ID";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_id;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem1.Text = "涓婚敭GUID";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_saleDeptId;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "閿�鍞儴闂↖D";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_salerId;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem13.Text = "閿�鍞憳ID";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_saleOrgId;
+ this.layoutControlItem35.Location = new System.Drawing.Point(542, 256);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem35.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem35.Text = "閿�鍞粍缁嘔D";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(95, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1565,58 +1627,49 @@
this.layoutControlItem40});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.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.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- rowDefinition37.Height = 100D;
- rowDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition38.Height = 100D;
- rowDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition39.Height = 100D;
- rowDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition40.Height = 100D;
- rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition41.Height = 100D;
- rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition42.Height = 100D;
- rowDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition43.Height = 100D;
- rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition44.Height = 100D;
- rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition45.Height = 100D;
- rowDefinition45.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;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition37,
- rowDefinition38,
- rowDefinition39,
- rowDefinition40,
- rowDefinition41,
- rowDefinition42,
- rowDefinition43,
- rowDefinition44,
- rowDefinition45});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
this.Root.Size = new System.Drawing.Size(1105, 308);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_id;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem1.Text = "涓婚敭GUID";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem3
//
@@ -1660,17 +1713,6 @@
this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_custId;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem10.Text = "瀹㈡埛ID";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_closeStatus;
@@ -1681,27 +1723,6 @@
this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_saleDeptId;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "閿�鍞儴闂↖D";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_salerId;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem13.Text = "閿�鍞憳ID";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem15
//
@@ -1853,28 +1874,185 @@
this.layoutControlItem34.Text = "fbilltype ";
this.layoutControlItem34.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem35
+ // layoutControlItem2
//
- this.layoutControlItem35.Control = this.txt_saleOrgId;
- this.layoutControlItem35.Location = new System.Drawing.Point(542, 256);
- this.layoutControlItem35.Name = "layoutControlItem35";
- this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem35.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem35.Text = "閿�鍞粍缁嘔D";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(95, 18);
+ 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(271, 32);
+ this.layoutControlItem2.Text = "ERPID";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem38
+ // layoutControlItem4
//
- this.layoutControlItem38.Control = this.lbGuid;
- this.layoutControlItem38.Location = new System.Drawing.Point(271, 288);
- this.layoutControlItem38.Name = "layoutControlItem38";
- this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 9;
- this.layoutControlItem38.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem38.Text = "lbGuid";
- this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem38.TextVisible = false;
+ this.layoutControlItem4.Control = this.txt_billNo;
+ this.layoutControlItem4.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_billTypeId;
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_headDeliveryWay;
+ this.layoutControlItem8.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_settleId;
+ this.layoutControlItem16.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem16.Text = "缁撶畻鏂�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_chargeId;
+ this.layoutControlItem19.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem19.Text = "浠樻鏂�";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txt_receiveId;
+ this.layoutControlItem36.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem36.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem36.Text = "鏀惰揣鏂�";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_changeReason;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.txt_modifyDate;
+ this.layoutControlItem24.Location = new System.Drawing.Point(542, 256);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem24.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem24.Text = "鏈�鍚庝慨鏀规棩鏈� ";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_changeDate;
+ this.layoutControlItem28.Location = new System.Drawing.Point(813, 256);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem28.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txt_receiveContact;
+ this.layoutControlItem37.Location = new System.Drawing.Point(813, 160);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem37.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem37.Text = "鏀惰揣鏂硅仈绯讳汉";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_linkMan;
+ this.layoutControlItem18.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_approverId;
+ this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem17.Text = "瀹℃牳浜� ";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem41
+ //
+ this.layoutControlItem41.Control = this.txt_custName;
+ this.layoutControlItem41.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem41.Name = "layoutControlItem41";
+ this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem41.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
+ this.layoutControlItem41.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // lab_saleDeptName
+ //
+ this.lab_saleDeptName.Control = this.txt_saleDeptName;
+ this.lab_saleDeptName.Location = new System.Drawing.Point(271, 96);
+ this.lab_saleDeptName.Name = "lab_saleDeptName";
+ this.lab_saleDeptName.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_saleDeptName.Size = new System.Drawing.Size(271, 32);
+ this.lab_saleDeptName.Text = "閿�鍞儴闂ㄥ悕绉�";
+ this.lab_saleDeptName.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_xsOrgName;
+ this.layoutControlItem39.Location = new System.Drawing.Point(271, 128);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem39.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem39.Text = "閿�鍞粍缁囧悕";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem40
+ //
+ this.layoutControlItem40.Control = this.txt_salerName;
+ this.layoutControlItem40.Location = new System.Drawing.Point(813, 192);
+ this.layoutControlItem40.Name = "layoutControlItem40";
+ this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem40.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem40.Text = "閿�鍞憳鍚�";
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(95, 18);
//
// tabMx
//
@@ -1976,6 +2154,19 @@
this.gvMx1id.Tag = "query_a.id";
this.gvMx1id.Width = 94;
//
+ // gvMx1seq
+ //
+ this.gvMx1seq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1seq.AppearanceCell.Options.UseFont = true;
+ this.gvMx1seq.Caption = "搴忓彿 ";
+ this.gvMx1seq.FieldName = "seq";
+ this.gvMx1seq.MinWidth = 50;
+ this.gvMx1seq.Name = "gvMx1seq";
+ this.gvMx1seq.Tag = "query_a.Seq";
+ this.gvMx1seq.Visible = true;
+ this.gvMx1seq.VisibleIndex = 0;
+ this.gvMx1seq.Width = 94;
+ //
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1991,13 +2182,13 @@
//
this.gvMx1erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1erpId.AppearanceCell.Options.UseFont = true;
- this.gvMx1erpId.Caption = "erp_id ";
+ this.gvMx1erpId.Caption = "ERP_ID";
this.gvMx1erpId.FieldName = "erpId";
this.gvMx1erpId.MinWidth = 50;
this.gvMx1erpId.Name = "gvMx1erpId";
this.gvMx1erpId.Tag = "query_a.erp_id";
this.gvMx1erpId.Visible = true;
- this.gvMx1erpId.VisibleIndex = 0;
+ this.gvMx1erpId.VisibleIndex = 1;
this.gvMx1erpId.Width = 94;
//
// gvMx1materialId
@@ -2032,7 +2223,7 @@
this.gvMx1qty.Name = "gvMx1qty";
this.gvMx1qty.Tag = "query_a.qty";
this.gvMx1qty.Visible = true;
- this.gvMx1qty.VisibleIndex = 1;
+ this.gvMx1qty.VisibleIndex = 2;
this.gvMx1qty.Width = 94;
//
// gvMx1priceUnitId
@@ -2056,7 +2247,7 @@
this.gvMx1priceUnitQty.Name = "gvMx1priceUnitQty";
this.gvMx1priceUnitQty.Tag = "query_a.price_unit_qty";
this.gvMx1priceUnitQty.Visible = true;
- this.gvMx1priceUnitQty.VisibleIndex = 2;
+ this.gvMx1priceUnitQty.VisibleIndex = 3;
this.gvMx1priceUnitQty.Width = 94;
//
// gvMx1deliveryDate
@@ -2069,7 +2260,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 3;
+ this.gvMx1deliveryDate.VisibleIndex = 4;
this.gvMx1deliveryDate.Width = 94;
//
// gvMx1isFree
@@ -2082,7 +2273,7 @@
this.gvMx1isFree.Name = "gvMx1isFree";
this.gvMx1isFree.Tag = "query_a.is_free";
this.gvMx1isFree.Visible = true;
- this.gvMx1isFree.VisibleIndex = 4;
+ this.gvMx1isFree.VisibleIndex = 5;
this.gvMx1isFree.Width = 94;
//
// gvMx1ownerTypeId
@@ -2121,7 +2312,7 @@
this.gvMx1entryNote.Name = "gvMx1entryNote";
this.gvMx1entryNote.Tag = "query_a.entry_note";
this.gvMx1entryNote.Visible = true;
- this.gvMx1entryNote.VisibleIndex = 7;
+ this.gvMx1entryNote.VisibleIndex = 8;
this.gvMx1entryNote.Width = 94;
//
// gvMx1mtoNo
@@ -2134,7 +2325,7 @@
this.gvMx1mtoNo.Name = "gvMx1mtoNo";
this.gvMx1mtoNo.Tag = "query_a.mto_no";
this.gvMx1mtoNo.Visible = true;
- this.gvMx1mtoNo.VisibleIndex = 8;
+ this.gvMx1mtoNo.VisibleIndex = 9;
this.gvMx1mtoNo.Width = 94;
//
// gvMx1lot
@@ -2147,7 +2338,7 @@
this.gvMx1lot.Name = "gvMx1lot";
this.gvMx1lot.Tag = "query_a.lot";
this.gvMx1lot.Visible = true;
- this.gvMx1lot.VisibleIndex = 9;
+ this.gvMx1lot.VisibleIndex = 10;
this.gvMx1lot.Width = 94;
//
// gvMx1deliveryMaxQty
@@ -2160,7 +2351,7 @@
this.gvMx1deliveryMaxQty.Name = "gvMx1deliveryMaxQty";
this.gvMx1deliveryMaxQty.Tag = "query_a.delivery_max_qty";
this.gvMx1deliveryMaxQty.Visible = true;
- this.gvMx1deliveryMaxQty.VisibleIndex = 10;
+ this.gvMx1deliveryMaxQty.VisibleIndex = 11;
this.gvMx1deliveryMaxQty.Width = 94;
//
// gvMx1deliveryMinQty
@@ -2173,7 +2364,7 @@
this.gvMx1deliveryMinQty.Name = "gvMx1deliveryMinQty";
this.gvMx1deliveryMinQty.Tag = "query_a.delivery_min_qty";
this.gvMx1deliveryMinQty.Visible = true;
- this.gvMx1deliveryMinQty.VisibleIndex = 11;
+ this.gvMx1deliveryMinQty.VisibleIndex = 12;
this.gvMx1deliveryMinQty.Width = 94;
//
// gvMx1outLmtUnitId
@@ -2421,19 +2612,6 @@
this.gvMx1mapSpec.VisibleIndex = 30;
this.gvMx1mapSpec.Width = 94;
//
- // gvMx1seq
- //
- this.gvMx1seq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1seq.AppearanceCell.Options.UseFont = true;
- this.gvMx1seq.Caption = "搴忓彿 ";
- this.gvMx1seq.FieldName = "seq";
- this.gvMx1seq.MinWidth = 50;
- this.gvMx1seq.Name = "gvMx1seq";
- this.gvMx1seq.Tag = "query_a.Seq";
- this.gvMx1seq.Visible = true;
- this.gvMx1seq.VisibleIndex = 0;
- this.gvMx1seq.Width = 94;
- //
// gvMx1supplyOrgId
//
this.gvMx1supplyOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -2485,7 +2663,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 33;
+ this.gridColumn5.VisibleIndex = 31;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -2495,7 +2673,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 34;
+ this.gridColumn6.VisibleIndex = 32;
this.gridColumn6.Width = 94;
//
// gridColumn7
@@ -2505,7 +2683,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 35;
+ this.gridColumn7.VisibleIndex = 33;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -2515,7 +2693,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 36;
+ this.gridColumn8.VisibleIndex = 34;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -2525,7 +2703,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 37;
+ this.gridColumn9.VisibleIndex = 35;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -2535,7 +2713,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 38;
+ this.gridColumn10.VisibleIndex = 36;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -2545,7 +2723,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 39;
+ this.gridColumn11.VisibleIndex = 37;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -2555,7 +2733,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 40;
+ this.gridColumn12.VisibleIndex = 38;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -2565,7 +2743,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 41;
+ this.gridColumn13.VisibleIndex = 39;
this.gridColumn13.Width = 94;
//
// picCheckBox
@@ -2578,186 +2756,6 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // layoutControlItem2
- //
- 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(271, 32);
- this.layoutControlItem2.Text = "ERPID";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_billNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_billTypeId;
- this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_headDeliveryWay;
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_settleId;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 32);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem16.Text = "缁撶畻鏂�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_chargeId;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem19.Text = "浠樻鏂�";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem36
- //
- this.layoutControlItem36.Control = this.txt_receiveId;
- this.layoutControlItem36.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem36.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem36.Text = "鏀惰揣鏂�";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_changeReason;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.txt_modifyDate;
- this.layoutControlItem24.Location = new System.Drawing.Point(542, 256);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem24.Text = "鏈�鍚庝慨鏀规棩鏈� ";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_changeDate;
- this.layoutControlItem28.Location = new System.Drawing.Point(813, 256);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem28.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem37
- //
- this.layoutControlItem37.Control = this.txt_receiveContact;
- this.layoutControlItem37.Location = new System.Drawing.Point(813, 160);
- this.layoutControlItem37.Name = "layoutControlItem37";
- this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem37.Text = "鏀惰揣鏂硅仈绯讳汉";
- this.layoutControlItem37.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_linkMan;
- this.layoutControlItem18.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_approverId;
- this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem17.Text = "瀹℃牳浜� ";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem41
- //
- this.layoutControlItem41.Control = this.txt_custName;
- this.layoutControlItem41.Location = new System.Drawing.Point(0, 128);
- this.layoutControlItem41.Name = "layoutControlItem41";
- this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem41.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem41.TextSize = new System.Drawing.Size(95, 18);
- //
- // lab_saleDeptName
- //
- this.lab_saleDeptName.Control = this.txt_saleDeptName;
- this.lab_saleDeptName.Location = new System.Drawing.Point(271, 96);
- this.lab_saleDeptName.Name = "lab_saleDeptName";
- this.lab_saleDeptName.OptionsTableLayoutItem.ColumnIndex = 1;
- this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 3;
- this.lab_saleDeptName.Size = new System.Drawing.Size(271, 32);
- this.lab_saleDeptName.Text = "閿�鍞儴闂ㄥ悕绉�";
- this.lab_saleDeptName.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem39
- //
- this.layoutControlItem39.Control = this.txt_xsOrgName;
- this.layoutControlItem39.Location = new System.Drawing.Point(271, 128);
- this.layoutControlItem39.Name = "layoutControlItem39";
- this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem39.Text = "閿�鍞粍缁囧悕";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem40
- //
- this.layoutControlItem40.Control = this.txt_salerName;
- this.layoutControlItem40.Location = new System.Drawing.Point(813, 192);
- this.layoutControlItem40.Name = "layoutControlItem40";
- this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem40.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem40.Text = "閿�鍞憳鍚�";
- this.layoutControlItem40.TextSize = new System.Drawing.Size(95, 18);
//
// Frm_SalesOrder
//
@@ -2829,16 +2827,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2853,14 +2853,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).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.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -2878,6 +2870,12 @@
((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).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);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index 96ea22a..1ec482a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -180,6 +180,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
--
Gitblit v1.9.3