From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 275 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 163 insertions(+), 112 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 7490e44..ba1daf0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -30,6 +30,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesDbck));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -128,6 +129,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.txt_djtype = new DevExpress.XtraEditors.ComboBoxEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_fRemarks = new DevExpress.XtraEditors.TextEdit();
@@ -177,6 +179,7 @@
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -188,6 +191,7 @@
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -296,6 +300,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -797,6 +802,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_djtype);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_fRemarks);
@@ -832,17 +838,27 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // btnCopyXls
+ //
+ this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 167);
+ this.btnCopyXls.Name = "btnCopyXls";
+ this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
+ this.btnCopyXls.StyleController = this.layoutMx1;
+ this.btnCopyXls.TabIndex = 445;
+ this.btnCopyXls.Text = "蹇嵎褰曞叆";
+ //
// txt_djtype
//
this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)";
- this.txt_djtype.Location = new System.Drawing.Point(390, 126);
+ this.txt_djtype.Location = new System.Drawing.Point(385, 136);
this.txt_djtype.Name = "txt_djtype";
this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djtype.Properties.Items.AddRange(new object[] {
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)"});
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_djtype.Size = new System.Drawing.Size(170, 24);
+ this.txt_djtype.Size = new System.Drawing.Size(165, 24);
this.txt_djtype.StyleController = this.layoutMx1;
this.txt_djtype.TabIndex = 391;
//
@@ -856,17 +872,17 @@
//
// txt_fRemarks
//
- this.txt_fRemarks.Location = new System.Drawing.Point(114, 126);
+ this.txt_fRemarks.Location = new System.Drawing.Point(114, 136);
this.txt_fRemarks.Name = "txt_fRemarks";
this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
- this.txt_fRemarks.Size = new System.Drawing.Size(170, 24);
+ this.txt_fRemarks.Size = new System.Drawing.Size(165, 24);
this.txt_fRemarks.StyleController = this.layoutMx1;
this.txt_fRemarks.TabIndex = 371;
//
// txt_fOwnerTypeInIdHead
//
this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 97);
+ this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(385, 105);
this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -875,16 +891,16 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(170, 24);
+ this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(165, 24);
this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeInIdHead.TabIndex = 382;
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(666, 40);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(656, 43);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(165, 24);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 386;
this.txt_fCreateDate.Tag = "readonly";
@@ -892,7 +908,7 @@
// txt_fOwnerTypeIdHead
//
this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 68);
+ this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(385, 74);
this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -901,28 +917,28 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(170, 24);
+ this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(165, 24);
this.txt_fOwnerTypeIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeIdHead.TabIndex = 380;
//
// txt_fBusinessType
//
this.txt_fBusinessType.EditValue = "鏍囧噯(NORMAL)";
- this.txt_fBusinessType.Location = new System.Drawing.Point(114, 68);
+ this.txt_fBusinessType.Location = new System.Drawing.Point(114, 74);
this.txt_fBusinessType.Name = "txt_fBusinessType";
this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
"鏍囧噯(NORMAL)"});
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBusinessType.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBusinessType.Size = new System.Drawing.Size(165, 24);
this.txt_fBusinessType.StyleController = this.layoutMx1;
this.txt_fBusinessType.TabIndex = 374;
//
// txt_fTransferDirect
//
this.txt_fTransferDirect.EditValue = "-璇烽�夋嫨-";
- this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 97);
+ this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 105);
this.txt_fTransferDirect.Name = "txt_fTransferDirect";
this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -931,16 +947,16 @@
"閫�璐�(RETURN)",
"鏅��(GENERAL)"});
this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fTransferDirect.Size = new System.Drawing.Size(170, 24);
+ this.txt_fTransferDirect.Size = new System.Drawing.Size(165, 24);
this.txt_fTransferDirect.StyleController = this.layoutMx1;
this.txt_fTransferDirect.TabIndex = 362;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(666, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(656, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(170, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(165, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 384;
this.txt_createBy.Tag = "readonly";
@@ -950,7 +966,7 @@
this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fBillNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(165, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 327;
this.txt_fBillNo.Tag = "readonly";
@@ -958,7 +974,7 @@
// txt_ftranstype
//
this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)";
- this.txt_ftranstype.Location = new System.Drawing.Point(390, 40);
+ this.txt_ftranstype.Location = new System.Drawing.Point(385, 43);
this.txt_ftranstype.Name = "txt_ftranstype";
this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -966,132 +982,132 @@
"缁勭粐鍐呰皟鎷�(InnerOrgTransfer)",
"璺ㄧ粍缁囪皟鎷�(OverOrgTransfer)"});
this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftranstype.Size = new System.Drawing.Size(170, 24);
+ this.txt_ftranstype.Size = new System.Drawing.Size(165, 24);
this.txt_ftranstype.StyleController = this.layoutMx1;
this.txt_ftranstype.TabIndex = 378;
//
// txt_fapporgid
//
this.txt_fapporgid.IsReadly = false;
- this.txt_fapporgid.Location = new System.Drawing.Point(390, 12);
+ this.txt_fapporgid.Location = new System.Drawing.Point(385, 12);
this.txt_fapporgid.Name = "txt_fapporgid";
- this.txt_fapporgid.Size = new System.Drawing.Size(170, 24);
+ this.txt_fapporgid.Size = new System.Drawing.Size(165, 24);
this.txt_fapporgid.TabIndex = 376;
//
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 40);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 43);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(165, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 361;
//
// txt_chkBy
//
- this.txt_chkBy.Location = new System.Drawing.Point(942, 12);
+ this.txt_chkBy.Location = new System.Drawing.Point(927, 12);
this.txt_chkBy.Name = "txt_chkBy";
this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_chkBy.Size = new System.Drawing.Size(172, 24);
+ this.txt_chkBy.Size = new System.Drawing.Size(166, 24);
this.txt_chkBy.StyleController = this.layoutMx1;
this.txt_chkBy.TabIndex = 258;
this.txt_chkBy.Tag = "readonly";
//
// txt_fapprovedate
//
- this.txt_fapprovedate.Location = new System.Drawing.Point(942, 40);
+ this.txt_fapprovedate.Location = new System.Drawing.Point(927, 43);
this.txt_fapprovedate.Name = "txt_fapprovedate";
this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
- this.txt_fapprovedate.Size = new System.Drawing.Size(172, 24);
+ this.txt_fapprovedate.Size = new System.Drawing.Size(166, 24);
this.txt_fapprovedate.StyleController = this.layoutMx1;
this.txt_fapprovedate.TabIndex = 262;
this.txt_fapprovedate.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(564, 155);
+ this.txt_wjStatus.Location = new System.Drawing.Point(554, 167);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(272, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 387;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(840, 68);
+ this.txt_chkStatus.Location = new System.Drawing.Point(825, 74);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 388;
this.txt_chkStatus.Tag = "readonly";
//
// txt_source
//
- this.txt_source.Location = new System.Drawing.Point(390, 155);
+ this.txt_source.Location = new System.Drawing.Point(385, 167);
this.txt_source.Name = "txt_source";
- this.txt_source.Size = new System.Drawing.Size(170, 24);
+ this.txt_source.Size = new System.Drawing.Size(165, 24);
this.txt_source.StyleController = this.layoutMx1;
this.txt_source.TabIndex = 390;
this.txt_source.Tag = "readonly";
//
// txt_fCloserId
//
- this.txt_fCloserId.Location = new System.Drawing.Point(666, 97);
+ this.txt_fCloserId.Location = new System.Drawing.Point(656, 105);
this.txt_fCloserId.Name = "txt_fCloserId";
- this.txt_fCloserId.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloserId.Size = new System.Drawing.Size(165, 24);
this.txt_fCloserId.StyleController = this.layoutMx1;
this.txt_fCloserId.TabIndex = 392;
this.txt_fCloserId.Tag = "readonly";
//
// txt_fCloseDate
//
- this.txt_fCloseDate.Location = new System.Drawing.Point(666, 126);
+ this.txt_fCloseDate.Location = new System.Drawing.Point(656, 136);
this.txt_fCloseDate.Name = "txt_fCloseDate";
- this.txt_fCloseDate.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloseDate.Size = new System.Drawing.Size(165, 24);
this.txt_fCloseDate.StyleController = this.layoutMx1;
this.txt_fCloseDate.TabIndex = 393;
this.txt_fCloseDate.Tag = "readonly";
//
// txt_fCloseStatusTxt
//
- this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(666, 68);
+ this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(656, 74);
this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt";
- this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(165, 24);
this.txt_fCloseStatusTxt.StyleController = this.layoutMx1;
this.txt_fCloseStatusTxt.TabIndex = 394;
this.txt_fCloseStatusTxt.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(942, 97);
+ this.txt_qt028.Location = new System.Drawing.Point(927, 105);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(166, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 395;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(942, 126);
+ this.txt_qt027.Location = new System.Drawing.Point(927, 136);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(166, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 396;
this.txt_qt027.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(840, 155);
+ this.txt_qt026.Location = new System.Drawing.Point(825, 167);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��";
- this.txt_qt026.Size = new System.Drawing.Size(274, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(268, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 397;
this.txt_qt026.Tag = "readonly";
@@ -1135,7 +1151,8 @@
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem11,
- this.layoutControlItem17});
+ this.layoutControlItem17,
+ this.layoutControlItem26});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1170,7 +1187,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 192);
+ this.Root.Size = new System.Drawing.Size(1105, 206);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1178,101 +1195,101 @@
this.layoutControlItem1.Control = this.txt_fBillNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fapporgid;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鐢宠缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "鐢宠浜哄憳";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fBillTypeID;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "鐢宠绫诲瀷";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_ftranstype;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 ";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fCreateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "鐢宠鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fBusinessType;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_chkBy;
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fapprovedate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Tag = "readonly";
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
@@ -1280,53 +1297,53 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fTransferDirect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 85);
+ this.layoutControlItem14.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_djtype;
- this.layoutControlItem19.Location = new System.Drawing.Point(276, 114);
+ this.layoutControlItem19.Location = new System.Drawing.Point(271, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fRemarks;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "鐢宠澶囨敞";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_chkStatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -1334,66 +1351,66 @@
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_fCloseDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 114);
+ this.layoutControlItem21.Location = new System.Drawing.Point(542, 124);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem21.Text = "鍏抽棴鏃堕棿";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_fCloserId;
- this.layoutControlItem20.Location = new System.Drawing.Point(552, 85);
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 93);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem20.Text = "鍏抽棴浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_fCloseStatusTxt;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 56);
+ this.layoutControlItem22.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem22.Text = "鍏抽棴鐘舵��";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt028;
- this.layoutControlItem23.Location = new System.Drawing.Point(828, 85);
+ this.layoutControlItem23.Location = new System.Drawing.Point(813, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem23.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_qt027;
- this.layoutControlItem24.Location = new System.Drawing.Point(828, 114);
+ this.layoutControlItem24.Location = new System.Drawing.Point(813, 124);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem24.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem24.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_qt026;
- this.layoutControlItem25.Location = new System.Drawing.Point(828, 143);
+ this.layoutControlItem25.Location = new System.Drawing.Point(813, 155);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem25.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem25.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem25.Text = "鍞悗瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1401,11 +1418,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wjStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 143);
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1413,13 +1430,27 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_source;
- this.layoutControlItem17.Location = new System.Drawing.Point(276, 143);
+ this.layoutControlItem17.Location = new System.Drawing.Point(271, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.btnCopyXls;
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem26.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem26.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem26.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem26.Text = "蹇嵎褰曞叆";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
//
// tabMx
//
@@ -1555,6 +1586,7 @@
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
this.gridColumn3,
+ this.gridColumn54,
this.gridColumn4,
this.gridColumn5,
this.gridColumn7,
@@ -1569,36 +1601,51 @@
this.gridColumn2.Caption = "鐗╂枡ID";
this.gridColumn2.FieldName = "id";
this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
this.gridColumn2.Width = 41;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栧彿";
this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 80;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 41;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 80;
+ //
+ // gridColumn54
+ //
+ this.gridColumn54.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn54.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn54.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn54.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn54.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn54.FieldName = "kcQty";
+ this.gridColumn54.MinWidth = 80;
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 1;
+ this.gridColumn54.Width = 80;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 91;
+ this.gridColumn4.Width = 77;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 100;
+ this.gridColumn5.Width = 84;
//
// gridColumn7
//
@@ -1607,7 +1654,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 4;
- this.gridColumn7.Width = 56;
+ this.gridColumn7.Width = 20;
//
// gridColumn6
//
@@ -1616,7 +1663,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 43;
+ this.gridColumn6.Width = 60;
//
// gvMx1bld002
//
@@ -1654,7 +1701,7 @@
this.itemModel.OptionsColumn.ReadOnly = true;
this.itemModel.Tag = "query_a.bld004";
this.itemModel.Visible = true;
- this.itemModel.VisibleIndex = 3;
+ this.itemModel.VisibleIndex = 13;
this.itemModel.Width = 120;
//
// gvMx1bld007
@@ -1670,7 +1717,7 @@
this.gvMx1bld007.Name = "gvMx1bld007";
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
- this.gvMx1bld007.VisibleIndex = 4;
+ this.gvMx1bld007.VisibleIndex = 3;
this.gvMx1bld007.Width = 94;
//
// gvMx1bld010
@@ -1686,7 +1733,7 @@
this.gvMx1bld010.Name = "gvMx1bld010";
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
- this.gvMx1bld010.VisibleIndex = 5;
+ this.gvMx1bld010.VisibleIndex = 4;
this.gvMx1bld010.Width = 150;
//
// gvMx1bld008
@@ -1699,7 +1746,7 @@
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
- this.gvMx1bld008.VisibleIndex = 6;
+ this.gvMx1bld008.VisibleIndex = 5;
this.gvMx1bld008.Width = 94;
//
// gridColumn1
@@ -1709,7 +1756,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 94;
//
// gridColumn9
@@ -1724,7 +1771,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.VisibleIndex = 7;
this.gridColumn9.Width = 94;
//
// rptDcOrg
@@ -1748,7 +1795,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 94;
//
// rptDcCk
@@ -1792,7 +1839,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 10;
+ this.gridColumn12.VisibleIndex = 9;
this.gridColumn12.Width = 94;
//
// rptDrOrg
@@ -1816,7 +1863,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.VisibleIndex = 10;
this.gridColumn16.Width = 94;
//
// rptDrCk
@@ -1858,7 +1905,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 12;
+ this.gridColumn23.VisibleIndex = 11;
this.gridColumn23.Width = 94;
//
// rptDcHz
@@ -1882,7 +1929,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 13;
+ this.gridColumn24.VisibleIndex = 12;
this.gridColumn24.Width = 94;
//
// rptDrHz
@@ -1973,7 +2020,7 @@
//
// gridColumn21
//
- this.gridColumn21.Caption = "璋冨嚭璐т富Gui";
+ this.gridColumn21.Caption = "璋冨嚭璐т富Guid";
this.gridColumn21.ColumnEdit = this.rptDcHz;
this.gridColumn21.FieldName = "dcHzGuid";
this.gridColumn21.MinWidth = 25;
@@ -2091,6 +2138,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2259,5 +2307,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+ private DevExpress.XtraEditors.SimpleButton btnCopyXls;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
}
}
\ No newline at end of file
--
Gitblit v1.9.3