From cf758a0cd625345be2176bd19ac0d94c8fe609d6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 06 八月 2025 18:52:25 +0800
Subject: [PATCH] 1、采购到货新增合并提交 2、顶部按钮合并按钮启用
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 258 +++++++++++++++++++++++++--------------------------
1 files changed, 125 insertions(+), 133 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index c6c6bd2..97b0330 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -31,13 +31,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -74,18 +74,17 @@
this.txt_staffName = new DevExpress.XtraEditors.TextEdit();
this.txt_startDate = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -99,6 +98,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -129,16 +129,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_staffName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -472,7 +472,9 @@
this.layoutMx1.Controls.Add(this.txt_startDate);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem11});
+ this.layoutControlItem11,
+ this.layoutControlItem2,
+ this.layoutControlItem4});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
@@ -493,101 +495,101 @@
//
// txt_fforbidStatus
//
- this.txt_fforbidStatus.Location = new System.Drawing.Point(735, 37);
+ this.txt_fforbidStatus.Location = new System.Drawing.Point(524, 38);
this.txt_fforbidStatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fforbidStatus.Name = "txt_fforbidStatus";
this.txt_fforbidStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_fforbidStatus.Size = new System.Drawing.Size(130, 20);
+ this.txt_fforbidStatus.Size = new System.Drawing.Size(126, 20);
this.txt_fforbidStatus.StyleController = this.layoutMx1;
this.txt_fforbidStatus.TabIndex = 306;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(307, 64);
+ this.txt_remark.Location = new System.Drawing.Point(96, 64);
this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(128, 20);
+ this.txt_remark.Size = new System.Drawing.Size(126, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(93, 10);
+ this.txt_id.Location = new System.Drawing.Point(96, 12);
this.txt_id.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(128, 20);
+ this.txt_id.Size = new System.Drawing.Size(126, 20);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 211;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(735, 10);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(738, 12);
this.txt_lastupdateDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(130, 20);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(126, 20);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 280;
//
// txt_departmentNo
//
- this.txt_departmentNo.Location = new System.Drawing.Point(93, 37);
+ this.txt_departmentNo.Location = new System.Drawing.Point(96, 38);
this.txt_departmentNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_departmentNo.Name = "txt_departmentNo";
this.txt_departmentNo.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentNo.Size = new System.Drawing.Size(128, 20);
+ this.txt_departmentNo.Size = new System.Drawing.Size(126, 20);
this.txt_departmentNo.StyleController = this.layoutMx1;
this.txt_departmentNo.TabIndex = 217;
//
// txt_phoneNumber
//
- this.txt_phoneNumber.Location = new System.Drawing.Point(93, 64);
+ this.txt_phoneNumber.Location = new System.Drawing.Point(310, 38);
this.txt_phoneNumber.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_phoneNumber.Name = "txt_phoneNumber";
this.txt_phoneNumber.Properties.Appearance.Options.UseFont = true;
- this.txt_phoneNumber.Size = new System.Drawing.Size(128, 20);
+ this.txt_phoneNumber.Size = new System.Drawing.Size(126, 20);
this.txt_phoneNumber.StyleController = this.layoutMx1;
this.txt_phoneNumber.TabIndex = 228;
//
// txt_staffNo
//
- this.txt_staffNo.Location = new System.Drawing.Point(307, 10);
+ this.txt_staffNo.Location = new System.Drawing.Point(310, 12);
this.txt_staffNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_staffNo.Name = "txt_staffNo";
this.txt_staffNo.Properties.Appearance.Options.UseFont = true;
- this.txt_staffNo.Size = new System.Drawing.Size(128, 20);
+ this.txt_staffNo.Size = new System.Drawing.Size(126, 20);
this.txt_staffNo.StyleController = this.layoutMx1;
this.txt_staffNo.TabIndex = 213;
//
// txt_departmentName
//
- this.txt_departmentName.Location = new System.Drawing.Point(307, 37);
+ this.txt_departmentName.Location = new System.Drawing.Point(310, 38);
this.txt_departmentName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_departmentName.Name = "txt_departmentName";
this.txt_departmentName.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentName.Size = new System.Drawing.Size(128, 20);
+ this.txt_departmentName.Size = new System.Drawing.Size(126, 20);
this.txt_departmentName.StyleController = this.layoutMx1;
this.txt_departmentName.TabIndex = 219;
//
// txt_staffName
//
- this.txt_staffName.Location = new System.Drawing.Point(521, 10);
+ this.txt_staffName.Location = new System.Drawing.Point(524, 12);
this.txt_staffName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_staffName.Name = "txt_staffName";
this.txt_staffName.Properties.Appearance.Options.UseFont = true;
- this.txt_staffName.Size = new System.Drawing.Size(128, 20);
+ this.txt_staffName.Size = new System.Drawing.Size(126, 20);
this.txt_staffName.StyleController = this.layoutMx1;
this.txt_staffName.TabIndex = 216;
//
// txt_startDate
//
- this.txt_startDate.Location = new System.Drawing.Point(521, 37);
+ this.txt_startDate.Location = new System.Drawing.Point(96, 38);
this.txt_startDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_startDate.Name = "txt_startDate";
this.txt_startDate.Properties.Appearance.Options.UseFont = true;
- this.txt_startDate.Size = new System.Drawing.Size(128, 20);
+ this.txt_startDate.Size = new System.Drawing.Size(126, 20);
this.txt_startDate.StyleController = this.layoutMx1;
this.txt_startDate.TabIndex = 231;
//
@@ -603,46 +605,65 @@
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_departmentNo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 26);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(214, 26);
+ this.layoutControlItem2.Text = "閮ㄩ棬缂栫爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_departmentName;
+ this.layoutControlItem4.Location = new System.Drawing.Point(214, 26);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(214, 26);
+ this.layoutControlItem4.Text = "閮ㄩ棬鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem8,
+ this.layoutControlItem6,
this.layoutControlItem9,
+ this.layoutControlItem8,
this.layoutControlItem10});
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});
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
this.Root.Size = new System.Drawing.Size(876, 98);
this.Root.TextVisible = false;
//
@@ -651,19 +672,9 @@
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(214, 27);
+ this.layoutControlItem1.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem1.Text = "鍛樺伐ID";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_departmentNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 27);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(214, 27);
- this.layoutControlItem2.Text = "閮ㄩ棬缂栫爜";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem3
//
@@ -671,20 +682,9 @@
this.layoutControlItem3.Location = new System.Drawing.Point(214, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(214, 27);
+ this.layoutControlItem3.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem3.Text = "鍛樺伐缂栫爜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_departmentName;
- this.layoutControlItem4.Location = new System.Drawing.Point(214, 27);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(214, 27);
- this.layoutControlItem4.Text = "閮ㄩ棬鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem5
//
@@ -692,20 +692,9 @@
this.layoutControlItem5.Location = new System.Drawing.Point(428, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(214, 27);
+ this.layoutControlItem5.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem5.Text = "鍛樺伐濮撳悕";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_startDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(428, 27);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(214, 27);
- this.layoutControlItem6.Text = "浠诲矖寮�濮嬫棩鏈�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
@@ -713,39 +702,49 @@
this.layoutControlItem7.Location = new System.Drawing.Point(642, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(216, 27);
+ this.layoutControlItem7.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem7.Text = "鍚屾鏃堕棿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
- // layoutControlItem8
+ // layoutControlItem6
//
- this.layoutControlItem8.Control = this.txt_fforbidStatus;
- this.layoutControlItem8.Location = new System.Drawing.Point(642, 27);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(216, 27);
- this.layoutControlItem8.Text = "鏄惁绂佺敤";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem6.Control = this.txt_startDate;
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 26);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(214, 26);
+ this.layoutControlItem6.Text = "浠诲矖寮�濮嬫棩鏈�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_phoneNumber;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 54);
+ this.layoutControlItem9.Location = new System.Drawing.Point(214, 26);
this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(214, 28);
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem9.Text = "鎵嬫満鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fforbidStatus;
+ this.layoutControlItem8.Location = new System.Drawing.Point(428, 26);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(214, 26);
+ this.layoutControlItem8.Text = "鏄惁绂佺敤";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_remark;
- this.layoutControlItem10.Location = new System.Drawing.Point(214, 54);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 52);
this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(214, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(214, 26);
this.layoutControlItem10.Text = "澶囨敞";
this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
//
@@ -795,6 +794,7 @@
this.gridColumn8,
this.gridColumn9,
this.gridColumn11});
+ this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(932, 370, 264, 282);
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -824,8 +824,8 @@
//
// gridColumn6
//
- this.gridColumn6.Caption = "鐗╂枡缂栧彿";
- this.gridColumn6.FieldName = "itemNo";
+ this.gridColumn6.Caption = "閮ㄩ棬";
+ this.gridColumn6.FieldName = "departmentName";
this.gridColumn6.MinWidth = 17;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
@@ -835,8 +835,8 @@
// gvMx2itemSname
//
this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
- this.gvMx2itemSname.FieldName = "itemName";
+ this.gvMx2itemSname.Caption = "宀椾綅";
+ this.gvMx2itemSname.FieldName = "positionName";
this.gvMx2itemSname.MinWidth = 17;
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
@@ -850,8 +850,6 @@
this.gridColumn7.FieldName = "itemModel";
this.gridColumn7.MinWidth = 17;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 2;
this.gridColumn7.Width = 82;
//
// gvMx2quantity
@@ -862,8 +860,6 @@
this.gvMx2quantity.MinWidth = 17;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
- this.gvMx2quantity.Visible = true;
- this.gvMx2quantity.VisibleIndex = 3;
this.gvMx2quantity.Width = 82;
//
// gridColumn8
@@ -872,8 +868,6 @@
this.gridColumn8.FieldName = "createBy";
this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 82;
//
// gridColumn9
@@ -882,8 +876,6 @@
this.gridColumn9.FieldName = "createDate";
this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 82;
//
// gridColumn11
@@ -934,16 +926,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_staffName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -993,11 +985,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
@@ -1015,5 +1003,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
\ No newline at end of file
--
Gitblit v1.9.3