From dd7c9629d16d81bde03e42b3e9e984088f3e4d2c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 21 一月 2025 17:28:47 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 112 ++++++++++++++++++++-----------------------------------
1 files changed, 41 insertions(+), 71 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index a046f08..c355a45 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -32,8 +32,6 @@
private void InitializeComponent()
{
this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
- this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
@@ -42,7 +40,6 @@
this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fmanager = new DevExpress.XtraEditors.LabelControl();
this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
- this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depextr4 = new DevExpress.XtraEditors.LabelControl();
this.txt_depextr4 = new DevExpress.XtraEditors.TextEdit();
this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,6 +64,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -74,7 +72,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
@@ -100,33 +97,14 @@
this.gv_parentId.AppearanceCell.Options.UseFont = true;
this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
this.gv_parentId.FieldName = "fParentID";
- this.gv_parentId.MinWidth = 150;
+ this.gv_parentId.MinWidth = 50;
this.gv_parentId.Name = "gv_parentId";
this.gv_parentId.OptionsColumn.AllowEdit = false;
this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_parentId.Tag = "query_c.Departmentname";
this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 10;
+ this.gv_parentId.VisibleIndex = 8;
this.gv_parentId.Width = 150;
- //
- // lb_materialProperti
- //
- this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_materialProperti.Appearance.Options.UseFont = true;
- this.lb_materialProperti.Location = new System.Drawing.Point(270, 87);
- this.lb_materialProperti.Name = "lb_materialProperti";
- this.lb_materialProperti.Size = new System.Drawing.Size(73, 21);
- this.lb_materialProperti.TabIndex = 291;
- this.lb_materialProperti.Text = "鐗╂枡灞炴�� ";
- //
- // txt_materialProperti
- //
- this.txt_materialProperti.Location = new System.Drawing.Point(349, 83);
- this.txt_materialProperti.Name = "txt_materialProperti";
- this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
- this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
- this.txt_materialProperti.TabIndex = 291;
//
// lb_productionWorkshop
//
@@ -178,7 +156,7 @@
this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 7;
this.gv_remark.Width = 94;
//
// gv_factory
@@ -187,7 +165,7 @@
this.gv_factory.AppearanceCell.Options.UseFont = true;
this.gv_factory.Caption = "浣跨敤缁勭粐";
this.gv_factory.FieldName = "fSubsidiary";
- this.gv_factory.MinWidth = 250;
+ this.gv_factory.MinWidth = 50;
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
@@ -216,21 +194,6 @@
this.txt_fmanager.Size = new System.Drawing.Size(150, 28);
this.txt_fmanager.TabIndex = 243;
//
- // gv_fmanager
- //
- this.gv_fmanager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmanager.AppearanceCell.Options.UseFont = true;
- this.gv_fmanager.Caption = "閮ㄩ棬缁忕悊";
- this.gv_fmanager.FieldName = "fmanager";
- this.gv_fmanager.MinWidth = 50;
- this.gv_fmanager.Name = "gv_fmanager";
- this.gv_fmanager.OptionsColumn.AllowEdit = false;
- this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_fmanager.Tag = "query_a.fmanager";
- this.gv_fmanager.Visible = true;
- this.gv_fmanager.VisibleIndex = 8;
- this.gv_fmanager.Width = 94;
- //
// lb_depextr4
//
this.lb_depextr4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -254,7 +217,7 @@
//
this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr4.AppearanceCell.Options.UseFont = true;
- this.gv_depextr4.Caption = "A鍚敤B绂佺敤";
+ this.gv_depextr4.Caption = "绂佺敤鐘舵��";
this.gv_depextr4.FieldName = "depextr4";
this.gv_depextr4.MinWidth = 50;
this.gv_depextr4.Name = "gv_depextr4";
@@ -262,8 +225,8 @@
this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr4.Tag = "query_a.depextr4";
this.gv_depextr4.Visible = true;
- this.gv_depextr4.VisibleIndex = 7;
- this.gv_depextr4.Width = 94;
+ this.gv_depextr4.VisibleIndex = 6;
+ this.gv_depextr4.Width = 50;
//
// lb_depextr3
//
@@ -296,14 +259,14 @@
this.gv_depextr3.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr3.Tag = "query_a.depextr3";
this.gv_depextr3.Visible = true;
- this.gv_depextr3.VisibleIndex = 6;
+ this.gv_depextr3.VisibleIndex = 5;
this.gv_depextr3.Width = 94;
//
// lb_depextr2
//
this.lb_depextr2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depextr2.Appearance.Options.UseFont = true;
- this.lb_depextr2.Location = new System.Drawing.Point(526, 14);
+ this.lb_depextr2.Location = new System.Drawing.Point(274, 87);
this.lb_depextr2.Name = "lb_depextr2";
this.lb_depextr2.Size = new System.Drawing.Size(73, 21);
this.lb_depextr2.TabIndex = 222;
@@ -311,7 +274,7 @@
//
// txt_depextr2
//
- this.txt_depextr2.Location = new System.Drawing.Point(605, 14);
+ this.txt_depextr2.Location = new System.Drawing.Point(349, 83);
this.txt_depextr2.Name = "txt_depextr2";
this.txt_depextr2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depextr2.Properties.Appearance.Options.UseFont = true;
@@ -324,13 +287,13 @@
this.gv_depextr2.AppearanceCell.Options.UseFont = true;
this.gv_depextr2.Caption = "閮ㄩ棬鍒嗙粍";
this.gv_depextr2.FieldName = "depextr2";
- this.gv_depextr2.MinWidth = 100;
+ this.gv_depextr2.MinWidth = 50;
this.gv_depextr2.Name = "gv_depextr2";
this.gv_depextr2.OptionsColumn.AllowEdit = false;
this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr2.Tag = "query_a.depextr2";
this.gv_depextr2.Visible = true;
- this.gv_depextr2.VisibleIndex = 5;
+ this.gv_depextr2.VisibleIndex = 4;
this.gv_depextr2.Width = 100;
//
// lb_depextr1
@@ -358,13 +321,13 @@
this.gv_depextr1.AppearanceCell.Options.UseFont = true;
this.gv_depextr1.Caption = "閮ㄩ棬灞炴��";
this.gv_depextr1.FieldName = "depextr1";
- this.gv_depextr1.MinWidth = 100;
+ this.gv_depextr1.MinWidth = 50;
this.gv_depextr1.Name = "gv_depextr1";
this.gv_depextr1.OptionsColumn.AllowEdit = false;
this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr1.Tag = "query_a.depextr1";
this.gv_depextr1.Visible = true;
- this.gv_depextr1.VisibleIndex = 4;
+ this.gv_depextr1.VisibleIndex = 3;
this.gv_depextr1.Width = 100;
//
// lb_departmentname
@@ -392,13 +355,13 @@
this.gv_departmentname.AppearanceCell.Options.UseFont = true;
this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
this.gv_departmentname.FieldName = "departmentname";
- this.gv_departmentname.MinWidth = 150;
+ this.gv_departmentname.MinWidth = 50;
this.gv_departmentname.Name = "gv_departmentname";
this.gv_departmentname.OptionsColumn.AllowEdit = false;
this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentname.Tag = "query_a.departmentname";
this.gv_departmentname.Visible = true;
- this.gv_departmentname.VisibleIndex = 3;
+ this.gv_departmentname.VisibleIndex = 2;
this.gv_departmentname.Width = 150;
//
// lb_departmentcode
@@ -426,13 +389,13 @@
this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
this.gv_departmentcode.FieldName = "departmentcode";
- this.gv_departmentcode.MinWidth = 80;
+ this.gv_departmentcode.MinWidth = 50;
this.gv_departmentcode.Name = "gv_departmentcode";
this.gv_departmentcode.OptionsColumn.AllowEdit = false;
this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentcode.Tag = "query_a.departmentcode";
this.gv_departmentcode.Visible = true;
- this.gv_departmentcode.VisibleIndex = 2;
+ this.gv_departmentcode.VisibleIndex = 1;
this.gv_departmentcode.Width = 94;
//
// lb_departmentid
@@ -465,13 +428,12 @@
this.gv_departmentid.OptionsColumn.AllowEdit = false;
this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentid.Tag = "query_a.departmentid";
- this.gv_departmentid.Visible = true;
- this.gv_departmentid.VisibleIndex = 1;
this.gv_departmentid.Width = 94;
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -497,8 +459,11 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_factory,
this.gv_departmentid,
@@ -508,9 +473,9 @@
this.gv_depextr2,
this.gv_depextr3,
this.gv_depextr4,
- this.gv_fmanager,
this.gv_remark,
- this.gv_parentId});
+ this.gv_parentId,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -521,6 +486,17 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍚屾鏃堕棿";
+ this.gridColumn1.FieldName = "lastupdateDate";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "query_a.lastupdate_date";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.Width = 180;
//
// xtraTabControl1
//
@@ -540,7 +516,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(928, 424);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -558,17 +534,14 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(928, 424);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_materialProperti);
- this.panel1.Controls.Add(this.txt_materialProperti);
this.panel1.Controls.Add(this.lb_productionWorkshop);
this.panel1.Controls.Add(this.txt_productionWorkshop);
this.panel1.Controls.Add(this.lb_remark);
@@ -592,7 +565,7 @@
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(800, 262);
+ this.panel1.Size = new System.Drawing.Size(579, 262);
this.panel1.TabIndex = 1;
//
// labelControl11
@@ -622,7 +595,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Department";
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
+ this.Text = "閮ㄩ棬淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit();
@@ -657,9 +630,6 @@
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
- private DevExpress.XtraEditors.LabelControl lb_materialProperti;
- private DevExpress.XtraEditors.TextEdit txt_materialProperti;
-
private DevExpress.XtraEditors.LabelControl lb_productionWorkshop;
private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
@@ -670,7 +640,6 @@
private DevExpress.XtraEditors.LabelControl lb_fmanager;
private DevExpress.XtraEditors.TextEdit txt_fmanager;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;
private DevExpress.XtraEditors.LabelControl lb_depextr4;
private DevExpress.XtraEditors.TextEdit txt_depextr4;
@@ -699,5 +668,6 @@
private DevExpress.XtraEditors.LabelControl lb_departmentid;
private DevExpress.XtraEditors.TextEdit txt_departmentid;
private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3