From cddeb04d1d702e5d9b3b6173f0f9304c6bdf1c47 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 三月 2025 15:54:35 +0800
Subject: [PATCH] 修改字体大小前
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 14
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 765 ++++++++++-------
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs | 12
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 1421 ++++++++++++++++++--------------
DevApp/Gs.DevApp/Properties/Resources.resx | 193 ++--
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 17
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs | 127 +-
11 files changed, 1,424 insertions(+), 1,140 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 5dd9d1d..d29e9fc 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -29,58 +29,88 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
- this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
- this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fdescription = new DevExpress.XtraEditors.LabelControl();
- this.txt_fdescription = new DevExpress.XtraEditors.TextEdit();
- this.gv_fdescription = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fprecision = new DevExpress.XtraEditors.LabelControl();
- this.txt_fprecision = new DevExpress.XtraEditors.TextEdit();
- this.gv_fprecision = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_froundtype = new DevExpress.XtraEditors.LabelControl();
- this.txt_froundtype = new DevExpress.XtraEditors.TextEdit();
- this.gv_froundtype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fbaseunit = new DevExpress.XtraEditors.LabelControl();
- this.lb_fconvertnumerator = new DevExpress.XtraEditors.LabelControl();
- this.txt_fconvertnumerator = new DevExpress.XtraEditors.TextEdit();
- this.gv_fconvertnumerator = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fcurrentunitid = new DevExpress.XtraEditors.LabelControl();
- this.lb_fconvertdenominator = new DevExpress.XtraEditors.LabelControl();
- this.txt_fconvertdenominator = new DevExpress.XtraEditors.TextEdit();
- this.gv_fconvertdenominator = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_funitgroupid = new DevExpress.XtraEditors.LabelControl();
- this.txt_funitgroupid = new DevExpress.XtraEditors.TextEdit();
- this.gv_funitgroupid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fname = new DevExpress.XtraEditors.LabelControl();
- this.txt_fname = new DevExpress.XtraEditors.TextEdit();
- this.gv_fname = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fnumber = new DevExpress.XtraEditors.LabelControl();
- this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
- this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_newqty = new DevExpress.XtraEditors.LabelControl();
- this.txt_newqty = new DevExpress.XtraEditors.TextEdit();
- this.lb_oldqty = new DevExpress.XtraEditors.LabelControl();
- this.txt_oldqty = new DevExpress.XtraEditors.TextEdit();
- this.lb_newunit = new DevExpress.XtraEditors.LabelControl();
- this.lb_oldunit = new DevExpress.XtraEditors.LabelControl();
- this.lb_id = new DevExpress.XtraEditors.LabelControl();
- this.txt_id = new DevExpress.XtraEditors.TextEdit();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fname = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_funitgroupid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fconvertdenominator = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fconvertnumerator = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_froundtype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fprecision = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fdescription = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.txt_fcurrentunitid = new Gs.DevApp.UserControl.UcLookUnit();
this.txt_fbaseunit = new Gs.DevApp.UserControl.UcLookUnit();
this.txt_newunit = new Gs.DevApp.UserControl.UcLookUnit();
this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fdescription = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fprecision = new DevExpress.XtraEditors.TextEdit();
+ this.txt_froundtype = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fconvertnumerator = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fconvertdenominator = new DevExpress.XtraEditors.TextEdit();
+ this.txt_funitgroupid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fname = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
+ this.txt_newqty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_oldqty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_id = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
@@ -93,408 +123,30 @@
((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
- //
- // lb_fforbidstatus
- //
- this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fforbidstatus.Appearance.Options.UseFont = true;
- this.lb_fforbidstatus.Location = new System.Drawing.Point(283, 204);
- this.lb_fforbidstatus.Name = "lb_fforbidstatus";
- this.lb_fforbidstatus.Size = new System.Drawing.Size(85, 21);
- this.lb_fforbidstatus.TabIndex = 298;
- this.lb_fforbidstatus.Text = "绂佺敤鐘舵�侊細";
- //
- // txt_fforbidstatus
- //
- this.txt_fforbidstatus.Location = new System.Drawing.Point(368, 200);
- this.txt_fforbidstatus.Name = "txt_fforbidstatus";
- this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
- this.txt_fforbidstatus.Size = new System.Drawing.Size(150, 28);
- this.txt_fforbidstatus.TabIndex = 298;
- //
- // gv_fforbidstatus
- //
- this.gv_fforbidstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fforbidstatus.Caption = "绂佺敤鐘舵��";
- this.gv_fforbidstatus.FieldName = "fforbidstatus";
- this.gv_fforbidstatus.MinWidth = 50;
- this.gv_fforbidstatus.Name = "gv_fforbidstatus";
- this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
- this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 8;
- this.gv_fforbidstatus.Width = 91;
- //
- // lb_fdescription
- //
- this.lb_fdescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fdescription.Appearance.Options.UseFont = true;
- this.lb_fdescription.Location = new System.Drawing.Point(283, 244);
- this.lb_fdescription.Name = "lb_fdescription";
- this.lb_fdescription.Size = new System.Drawing.Size(85, 21);
- this.lb_fdescription.TabIndex = 291;
- this.lb_fdescription.Text = "鍗曚綅鎻忚堪锛�";
- //
- // txt_fdescription
- //
- this.txt_fdescription.Location = new System.Drawing.Point(368, 240);
- this.txt_fdescription.Name = "txt_fdescription";
- this.txt_fdescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
- this.txt_fdescription.Size = new System.Drawing.Size(150, 28);
- this.txt_fdescription.TabIndex = 291;
- //
- // gv_fdescription
- //
- this.gv_fdescription.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fdescription.AppearanceCell.Options.UseFont = true;
- this.gv_fdescription.Caption = "鎻忚堪";
- this.gv_fdescription.FieldName = "fdescription";
- this.gv_fdescription.MinWidth = 50;
- this.gv_fdescription.Name = "gv_fdescription";
- this.gv_fdescription.Tag = "query_a.fdescription";
- this.gv_fdescription.Visible = true;
- this.gv_fdescription.VisibleIndex = 7;
- this.gv_fdescription.Width = 91;
- //
- // lb_fprecision
- //
- this.lb_fprecision.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fprecision.Appearance.Options.UseFont = true;
- this.lb_fprecision.Location = new System.Drawing.Point(283, 84);
- this.lb_fprecision.Name = "lb_fprecision";
- this.lb_fprecision.Size = new System.Drawing.Size(85, 21);
- this.lb_fprecision.TabIndex = 285;
- this.lb_fprecision.Text = "鍗曚綅绮惧害锛�";
- //
- // txt_fprecision
- //
- this.txt_fprecision.Location = new System.Drawing.Point(368, 80);
- this.txt_fprecision.Name = "txt_fprecision";
- this.txt_fprecision.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fprecision.Properties.Appearance.Options.UseFont = true;
- this.txt_fprecision.Size = new System.Drawing.Size(150, 28);
- this.txt_fprecision.TabIndex = 285;
- //
- // gv_fprecision
- //
- this.gv_fprecision.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fprecision.AppearanceCell.Options.UseFont = true;
- this.gv_fprecision.Caption = "绮惧害";
- this.gv_fprecision.FieldName = "fprecision";
- this.gv_fprecision.MinWidth = 50;
- this.gv_fprecision.Name = "gv_fprecision";
- this.gv_fprecision.Tag = "query_a.fprecision";
- this.gv_fprecision.Visible = true;
- this.gv_fprecision.VisibleIndex = 6;
- this.gv_fprecision.Width = 91;
- //
- // lb_froundtype
- //
- this.lb_froundtype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_froundtype.Appearance.Options.UseFont = true;
- this.lb_froundtype.Location = new System.Drawing.Point(533, 43);
- this.lb_froundtype.Name = "lb_froundtype";
- this.lb_froundtype.Size = new System.Drawing.Size(85, 21);
- this.lb_froundtype.TabIndex = 280;
- this.lb_froundtype.Text = "鑸嶅叆绫诲瀷锛�";
- //
- // txt_froundtype
- //
- this.txt_froundtype.Location = new System.Drawing.Point(618, 39);
- this.txt_froundtype.Name = "txt_froundtype";
- this.txt_froundtype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_froundtype.Properties.Appearance.Options.UseFont = true;
- this.txt_froundtype.Size = new System.Drawing.Size(150, 28);
- this.txt_froundtype.TabIndex = 280;
- //
- // gv_froundtype
- //
- this.gv_froundtype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_froundtype.AppearanceCell.Options.UseFont = true;
- this.gv_froundtype.Caption = "鑸嶅叆绫诲瀷";
- this.gv_froundtype.FieldName = "froundtype";
- this.gv_froundtype.MinWidth = 50;
- this.gv_froundtype.Name = "gv_froundtype";
- this.gv_froundtype.Tag = "query_a.froundtype";
- this.gv_froundtype.Visible = true;
- this.gv_froundtype.VisibleIndex = 5;
- this.gv_froundtype.Width = 91;
- //
- // lb_fbaseunit
- //
- this.lb_fbaseunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fbaseunit.Appearance.Options.UseFont = true;
- this.lb_fbaseunit.Location = new System.Drawing.Point(283, 123);
- this.lb_fbaseunit.Name = "lb_fbaseunit";
- this.lb_fbaseunit.Size = new System.Drawing.Size(85, 21);
- this.lb_fbaseunit.TabIndex = 273;
- this.lb_fbaseunit.Text = "鍩哄噯鍗曚綅锛�";
- //
- // lb_fconvertnumerator
- //
- this.lb_fconvertnumerator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fconvertnumerator.Appearance.Options.UseFont = true;
- this.lb_fconvertnumerator.Location = new System.Drawing.Point(533, 84);
- this.lb_fconvertnumerator.Name = "lb_fconvertnumerator";
- this.lb_fconvertnumerator.Size = new System.Drawing.Size(85, 21);
- this.lb_fconvertnumerator.TabIndex = 267;
- this.lb_fconvertnumerator.Text = "鎹㈢畻鍒嗗瓙锛�";
- //
- // txt_fconvertnumerator
- //
- this.txt_fconvertnumerator.Location = new System.Drawing.Point(618, 80);
- this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
- this.txt_fconvertnumerator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
- this.txt_fconvertnumerator.Size = new System.Drawing.Size(150, 28);
- this.txt_fconvertnumerator.TabIndex = 267;
- //
- // gv_fconvertnumerator
- //
- this.gv_fconvertnumerator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fconvertnumerator.AppearanceCell.Options.UseFont = true;
- this.gv_fconvertnumerator.Caption = "鎹㈢畻鍒嗗瓙";
- this.gv_fconvertnumerator.FieldName = "fconvertnumerator";
- this.gv_fconvertnumerator.MinWidth = 50;
- this.gv_fconvertnumerator.Name = "gv_fconvertnumerator";
- this.gv_fconvertnumerator.Tag = "query_a.fconvertnumerator";
- this.gv_fconvertnumerator.Visible = true;
- this.gv_fconvertnumerator.VisibleIndex = 4;
- this.gv_fconvertnumerator.Width = 91;
- //
- // lb_fcurrentunitid
- //
- this.lb_fcurrentunitid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fcurrentunitid.Appearance.Options.UseFont = true;
- this.lb_fcurrentunitid.Location = new System.Drawing.Point(283, 164);
- this.lb_fcurrentunitid.Name = "lb_fcurrentunitid";
- this.lb_fcurrentunitid.Size = new System.Drawing.Size(85, 21);
- this.lb_fcurrentunitid.TabIndex = 262;
- this.lb_fcurrentunitid.Text = "褰撳墠鍗曚綅锛�";
- //
- // lb_fconvertdenominator
- //
- this.lb_fconvertdenominator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fconvertdenominator.Appearance.Options.UseFont = true;
- this.lb_fconvertdenominator.Location = new System.Drawing.Point(533, 123);
- this.lb_fconvertdenominator.Name = "lb_fconvertdenominator";
- this.lb_fconvertdenominator.Size = new System.Drawing.Size(85, 21);
- this.lb_fconvertdenominator.TabIndex = 258;
- this.lb_fconvertdenominator.Text = "鎹㈢畻鍒嗘瘝锛�";
- //
- // txt_fconvertdenominator
- //
- this.txt_fconvertdenominator.Location = new System.Drawing.Point(618, 119);
- this.txt_fconvertdenominator.Name = "txt_fconvertdenominator";
- this.txt_fconvertdenominator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fconvertdenominator.Properties.Appearance.Options.UseFont = true;
- this.txt_fconvertdenominator.Size = new System.Drawing.Size(150, 28);
- this.txt_fconvertdenominator.TabIndex = 258;
- //
- // gv_fconvertdenominator
- //
- this.gv_fconvertdenominator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fconvertdenominator.AppearanceCell.Options.UseFont = true;
- this.gv_fconvertdenominator.Caption = "鎹㈢畻鍒嗘瘝";
- this.gv_fconvertdenominator.FieldName = "fconvertdenominator";
- this.gv_fconvertdenominator.MinWidth = 50;
- this.gv_fconvertdenominator.Name = "gv_fconvertdenominator";
- this.gv_fconvertdenominator.OptionsColumn.ReadOnly = true;
- this.gv_fconvertdenominator.Tag = "query_a.fconvertdenominator";
- this.gv_fconvertdenominator.Visible = true;
- this.gv_fconvertdenominator.VisibleIndex = 3;
- this.gv_fconvertdenominator.Width = 91;
- //
- // lb_funitgroupid
- //
- this.lb_funitgroupid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_funitgroupid.Appearance.Options.UseFont = true;
- this.lb_funitgroupid.Location = new System.Drawing.Point(533, 164);
- this.lb_funitgroupid.Name = "lb_funitgroupid";
- this.lb_funitgroupid.Size = new System.Drawing.Size(85, 21);
- this.lb_funitgroupid.TabIndex = 252;
- this.lb_funitgroupid.Text = "鎵�灞炵粍鍒細";
- //
- // txt_funitgroupid
- //
- this.txt_funitgroupid.Location = new System.Drawing.Point(618, 160);
- this.txt_funitgroupid.Name = "txt_funitgroupid";
- this.txt_funitgroupid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
- this.txt_funitgroupid.Size = new System.Drawing.Size(150, 28);
- this.txt_funitgroupid.TabIndex = 252;
- //
- // gv_funitgroupid
- //
- this.gv_funitgroupid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_funitgroupid.AppearanceCell.Options.UseFont = true;
- this.gv_funitgroupid.Caption = "鎵�灞炵粍鍒�";
- this.gv_funitgroupid.FieldName = "funitgroupid";
- this.gv_funitgroupid.MinWidth = 50;
- this.gv_funitgroupid.Name = "gv_funitgroupid";
- this.gv_funitgroupid.OptionsColumn.ReadOnly = true;
- this.gv_funitgroupid.Tag = "query_a.funitgroupid";
- this.gv_funitgroupid.Visible = true;
- this.gv_funitgroupid.VisibleIndex = 2;
- this.gv_funitgroupid.Width = 91;
- //
- // lb_fname
- //
- this.lb_fname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fname.Appearance.Options.UseFont = true;
- this.lb_fname.Location = new System.Drawing.Point(283, 43);
- this.lb_fname.Name = "lb_fname";
- this.lb_fname.Size = new System.Drawing.Size(85, 21);
- this.lb_fname.TabIndex = 247;
- this.lb_fname.Text = "鍗曚綅鍚嶇О锛�";
- //
- // txt_fname
- //
- this.txt_fname.Location = new System.Drawing.Point(368, 39);
- this.txt_fname.Name = "txt_fname";
- this.txt_fname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fname.Properties.Appearance.Options.UseFont = true;
- this.txt_fname.Size = new System.Drawing.Size(150, 28);
- this.txt_fname.TabIndex = 247;
- //
- // gv_fname
- //
- this.gv_fname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fname.AppearanceCell.Options.UseFont = true;
- this.gv_fname.Caption = "鍗曚綅鍚嶇О";
- this.gv_fname.FieldName = "fname";
- this.gv_fname.MinWidth = 50;
- this.gv_fname.Name = "gv_fname";
- this.gv_fname.OptionsColumn.ReadOnly = true;
- this.gv_fname.Tag = "query_a.fname";
- this.gv_fname.Visible = true;
- this.gv_fname.VisibleIndex = 1;
- this.gv_fname.Width = 91;
- //
- // lb_fnumber
- //
- this.lb_fnumber.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fnumber.Appearance.Options.UseFont = true;
- this.lb_fnumber.Location = new System.Drawing.Point(38, 84);
- this.lb_fnumber.Name = "lb_fnumber";
- this.lb_fnumber.Size = new System.Drawing.Size(85, 21);
- this.lb_fnumber.TabIndex = 243;
- this.lb_fnumber.Text = "鍗曚綅缂栫爜锛�";
- //
- // txt_fnumber
- //
- this.txt_fnumber.Location = new System.Drawing.Point(123, 80);
- this.txt_fnumber.Name = "txt_fnumber";
- this.txt_fnumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
- this.txt_fnumber.Size = new System.Drawing.Size(150, 28);
- this.txt_fnumber.TabIndex = 243;
- //
- // gv_fnumber
- //
- this.gv_fnumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fnumber.AppearanceCell.Options.UseFont = true;
- this.gv_fnumber.Caption = "鍗曚綅缂栫爜";
- this.gv_fnumber.FieldName = "fnumber";
- this.gv_fnumber.MinWidth = 50;
- this.gv_fnumber.Name = "gv_fnumber";
- this.gv_fnumber.OptionsColumn.ReadOnly = true;
- this.gv_fnumber.Tag = "query_a.fnumber";
- this.gv_fnumber.Visible = true;
- this.gv_fnumber.VisibleIndex = 0;
- this.gv_fnumber.Width = 91;
- //
- // lb_newqty
- //
- this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_newqty.Appearance.Options.UseFont = true;
- this.lb_newqty.Location = new System.Drawing.Point(4, 244);
- this.lb_newqty.Name = "lb_newqty";
- this.lb_newqty.Size = new System.Drawing.Size(119, 21);
- this.lb_newqty.TabIndex = 219;
- this.lb_newqty.Text = "鐩殑鍗曚綅鏁伴噺锛�";
- //
- // txt_newqty
- //
- this.txt_newqty.Location = new System.Drawing.Point(123, 240);
- this.txt_newqty.Name = "txt_newqty";
- this.txt_newqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_newqty.Properties.Appearance.Options.UseFont = true;
- this.txt_newqty.Size = new System.Drawing.Size(150, 28);
- this.txt_newqty.TabIndex = 219;
- //
- // lb_oldqty
- //
- this.lb_oldqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_oldqty.Appearance.Options.UseFont = true;
- this.lb_oldqty.Location = new System.Drawing.Point(21, 164);
- this.lb_oldqty.Name = "lb_oldqty";
- this.lb_oldqty.Size = new System.Drawing.Size(102, 21);
- this.lb_oldqty.TabIndex = 217;
- this.lb_oldqty.Text = "鍘熷崟浣嶆暟閲忥細";
- //
- // txt_oldqty
- //
- this.txt_oldqty.Location = new System.Drawing.Point(123, 160);
- this.txt_oldqty.Name = "txt_oldqty";
- this.txt_oldqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_oldqty.Properties.Appearance.Options.UseFont = true;
- this.txt_oldqty.Size = new System.Drawing.Size(150, 28);
- this.txt_oldqty.TabIndex = 217;
- //
- // lb_newunit
- //
- this.lb_newunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_newunit.Appearance.Options.UseFont = true;
- this.lb_newunit.Location = new System.Drawing.Point(38, 204);
- this.lb_newunit.Name = "lb_newunit";
- this.lb_newunit.Size = new System.Drawing.Size(85, 21);
- this.lb_newunit.TabIndex = 216;
- this.lb_newunit.Text = "鐩殑鍗曚綅锛�";
- //
- // lb_oldunit
- //
- this.lb_oldunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_oldunit.Appearance.Options.UseFont = true;
- this.lb_oldunit.Location = new System.Drawing.Point(55, 123);
- this.lb_oldunit.Name = "lb_oldunit";
- this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
- this.lb_oldunit.TabIndex = 213;
- this.lb_oldunit.Text = "鍘熷崟浣嶏細";
- //
- // lb_id
- //
- this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(54, 43);
- this.lb_id.Name = "lb_id";
- this.lb_id.Size = new System.Drawing.Size(69, 21);
- this.lb_id.TabIndex = 211;
- this.lb_id.Text = "鍗曚綅ID锛�";
- //
- // txt_id
- //
- this.txt_id.Location = new System.Drawing.Point(123, 39);
- this.txt_id.Name = "txt_id";
- this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(150, 28);
- this.txt_id.TabIndex = 211;
//
// toolBarMenu1
//
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;
@@ -506,16 +158,55 @@
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_unit{}";
//
- // gcMain
+ // xtraTabControl1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(970, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(972, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(970, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(970, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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(970, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -533,145 +224,133 @@
this.gv_fdescription,
this.gv_fforbidstatus,
this.gridColumn1});
- this.gridView1.GridControl = this.gcMain;
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // xtraTabControl1
+ // gv_fnumber
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(972, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
+ this.gv_fnumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fnumber.AppearanceCell.Options.UseFont = true;
+ this.gv_fnumber.Caption = "鍗曚綅缂栫爜";
+ this.gv_fnumber.FieldName = "fnumber";
+ this.gv_fnumber.MinWidth = 50;
+ this.gv_fnumber.Name = "gv_fnumber";
+ this.gv_fnumber.OptionsColumn.ReadOnly = true;
+ this.gv_fnumber.Tag = "query_a.fnumber";
+ this.gv_fnumber.Visible = true;
+ this.gv_fnumber.VisibleIndex = 0;
+ this.gv_fnumber.Width = 91;
//
- // xtraTabPage1
+ // gv_fname
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(970, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ this.gv_fname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fname.AppearanceCell.Options.UseFont = true;
+ this.gv_fname.Caption = "鍗曚綅鍚嶇О";
+ this.gv_fname.FieldName = "fname";
+ this.gv_fname.MinWidth = 50;
+ this.gv_fname.Name = "gv_fname";
+ this.gv_fname.OptionsColumn.ReadOnly = true;
+ this.gv_fname.Tag = "query_a.fname";
+ this.gv_fname.Visible = true;
+ this.gv_fname.VisibleIndex = 1;
+ this.gv_fname.Width = 91;
//
- // pageBar1
+ // gv_funitgroupid
//
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(970, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
+ this.gv_funitgroupid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_funitgroupid.AppearanceCell.Options.UseFont = true;
+ this.gv_funitgroupid.Caption = "鎵�灞炵粍鍒�";
+ this.gv_funitgroupid.FieldName = "funitgroupid";
+ this.gv_funitgroupid.MinWidth = 50;
+ this.gv_funitgroupid.Name = "gv_funitgroupid";
+ this.gv_funitgroupid.OptionsColumn.ReadOnly = true;
+ this.gv_funitgroupid.Tag = "query_a.funitgroupid";
+ this.gv_funitgroupid.Visible = true;
+ this.gv_funitgroupid.VisibleIndex = 2;
+ this.gv_funitgroupid.Width = 91;
//
- // xtraTabPage2
+ // gv_fconvertdenominator
//
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(970, 570);
- this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ this.gv_fconvertdenominator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fconvertdenominator.AppearanceCell.Options.UseFont = true;
+ this.gv_fconvertdenominator.Caption = "鎹㈢畻鍒嗘瘝";
+ this.gv_fconvertdenominator.FieldName = "fconvertdenominator";
+ this.gv_fconvertdenominator.MinWidth = 50;
+ this.gv_fconvertdenominator.Name = "gv_fconvertdenominator";
+ this.gv_fconvertdenominator.OptionsColumn.ReadOnly = true;
+ this.gv_fconvertdenominator.Tag = "query_a.fconvertdenominator";
+ this.gv_fconvertdenominator.Visible = true;
+ this.gv_fconvertdenominator.VisibleIndex = 3;
+ this.gv_fconvertdenominator.Width = 91;
//
- // panel1
+ // gv_fconvertnumerator
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_fcurrentunitid);
- this.panel1.Controls.Add(this.txt_fbaseunit);
- this.panel1.Controls.Add(this.txt_newunit);
- this.panel1.Controls.Add(this.txt_oldunit);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_fforbidstatus);
- this.panel1.Controls.Add(this.txt_fforbidstatus);
- this.panel1.Controls.Add(this.lb_fdescription);
- this.panel1.Controls.Add(this.txt_fdescription);
- this.panel1.Controls.Add(this.lb_fprecision);
- this.panel1.Controls.Add(this.txt_fprecision);
- this.panel1.Controls.Add(this.lb_froundtype);
- this.panel1.Controls.Add(this.txt_froundtype);
- this.panel1.Controls.Add(this.lb_fbaseunit);
- this.panel1.Controls.Add(this.lb_fconvertnumerator);
- this.panel1.Controls.Add(this.txt_fconvertnumerator);
- this.panel1.Controls.Add(this.lb_fcurrentunitid);
- this.panel1.Controls.Add(this.lb_fconvertdenominator);
- this.panel1.Controls.Add(this.txt_fconvertdenominator);
- this.panel1.Controls.Add(this.lb_funitgroupid);
- this.panel1.Controls.Add(this.txt_funitgroupid);
- this.panel1.Controls.Add(this.lb_fname);
- this.panel1.Controls.Add(this.txt_fname);
- this.panel1.Controls.Add(this.lb_fnumber);
- this.panel1.Controls.Add(this.txt_fnumber);
- this.panel1.Controls.Add(this.lb_newqty);
- this.panel1.Controls.Add(this.txt_newqty);
- this.panel1.Controls.Add(this.lb_oldqty);
- this.panel1.Controls.Add(this.txt_oldqty);
- this.panel1.Controls.Add(this.lb_newunit);
- this.panel1.Controls.Add(this.lb_oldunit);
- this.panel1.Controls.Add(this.lb_id);
- this.panel1.Controls.Add(this.txt_id);
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(814, 426);
- this.panel1.TabIndex = 1;
+ this.gv_fconvertnumerator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fconvertnumerator.AppearanceCell.Options.UseFont = true;
+ this.gv_fconvertnumerator.Caption = "鎹㈢畻鍒嗗瓙";
+ this.gv_fconvertnumerator.FieldName = "fconvertnumerator";
+ this.gv_fconvertnumerator.MinWidth = 50;
+ this.gv_fconvertnumerator.Name = "gv_fconvertnumerator";
+ this.gv_fconvertnumerator.Tag = "query_a.fconvertnumerator";
+ this.gv_fconvertnumerator.Visible = true;
+ this.gv_fconvertnumerator.VisibleIndex = 4;
+ this.gv_fconvertnumerator.Width = 91;
//
- // txt_fcurrentunitid
+ // gv_froundtype
//
- this.txt_fcurrentunitid.IsReadly = false;
- this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
- this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
- this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
- this.txt_fcurrentunitid.TabIndex = 302;
+ this.gv_froundtype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_froundtype.AppearanceCell.Options.UseFont = true;
+ this.gv_froundtype.Caption = "鑸嶅叆绫诲瀷";
+ this.gv_froundtype.FieldName = "froundtype";
+ this.gv_froundtype.MinWidth = 50;
+ this.gv_froundtype.Name = "gv_froundtype";
+ this.gv_froundtype.Tag = "query_a.froundtype";
+ this.gv_froundtype.Visible = true;
+ this.gv_froundtype.VisibleIndex = 5;
+ this.gv_froundtype.Width = 91;
//
- // txt_fbaseunit
+ // gv_fprecision
//
- this.txt_fbaseunit.IsReadly = false;
- this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
- this.txt_fbaseunit.Name = "txt_fbaseunit";
- this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
- this.txt_fbaseunit.TabIndex = 301;
+ this.gv_fprecision.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fprecision.AppearanceCell.Options.UseFont = true;
+ this.gv_fprecision.Caption = "绮惧害";
+ this.gv_fprecision.FieldName = "fprecision";
+ this.gv_fprecision.MinWidth = 50;
+ this.gv_fprecision.Name = "gv_fprecision";
+ this.gv_fprecision.Tag = "query_a.fprecision";
+ this.gv_fprecision.Visible = true;
+ this.gv_fprecision.VisibleIndex = 6;
+ this.gv_fprecision.Width = 91;
//
- // txt_newunit
+ // gv_fdescription
//
- this.txt_newunit.IsReadly = false;
- this.txt_newunit.Location = new System.Drawing.Point(123, 200);
- this.txt_newunit.Name = "txt_newunit";
- this.txt_newunit.Size = new System.Drawing.Size(150, 28);
- this.txt_newunit.TabIndex = 300;
+ this.gv_fdescription.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fdescription.AppearanceCell.Options.UseFont = true;
+ this.gv_fdescription.Caption = "鎻忚堪";
+ this.gv_fdescription.FieldName = "fdescription";
+ this.gv_fdescription.MinWidth = 50;
+ this.gv_fdescription.Name = "gv_fdescription";
+ this.gv_fdescription.Tag = "query_a.fdescription";
+ this.gv_fdescription.Visible = true;
+ this.gv_fdescription.VisibleIndex = 7;
+ this.gv_fdescription.Width = 91;
//
- // txt_oldunit
+ // gv_fforbidstatus
//
- this.txt_oldunit.IsReadly = false;
- this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
- this.txt_oldunit.Name = "txt_oldunit";
- this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
- this.txt_oldunit.TabIndex = 299;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(53, 373);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(104, 373);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
+ this.gv_fforbidstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
+ this.gv_fforbidstatus.Caption = "绂佺敤鐘舵��";
+ this.gv_fforbidstatus.FieldName = "fforbidstatus";
+ this.gv_fforbidstatus.MinWidth = 50;
+ this.gv_fforbidstatus.Name = "gv_fforbidstatus";
+ this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
+ this.gv_fforbidstatus.Visible = true;
+ this.gv_fforbidstatus.VisibleIndex = 8;
+ this.gv_fforbidstatus.Width = 91;
//
// gridColumn1
//
@@ -684,6 +363,467 @@
this.gridColumn1.VisibleIndex = 9;
this.gridColumn1.Width = 180;
//
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(970, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(970, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(970, 570);
+ this.splitMx1.SplitterPosition = 155;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_newunit);
+ this.layoutMx1.Controls.Add(this.txt_fcurrentunitid);
+ this.layoutMx1.Controls.Add(this.txt_fdescription);
+ this.layoutMx1.Controls.Add(this.txt_fbaseunit);
+ this.layoutMx1.Controls.Add(this.txt_newqty);
+ this.layoutMx1.Controls.Add(this.txt_oldunit);
+ this.layoutMx1.Controls.Add(this.txt_fforbidstatus);
+ this.layoutMx1.Controls.Add(this.txt_id);
+ this.layoutMx1.Controls.Add(this.txt_fnumber);
+ this.layoutMx1.Controls.Add(this.txt_fname);
+ this.layoutMx1.Controls.Add(this.txt_oldqty);
+ this.layoutMx1.Controls.Add(this.txt_fprecision);
+ this.layoutMx1.Controls.Add(this.txt_funitgroupid);
+ this.layoutMx1.Controls.Add(this.txt_froundtype);
+ this.layoutMx1.Controls.Add(this.txt_fconvertnumerator);
+ this.layoutMx1.Controls.Add(this.txt_fconvertdenominator);
+ 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(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(970, 155);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // 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.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
+ this.layoutControlItem13,
+ this.layoutControlItem14,
+ this.layoutControlItem15,
+ this.layoutControlItem16});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(970, 155);
+ this.Root.TextVisible = false;
+ //
+ // txt_fcurrentunitid
+ //
+ this.txt_fcurrentunitid.IsReadly = false;
+ this.txt_fcurrentunitid.Location = new System.Drawing.Point(114, 113);
+ this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
+ this.txt_fcurrentunitid.Size = new System.Drawing.Size(131, 28);
+ this.txt_fcurrentunitid.TabIndex = 302;
+ //
+ // txt_fbaseunit
+ //
+ this.txt_fbaseunit.IsReadly = false;
+ this.txt_fbaseunit.Location = new System.Drawing.Point(351, 79);
+ this.txt_fbaseunit.Name = "txt_fbaseunit";
+ this.txt_fbaseunit.Size = new System.Drawing.Size(131, 28);
+ this.txt_fbaseunit.TabIndex = 301;
+ //
+ // txt_newunit
+ //
+ this.txt_newunit.IsReadly = false;
+ this.txt_newunit.Location = new System.Drawing.Point(351, 113);
+ this.txt_newunit.Name = "txt_newunit";
+ this.txt_newunit.Size = new System.Drawing.Size(131, 28);
+ this.txt_newunit.TabIndex = 300;
+ //
+ // txt_oldunit
+ //
+ this.txt_oldunit.IsReadly = false;
+ this.txt_oldunit.Location = new System.Drawing.Point(114, 79);
+ this.txt_oldunit.Name = "txt_oldunit";
+ this.txt_oldunit.Size = new System.Drawing.Size(131, 28);
+ this.txt_oldunit.TabIndex = 299;
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(708, 105);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(229, 28);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_fforbidstatus
+ //
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(825, 45);
+ this.txt_fforbidstatus.Name = "txt_fforbidstatus";
+ this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
+ this.txt_fforbidstatus.Size = new System.Drawing.Size(133, 28);
+ this.txt_fforbidstatus.StyleController = this.layoutMx1;
+ this.txt_fforbidstatus.TabIndex = 298;
+ //
+ // txt_fdescription
+ //
+ this.txt_fdescription.Location = new System.Drawing.Point(825, 113);
+ this.txt_fdescription.Name = "txt_fdescription";
+ this.txt_fdescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
+ this.txt_fdescription.Size = new System.Drawing.Size(133, 28);
+ this.txt_fdescription.StyleController = this.layoutMx1;
+ this.txt_fdescription.TabIndex = 291;
+ //
+ // txt_fprecision
+ //
+ this.txt_fprecision.Location = new System.Drawing.Point(351, 45);
+ this.txt_fprecision.Name = "txt_fprecision";
+ this.txt_fprecision.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fprecision.Properties.Appearance.Options.UseFont = true;
+ this.txt_fprecision.Size = new System.Drawing.Size(131, 28);
+ this.txt_fprecision.StyleController = this.layoutMx1;
+ this.txt_fprecision.TabIndex = 285;
+ //
+ // txt_froundtype
+ //
+ this.txt_froundtype.Location = new System.Drawing.Point(588, 12);
+ this.txt_froundtype.Name = "txt_froundtype";
+ this.txt_froundtype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_froundtype.Properties.Appearance.Options.UseFont = true;
+ this.txt_froundtype.Size = new System.Drawing.Size(131, 28);
+ this.txt_froundtype.StyleController = this.layoutMx1;
+ this.txt_froundtype.TabIndex = 280;
+ //
+ // txt_fconvertnumerator
+ //
+ this.txt_fconvertnumerator.Location = new System.Drawing.Point(588, 45);
+ this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
+ this.txt_fconvertnumerator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
+ this.txt_fconvertnumerator.Size = new System.Drawing.Size(131, 28);
+ this.txt_fconvertnumerator.StyleController = this.layoutMx1;
+ this.txt_fconvertnumerator.TabIndex = 267;
+ //
+ // txt_fconvertdenominator
+ //
+ this.txt_fconvertdenominator.Location = new System.Drawing.Point(588, 79);
+ this.txt_fconvertdenominator.Name = "txt_fconvertdenominator";
+ this.txt_fconvertdenominator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fconvertdenominator.Properties.Appearance.Options.UseFont = true;
+ this.txt_fconvertdenominator.Size = new System.Drawing.Size(131, 28);
+ this.txt_fconvertdenominator.StyleController = this.layoutMx1;
+ this.txt_fconvertdenominator.TabIndex = 258;
+ //
+ // txt_funitgroupid
+ //
+ this.txt_funitgroupid.Location = new System.Drawing.Point(825, 12);
+ this.txt_funitgroupid.Name = "txt_funitgroupid";
+ this.txt_funitgroupid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
+ this.txt_funitgroupid.Size = new System.Drawing.Size(133, 28);
+ this.txt_funitgroupid.StyleController = this.layoutMx1;
+ this.txt_funitgroupid.TabIndex = 252;
+ //
+ // txt_fname
+ //
+ this.txt_fname.Location = new System.Drawing.Point(351, 12);
+ this.txt_fname.Name = "txt_fname";
+ this.txt_fname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fname.Properties.Appearance.Options.UseFont = true;
+ this.txt_fname.Size = new System.Drawing.Size(131, 28);
+ this.txt_fname.StyleController = this.layoutMx1;
+ this.txt_fname.TabIndex = 247;
+ //
+ // txt_fnumber
+ //
+ this.txt_fnumber.Location = new System.Drawing.Point(114, 45);
+ this.txt_fnumber.Name = "txt_fnumber";
+ this.txt_fnumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
+ this.txt_fnumber.Size = new System.Drawing.Size(131, 28);
+ this.txt_fnumber.StyleController = this.layoutMx1;
+ this.txt_fnumber.TabIndex = 243;
+ //
+ // txt_newqty
+ //
+ this.txt_newqty.Location = new System.Drawing.Point(588, 113);
+ this.txt_newqty.Name = "txt_newqty";
+ this.txt_newqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_newqty.Properties.Appearance.Options.UseFont = true;
+ this.txt_newqty.Size = new System.Drawing.Size(131, 28);
+ this.txt_newqty.StyleController = this.layoutMx1;
+ this.txt_newqty.TabIndex = 219;
+ //
+ // txt_oldqty
+ //
+ this.txt_oldqty.Location = new System.Drawing.Point(825, 79);
+ this.txt_oldqty.Name = "txt_oldqty";
+ this.txt_oldqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_oldqty.Properties.Appearance.Options.UseFont = true;
+ this.txt_oldqty.Size = new System.Drawing.Size(133, 28);
+ this.txt_oldqty.StyleController = this.layoutMx1;
+ this.txt_oldqty.TabIndex = 217;
+ //
+ // txt_id
+ //
+ this.txt_id.Location = new System.Drawing.Point(114, 12);
+ this.txt_id.Name = "txt_id";
+ this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_id.Properties.Appearance.Options.UseFont = true;
+ this.txt_id.Size = new System.Drawing.Size(131, 28);
+ this.txt_id.StyleController = this.layoutMx1;
+ this.txt_id.TabIndex = 211;
+ //
+ // 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(237, 33);
+ this.layoutControlItem1.Text = "鍗曚綅ID";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_fnumber;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem2.Text = "鍗曚綅缂栫爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_oldunit;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 67);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem3.Text = "鍘熷崟浣�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fname;
+ this.layoutControlItem4.Location = new System.Drawing.Point(237, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(237, 33);
+ this.layoutControlItem4.Text = "鍗曚綅鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_fprecision;
+ this.layoutControlItem5.Location = new System.Drawing.Point(237, 33);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem5.Text = "鍗曚綅绮惧害";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fbaseunit;
+ this.layoutControlItem6.Location = new System.Drawing.Point(237, 67);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem6.Text = "鍩哄噯鍗曚綅";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_froundtype;
+ this.layoutControlItem7.Location = new System.Drawing.Point(474, 0);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(237, 33);
+ this.layoutControlItem7.Text = "鑸嶅叆绫诲瀷";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fconvertnumerator;
+ this.layoutControlItem8.Location = new System.Drawing.Point(474, 33);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem8.Text = "鎹㈢畻鍒嗗瓙";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fconvertdenominator;
+ this.layoutControlItem9.Location = new System.Drawing.Point(474, 67);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem9.Text = "鎹㈢畻鍒嗘瘝";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_funitgroupid;
+ this.layoutControlItem10.Location = new System.Drawing.Point(711, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(239, 33);
+ this.layoutControlItem10.Text = "鎵�灞炵粍鍒�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_fforbidstatus;
+ this.layoutControlItem11.Location = new System.Drawing.Point(711, 33);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(239, 34);
+ this.layoutControlItem11.Text = "绂佺敤鐘舵��";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_oldqty;
+ this.layoutControlItem12.Location = new System.Drawing.Point(711, 67);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(239, 34);
+ this.layoutControlItem12.Text = "鍘熷崟浣嶆暟閲�";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_fcurrentunitid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 101);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem13.Text = "褰撳墠鍗曚綅";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_newunit;
+ this.layoutControlItem14.Location = new System.Drawing.Point(237, 101);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem14.Text = "鐩殑鍗曚綅";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_newqty;
+ this.layoutControlItem15.Location = new System.Drawing.Point(474, 101);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem15.Text = "鐩殑鍗曚綅鏁伴噺";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(696, 96);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(233, 32);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fdescription;
+ this.layoutControlItem16.Location = new System.Drawing.Point(711, 101);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(239, 34);
+ this.layoutControlItem16.Text = "鍗曚綅鎻忚堪";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_MesUnit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -693,6 +833,25 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesUnit";
this.Text = "鍗曚綅淇℃伅";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit();
@@ -705,85 +864,81 @@
((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fname;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_funitgroupid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertdenominator;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertnumerator;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_froundtype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fprecision;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fdescription;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
-private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
-private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
-
-private DevExpress.XtraEditors.LabelControl lb_fdescription;
-private DevExpress.XtraEditors.TextEdit txt_fdescription;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fdescription;
-
-private DevExpress.XtraEditors.LabelControl lb_fprecision;
-private DevExpress.XtraEditors.TextEdit txt_fprecision;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fprecision;
-
-private DevExpress.XtraEditors.LabelControl lb_froundtype;
-private DevExpress.XtraEditors.TextEdit txt_froundtype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_froundtype;
-
-private DevExpress.XtraEditors.LabelControl lb_fbaseunit;
-
-private DevExpress.XtraEditors.LabelControl lb_fconvertnumerator;
-private DevExpress.XtraEditors.TextEdit txt_fconvertnumerator;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertnumerator;
-
-private DevExpress.XtraEditors.LabelControl lb_fcurrentunitid;
-
-private DevExpress.XtraEditors.LabelControl lb_fconvertdenominator;
-private DevExpress.XtraEditors.TextEdit txt_fconvertdenominator;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertdenominator;
-
-private DevExpress.XtraEditors.LabelControl lb_funitgroupid;
-private DevExpress.XtraEditors.TextEdit txt_funitgroupid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_funitgroupid;
-
-private DevExpress.XtraEditors.LabelControl lb_fname;
-private DevExpress.XtraEditors.TextEdit txt_fname;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fname;
-
-private DevExpress.XtraEditors.LabelControl lb_fnumber;
-private DevExpress.XtraEditors.TextEdit txt_fnumber;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
-
-private DevExpress.XtraEditors.LabelControl lb_newqty;
-private DevExpress.XtraEditors.TextEdit txt_newqty;
-
-private DevExpress.XtraEditors.LabelControl lb_oldqty;
-private DevExpress.XtraEditors.TextEdit txt_oldqty;
-
-private DevExpress.XtraEditors.LabelControl lb_newunit;
-
-private DevExpress.XtraEditors.LabelControl lb_oldunit;
-
-private DevExpress.XtraEditors.LabelControl lb_id;
-private DevExpress.XtraEditors.TextEdit txt_id;
- private UserControl.UcLookUnit txt_oldunit;
- private UserControl.UcLookUnit txt_newunit;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
private UserControl.UcLookUnit txt_fcurrentunitid;
private UserControl.UcLookUnit txt_fbaseunit;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private UserControl.UcLookUnit txt_newunit;
+ private UserControl.UcLookUnit txt_oldunit;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
+ private DevExpress.XtraEditors.TextEdit txt_fdescription;
+ private DevExpress.XtraEditors.TextEdit txt_fprecision;
+ private DevExpress.XtraEditors.TextEdit txt_froundtype;
+ private DevExpress.XtraEditors.TextEdit txt_fconvertnumerator;
+ private DevExpress.XtraEditors.TextEdit txt_fconvertdenominator;
+ private DevExpress.XtraEditors.TextEdit txt_funitgroupid;
+ private DevExpress.XtraEditors.TextEdit txt_fname;
+ private DevExpress.XtraEditors.TextEdit txt_fnumber;
+ private DevExpress.XtraEditors.TextEdit txt_newqty;
+ private DevExpress.XtraEditors.TextEdit txt_oldqty;
+ private DevExpress.XtraEditors.TextEdit txt_id;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ 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.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index c44492b..dfb12e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -20,9 +20,7 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -121,16 +119,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -176,7 +174,7 @@
{
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
index 66e45a1..f1f25fe 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -28,26 +28,37 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
- DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
+ DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition 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();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.account = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,45 +74,53 @@
this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.txt_staffId = new Gs.DevApp.UserControl.UcLookStaff();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_account = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.MemoEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.txt_address = new DevExpress.XtraEditors.TextEdit();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_tel = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txt_email = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
- this.tipPwd = new DevExpress.XtraEditors.LabelControl();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_password = new DevExpress.XtraEditors.TextEdit();
- this.lbPwd = new DevExpress.XtraEditors.LabelControl();
this.txt_userName = new DevExpress.XtraEditors.TextEdit();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ 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.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).BeginInit();
@@ -109,6 +128,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).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.txt_isStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// isLocked
@@ -143,20 +173,59 @@
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
//
- // gcMain
+ // xtraTabControl1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1004, 681);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1002, 649);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1002, 649);
+ this.split1.SplitterPosition = 637;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3,
this.repositoryItemButtonEdit4});
- this.gcMain.Size = new System.Drawing.Size(1002, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gcMain1.Size = new System.Drawing.Size(1002, 598);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -179,15 +248,15 @@
this.gridColumn4,
this.gridColumn1,
this.gridColumn5});
- gridFormatRule1.Column = this.isLocked;
- gridFormatRule1.Name = "Format0";
- formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
- formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
- formatConditionRuleExpression1.Expression = "[isStatusTxt] = [绂佺敤]";
- formatConditionRuleExpression1.PredefinedName = "Red Text";
- gridFormatRule1.Rule = formatConditionRuleExpression1;
- this.gridView1.FormatRules.Add(gridFormatRule1);
- this.gridView1.GridControl = this.gcMain;
+ gridFormatRule2.Column = this.isLocked;
+ gridFormatRule2.Name = "Format0";
+ formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Red;
+ formatConditionRuleExpression2.Appearance.Options.UseForeColor = true;
+ formatConditionRuleExpression2.Expression = "[isStatusTxt] = [绂佺敤]";
+ formatConditionRuleExpression2.PredefinedName = "Red Text";
+ gridFormatRule2.Rule = formatConditionRuleExpression2;
+ this.gridView1.FormatRules.Add(gridFormatRule2);
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -311,10 +380,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "PDA椤甸潰", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "PDA椤甸潰", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -335,10 +404,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.projectfile_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.projectfile_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浠撳簱", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浠撳簱", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -356,345 +425,360 @@
// repositoryItemButtonEdit4
//
this.repositoryItemButtonEdit4.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鎵撳嵃鏈�", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鎵撳嵃鏈�", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick);
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1004, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Location = new System.Drawing.Point(0, 598);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.Size = new System.Drawing.Size(1002, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
- this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1002, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1002, 649);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
- // panel1
+ // splitMx1
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_isStatus);
- this.panel1.Controls.Add(this.txt_staffId);
- this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.labelControl10);
- this.panel1.Controls.Add(this.txt_account);
- this.panel1.Controls.Add(this.labelControl8);
- this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.labelControl7);
- this.panel1.Controls.Add(this.txt_address);
- this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.txt_tel);
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_email);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.tipPwd);
- this.panel1.Controls.Add(this.labelControl9);
- this.panel1.Controls.Add(this.labelControl6);
- this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.txt_password);
- this.panel1.Controls.Add(this.lbPwd);
- this.panel1.Controls.Add(this.txt_userName);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(795, 426);
- this.panel1.TabIndex = 1;
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
//
- // txt_isStatus
+ // splitMx1.splitMx1_Panel1
//
- this.txt_isStatus.Location = new System.Drawing.Point(125, 286);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Properties.Caption = "";
- this.txt_isStatus.Size = new System.Drawing.Size(94, 24);
- this.txt_isStatus.TabIndex = 227;
- this.txt_isStatus.Tag = "moren.true";
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.splitMx1_Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1002, 649);
+ this.splitMx1.SplitterPosition = 140;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_staffId);
+ this.layoutMx1.Controls.Add(this.txt_account);
+ this.layoutMx1.Controls.Add(this.txt_password);
+ this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_userName);
+ this.layoutMx1.Controls.Add(this.txt_email);
+ this.layoutMx1.Controls.Add(this.txt_address);
+ this.layoutMx1.Controls.Add(this.txt_tel);
+ this.layoutMx1.Controls.Add(this.txt_isStatus);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem10});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1002, 140);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // 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.layoutControlItem9});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ 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;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.Root.Size = new System.Drawing.Size(981, 148);
+ this.Root.TextVisible = false;
//
// txt_staffId
//
this.txt_staffId.IsReadly = false;
- this.txt_staffId.Location = new System.Drawing.Point(473, 48);
+ this.txt_staffId.Location = new System.Drawing.Point(564, 12);
this.txt_staffId.Name = "txt_staffId";
- this.txt_staffId.Size = new System.Drawing.Size(274, 30);
+ this.txt_staffId.Size = new System.Drawing.Size(164, 28);
this.txt_staffId.TabIndex = 135;
- //
- // labelControl4
- //
- this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(473, 20);
- this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl4.Name = "labelControl4";
- this.labelControl4.Size = new System.Drawing.Size(85, 21);
- this.labelControl4.TabIndex = 134;
- this.labelControl4.Text = "鍏宠仈鍛樺伐锛�";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(61, 388);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // labelControl10
- //
- this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl10.Appearance.Options.UseForeColor = true;
- this.labelControl10.Location = new System.Drawing.Point(434, 29);
- this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(8, 18);
- this.labelControl10.TabIndex = 129;
- this.labelControl10.Text = "*";
//
// txt_account
//
- this.txt_account.Location = new System.Drawing.Point(125, 16);
+ this.txt_account.Location = new System.Drawing.Point(84, 12);
this.txt_account.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_account.Name = "txt_account";
this.txt_account.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_account.Properties.Appearance.Options.UseFont = true;
- this.txt_account.Size = new System.Drawing.Size(297, 28);
+ this.txt_account.Size = new System.Drawing.Size(164, 28);
+ this.txt_account.StyleController = this.layoutMx1;
this.txt_account.TabIndex = 128;
- //
- // labelControl8
- //
- this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl8.Appearance.Options.UseFont = true;
- this.labelControl8.Location = new System.Drawing.Point(36, 20);
- this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(85, 21);
- this.labelControl8.TabIndex = 127;
- this.labelControl8.Text = "鐧诲綍璐﹀彿锛�";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(125, 216);
+ this.txt_remark.Location = new System.Drawing.Point(324, 76);
this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txt_remark.Size = new System.Drawing.Size(297, 68);
+ this.txt_remark.Size = new System.Drawing.Size(164, 28);
+ this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 126;
- //
- // labelControl7
- //
- this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(70, 216);
- this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(51, 21);
- this.labelControl7.TabIndex = 125;
- this.labelControl7.Text = "澶囨敞锛�";
//
// txt_address
//
- this.txt_address.Location = new System.Drawing.Point(125, 182);
+ this.txt_address.Location = new System.Drawing.Point(324, 44);
this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_address.Name = "txt_address";
this.txt_address.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_address.Properties.Appearance.Options.UseFont = true;
- this.txt_address.Size = new System.Drawing.Size(297, 28);
+ this.txt_address.Size = new System.Drawing.Size(164, 28);
+ this.txt_address.StyleController = this.layoutMx1;
this.txt_address.TabIndex = 124;
- //
- // labelControl3
- //
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(36, 186);
- this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(85, 21);
- this.labelControl3.TabIndex = 123;
- this.labelControl3.Text = "浣忓鍦板潃锛�";
//
// txt_tel
//
- this.txt_tel.Location = new System.Drawing.Point(125, 149);
+ this.txt_tel.Location = new System.Drawing.Point(324, 12);
this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_tel.Name = "txt_tel";
this.txt_tel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tel.Properties.Appearance.Options.UseFont = true;
- this.txt_tel.Size = new System.Drawing.Size(297, 28);
+ this.txt_tel.Size = new System.Drawing.Size(164, 28);
+ this.txt_tel.StyleController = this.layoutMx1;
this.txt_tel.TabIndex = 122;
- //
- // labelControl1
- //
- this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(70, 153);
- this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(51, 21);
- this.labelControl1.TabIndex = 121;
- this.labelControl1.Text = "鐢佃瘽锛�";
//
// txt_email
//
- this.txt_email.Location = new System.Drawing.Point(125, 115);
+ this.txt_email.Location = new System.Drawing.Point(84, 108);
this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_email.Name = "txt_email";
this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_email.Properties.Appearance.Options.UseFont = true;
- this.txt_email.Size = new System.Drawing.Size(297, 28);
+ this.txt_email.Size = new System.Drawing.Size(164, 28);
+ this.txt_email.StyleController = this.layoutMx1;
this.txt_email.TabIndex = 120;
//
// lbGuid
//
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 388);
+ this.lbGuid.Location = new System.Drawing.Point(492, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.Size = new System.Drawing.Size(236, 28);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
- //
- // tipPwd
- //
- this.tipPwd.Appearance.ForeColor = System.Drawing.Color.Red;
- this.tipPwd.Appearance.Options.UseForeColor = true;
- this.tipPwd.Location = new System.Drawing.Point(434, 54);
- this.tipPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.tipPwd.Name = "tipPwd";
- this.tipPwd.Size = new System.Drawing.Size(8, 18);
- this.tipPwd.TabIndex = 107;
- this.tipPwd.Text = "*";
- //
- // labelControl9
- //
- this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(434, 82);
- this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(8, 18);
- this.labelControl9.TabIndex = 108;
- this.labelControl9.Text = "*";
- //
- // labelControl6
- //
- this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(70, 119);
- this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl6.Name = "labelControl6";
- this.labelControl6.Size = new System.Drawing.Size(51, 21);
- this.labelControl6.TabIndex = 103;
- this.labelControl6.Text = "閭锛�";
- //
- // labelControl5
- //
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(36, 288);
- this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(85, 21);
- this.labelControl5.TabIndex = 101;
- this.labelControl5.Text = "鍚敤鐘舵�侊細";
//
// txt_password
//
- this.txt_password.Location = new System.Drawing.Point(125, 49);
+ this.txt_password.Location = new System.Drawing.Point(84, 44);
this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_password.Name = "txt_password";
this.txt_password.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_password.Properties.Appearance.Options.UseFont = true;
- this.txt_password.Size = new System.Drawing.Size(297, 28);
+ this.txt_password.Size = new System.Drawing.Size(164, 28);
+ this.txt_password.StyleController = this.layoutMx1;
this.txt_password.TabIndex = 99;
- //
- // lbPwd
- //
- this.lbPwd.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lbPwd.Appearance.Options.UseFont = true;
- this.lbPwd.Location = new System.Drawing.Point(36, 53);
- this.lbPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lbPwd.Name = "lbPwd";
- this.lbPwd.Size = new System.Drawing.Size(85, 21);
- this.lbPwd.TabIndex = 98;
- this.lbPwd.Text = "鍒濆瀵嗙爜锛�";
//
// txt_userName
//
- this.txt_userName.Location = new System.Drawing.Point(125, 82);
+ this.txt_userName.Location = new System.Drawing.Point(84, 76);
this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_userName.Name = "txt_userName";
this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_userName.Properties.Appearance.Options.UseFont = true;
- this.txt_userName.Size = new System.Drawing.Size(297, 28);
+ this.txt_userName.Size = new System.Drawing.Size(164, 28);
+ this.txt_userName.StyleController = this.layoutMx1;
this.txt_userName.TabIndex = 95;
//
- // labelControl2
+ // layoutControlItem1
//
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(36, 86);
- this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(85, 21);
- this.labelControl2.TabIndex = 94;
- this.labelControl2.Text = "璐﹀彿鍚嶇О锛�";
+ this.layoutControlItem1.Control = this.txt_account;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem1.Text = "鐧诲綍璐﹀彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_password;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem2.Text = "鍒濆瀵嗙爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_userName;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem3.Text = "璐﹀彿鍚嶇О";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_email;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem4.Text = "閭";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_tel;
+ this.layoutControlItem5.Location = new System.Drawing.Point(240, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem5.Text = "鐢佃瘽";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_address;
+ this.layoutControlItem6.Location = new System.Drawing.Point(240, 32);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem6.Text = "浣忓鍦板潃";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_remark;
+ this.layoutControlItem7.Location = new System.Drawing.Point(240, 64);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem7.Text = "澶囨敞";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_isStatus
+ //
+ this.txt_isStatus.Location = new System.Drawing.Point(252, 108);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Properties.Caption = "鍚敤鐘舵��";
+ this.txt_isStatus.Size = new System.Drawing.Size(236, 24);
+ this.txt_isStatus.StyleController = this.layoutMx1;
+ this.txt_isStatus.TabIndex = 129;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_isStatus;
+ this.layoutControlItem8.Location = new System.Drawing.Point(240, 96);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem8.Text = "鍚敤鐘舵��";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem8.TextVisible = false;
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_staffId;
+ this.layoutControlItem9.Location = new System.Drawing.Point(480, 0);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem9.Text = "鍏宠仈鍛樺伐";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.lbGuid;
+ this.layoutControlItem10.Location = new System.Drawing.Point(480, 96);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(240, 32);
+ this.layoutControlItem10.Text = "lbGuid";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
//
// Frm_UserBind
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1004, 682);
+ this.ClientSize = new System.Drawing.Size(1004, 761);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_UserBind";
- this.Text = "鐢ㄦ埛绠＄悊";
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ this.Text = "鐢ㄦ埛缁戝畾";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).EndInit();
@@ -702,6 +786,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).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.txt_isStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
@@ -709,50 +804,50 @@
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn userName;
- private DevExpress.XtraGrid.Columns.GridColumn createTime;
- private DevExpress.XtraGrid.Columns.GridColumn lastLoginTime;
- private DevExpress.XtraGrid.Columns.GridColumn isLocked;
- private DevExpress.XtraGrid.Columns.GridColumn loginCounter;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private DevExpress.XtraEditors.LabelControl labelControl10;
- private DevExpress.XtraEditors.TextEdit txt_account;
- private DevExpress.XtraEditors.LabelControl labelControl8;
- private DevExpress.XtraEditors.MemoEdit txt_remark;
- private DevExpress.XtraEditors.LabelControl labelControl7;
- private DevExpress.XtraEditors.TextEdit txt_address;
- private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.TextEdit txt_tel;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.TextEdit txt_email;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl tipPwd;
- private DevExpress.XtraEditors.LabelControl labelControl9;
- private DevExpress.XtraEditors.LabelControl labelControl6;
- private DevExpress.XtraEditors.TextEdit txt_password;
- private DevExpress.XtraEditors.LabelControl lbPwd;
- private DevExpress.XtraEditors.TextEdit txt_userName;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraGrid.Columns.GridColumn account;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
- private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
- private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn isLocked;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraEditors.LabelControl labelControl4;
- private UserControl.UcLookStaff txt_staffId;
+ private DevExpress.XtraGrid.Columns.GridColumn account;
+ private DevExpress.XtraGrid.Columns.GridColumn userName;
+ private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn createTime;
+ private DevExpress.XtraGrid.Columns.GridColumn lastLoginTime;
+ private DevExpress.XtraGrid.Columns.GridColumn loginCounter;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraEditors.CheckEdit txt_isStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private UserControl.UcLookStaff txt_staffId;
+ private DevExpress.XtraEditors.TextEdit txt_account;
+ private DevExpress.XtraEditors.MemoEdit txt_remark;
+ private DevExpress.XtraEditors.TextEdit txt_address;
+ private DevExpress.XtraEditors.TextEdit txt_tel;
+ private DevExpress.XtraEditors.TextEdit txt_email;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_password;
+ private DevExpress.XtraEditors.TextEdit txt_userName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraEditors.CheckEdit txt_isStatus;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index 75e5837..f95a8a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -25,9 +25,7 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -127,16 +125,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -177,10 +175,7 @@
{
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
- txt_account.Enabled = txt_password.Enabled =
- txt_password.Visible =
- lbPwd.Visible = tipPwd.Visible = false;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
index 36facfd..1aa93d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
@@ -36,7 +36,10 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.account = new DevExpress.XtraGrid.Columns.GridColumn();
this.userName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -46,15 +49,18 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -73,18 +79,56 @@
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
//
- // gcMain
+ // xtraTabControl1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1004, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1002, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit4});
- this.gcMain.Size = new System.Drawing.Size(1002, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gcMain1.Size = new System.Drawing.Size(1002, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -109,7 +153,7 @@
formatConditionRuleExpression1.PredefinedName = "Red Text";
gridFormatRule1.Rule = formatConditionRuleExpression1;
this.gridView1.FormatRules.Add(gridFormatRule1);
- this.gridView1.GridControl = this.gcMain;
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -204,35 +248,16 @@
this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick);
//
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1004, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
- //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ 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;
this.pageBar1.Size = new System.Drawing.Size(1002, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// Frm_UserBindLst
@@ -243,13 +268,18 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_UserBindLst";
- this.Text = "鐢ㄦ埛绠＄悊";
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
+ this.Text = "鐢ㄦ埛缁戝畾";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
this.ResumeLayout(false);
}
@@ -257,18 +287,19 @@
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn userName;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn account;
+ private DevExpress.XtraGrid.Columns.GridColumn userName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+ private UserControls.Data.UcPageBar pageBar1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
index 98c2a16..5c284ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
@@ -21,9 +21,7 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -123,16 +121,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
index 67afb21..3e78049 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
@@ -205,7 +205,7 @@
this.btnIn.AppearancePressed.BackColor = System.Drawing.Color.White;
this.btnIn.AppearancePressed.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
- this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boreport2_16x16;
this.btnIn.Location = new System.Drawing.Point(920, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 00a7763..a506fbe 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1753,6 +1753,7 @@
<None Include="Resources\selectvaluespivottable_16x16.png" />
<None Include="Resources\splinearea_32x32.png" />
<None Include="Resources\stackedsplinearea_32x32.png" />
+ <None Include="Resources\boreport2_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 8800591..61bdca4 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -303,6 +303,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap boreport2_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("boreport2_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap bouser_16x16 {
get {
object obj = ResourceManager.GetObject("bouser_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 378ad79..a5bfb40 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,10 +124,8 @@
<data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -143,8 +141,8 @@
<data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+ <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -153,16 +151,6 @@
</data>
<data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -242,6 +230,9 @@
<data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -275,11 +266,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -288,8 +274,18 @@
<data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -316,13 +312,11 @@
<value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -332,16 +326,11 @@
<data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -349,19 +338,14 @@
<data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -517,11 +501,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -554,8 +533,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -600,6 +579,11 @@
<data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -607,6 +591,9 @@
<value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -636,6 +623,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="stackedsplinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\stackedsplinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -646,6 +636,9 @@
</data>
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
@@ -665,16 +658,14 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodetails_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodetails_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -684,10 +675,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -741,9 +730,6 @@
<data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -784,14 +770,23 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -810,8 +805,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -838,8 +835,10 @@
<data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -851,8 +850,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -860,16 +861,18 @@
<data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -896,16 +899,16 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -926,13 +929,15 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
+ <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -943,18 +948,16 @@
<data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -964,7 +967,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="stackedsplinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\stackedsplinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boreport2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boreport2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 45f9da6..65d36f0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -7,11 +7,9 @@
using System.Net;
using System.Text;
using System.Windows.Forms;
-using DevExpress.Utils.Text.Internal;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
--
Gitblit v1.9.3