From 122819b5dd643d82a730e549f99bd56fe90eed21 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 28 十一月 2024 12:30:25 +0800
Subject: [PATCH] 车间
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 66 --
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 6
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 84 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 8
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs | 82 +-
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 33
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs | 2
DevApp/Gs.DevApp/Properties/Resources.resx | 97 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 866 ++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 383 +++++-------
15 files changed, 764 insertions(+), 881 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index ae2dc82..be56205 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index f7dcc93..f675876 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -36,7 +36,6 @@
this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
- this.gv_productionWorkshop = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -46,10 +45,8 @@
this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_workshopName = new DevExpress.XtraEditors.LabelControl();
this.txt_workshopName = new DevExpress.XtraEditors.TextEdit();
- this.gv_workshopName = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl();
this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_workshopNo = 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();
@@ -115,7 +112,7 @@
this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_parentId.Tag = "query_c.Departmentname";
this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 13;
+ this.gv_parentId.VisibleIndex = 10;
this.gv_parentId.Width = 150;
//
// lb_materialProperti
@@ -156,21 +153,6 @@
this.txt_productionWorkshop.Size = new System.Drawing.Size(150, 28);
this.txt_productionWorkshop.TabIndex = 285;
//
- // gv_productionWorkshop
- //
- this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true;
- this.gv_productionWorkshop.Caption = "鐢熶骇杞﹂棿";
- this.gv_productionWorkshop.FieldName = "productionWorkshop";
- this.gv_productionWorkshop.MinWidth = 50;
- this.gv_productionWorkshop.Name = "gv_productionWorkshop";
- this.gv_productionWorkshop.OptionsColumn.AllowEdit = false;
- this.gv_productionWorkshop.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_productionWorkshop.Tag = "query_a.production_workshop";
- this.gv_productionWorkshop.Visible = true;
- this.gv_productionWorkshop.VisibleIndex = 12;
- this.gv_productionWorkshop.Width = 94;
- //
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -202,7 +184,7 @@
this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 11;
+ this.gv_remark.VisibleIndex = 9;
this.gv_remark.Width = 94;
//
// gv_factory
@@ -252,7 +234,7 @@
this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_fmanager.Tag = "query_a.fmanager";
this.gv_fmanager.Visible = true;
- this.gv_fmanager.VisibleIndex = 10;
+ this.gv_fmanager.VisibleIndex = 8;
this.gv_fmanager.Width = 94;
//
// lb_workshopName
@@ -274,21 +256,6 @@
this.txt_workshopName.Size = new System.Drawing.Size(150, 28);
this.txt_workshopName.TabIndex = 240;
//
- // gv_workshopName
- //
- this.gv_workshopName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workshopName.AppearanceCell.Options.UseFont = true;
- this.gv_workshopName.Caption = "杞﹂棿鍚�";
- this.gv_workshopName.FieldName = "workshopName";
- this.gv_workshopName.MinWidth = 150;
- this.gv_workshopName.Name = "gv_workshopName";
- this.gv_workshopName.OptionsColumn.AllowEdit = false;
- this.gv_workshopName.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_workshopName.Tag = "query_a.workshop_name";
- this.gv_workshopName.Visible = true;
- this.gv_workshopName.VisibleIndex = 9;
- this.gv_workshopName.Width = 150;
- //
// lb_workshopNo
//
this.lb_workshopNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -307,21 +274,6 @@
this.txt_workshopNo.Properties.Appearance.Options.UseFont = true;
this.txt_workshopNo.Size = new System.Drawing.Size(150, 28);
this.txt_workshopNo.TabIndex = 235;
- //
- // gv_workshopNo
- //
- this.gv_workshopNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workshopNo.AppearanceCell.Options.UseFont = true;
- this.gv_workshopNo.Caption = "杞﹂棿ID";
- this.gv_workshopNo.FieldName = "workshopNo";
- this.gv_workshopNo.MinWidth = 50;
- this.gv_workshopNo.Name = "gv_workshopNo";
- this.gv_workshopNo.OptionsColumn.AllowEdit = false;
- this.gv_workshopNo.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_workshopNo.Tag = "query_a.workshop_no";
- this.gv_workshopNo.Visible = true;
- this.gv_workshopNo.VisibleIndex = 8;
- this.gv_workshopNo.Width = 94;
//
// lb_depextr4
//
@@ -600,11 +552,8 @@
this.gv_depextr2,
this.gv_depextr3,
this.gv_depextr4,
- this.gv_workshopNo,
- this.gv_workshopName,
this.gv_fmanager,
this.gv_remark,
- this.gv_productionWorkshop,
this.gv_parentId});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -692,12 +641,12 @@
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, 370);
+ this.panel1.Size = new System.Drawing.Size(800, 262);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(61, 336);
+ this.labelControl11.Location = new System.Drawing.Point(69, 209);
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);
@@ -708,7 +657,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 336);
+ this.lbGuid.Location = new System.Drawing.Point(120, 209);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -764,7 +713,6 @@
private DevExpress.XtraEditors.LabelControl lb_productionWorkshop;
private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
- private DevExpress.XtraGrid.Columns.GridColumn gv_productionWorkshop;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -777,11 +725,9 @@
private DevExpress.XtraEditors.LabelControl lb_workshopName;
private DevExpress.XtraEditors.TextEdit txt_workshopName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workshopName;
private DevExpress.XtraEditors.LabelControl lb_workshopNo;
private DevExpress.XtraEditors.TextEdit txt_workshopNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workshopNo;
private DevExpress.XtraEditors.LabelControl lb_depextr4;
private DevExpress.XtraEditors.TextEdit txt_depextr4;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
index 6863978..76495c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
@@ -340,7 +340,7 @@
this.labelControl8.Name = "labelControl8";
this.labelControl8.Size = new System.Drawing.Size(85, 21);
this.labelControl8.TabIndex = 238;
- this.labelControl8.Text = "閫夋嫨浜х嚎锛�";
+ this.labelControl8.Text = "閫夋嫨杞﹂棿锛�";
//
// txt_workshopNo
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index f1f3fb0..538bebc 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -358,18 +358,18 @@
private void getTree()
{
- var pgq = new PageQueryModel(1, 999999, "workshop_no", "asc",
+ var pgq = new PageQueryModel(1, 999999, "departmentid", "asc",
"notree", " and is_Status=1");
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn = UtilityHelper.HttpPost("",
- "MesWorkshopManager/GetListPage", json);
+ "SysDepartmentManager/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
txt_workshopNo.Properties.DataSource = dt;
- txt_workshopNo.Properties.DisplayMember = "name"; // 鏄剧ず鐨勫垪
- txt_workshopNo.Properties.ValueMember = "workshopNo"; // 瀹為檯鍊肩殑鍒�
+ txt_workshopNo.Properties.DisplayMember = "departmentname"; // 鏄剧ず鐨勫垪
+ txt_workshopNo.Properties.ValueMember = "guid"; // 瀹為檯鍊肩殑鍒�
txt_workshopNo.Properties.TextEditStyle =
TextEditStyles.DisableTextEditor;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index a0051f6..e8c281f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -47,69 +47,64 @@
this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
- this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
- this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_remark = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_name = new DevExpress.XtraEditors.LabelControl();
- this.txt_name = new DevExpress.XtraEditors.TextEdit();
- this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_workshopNo = new DevExpress.XtraGrid.Columns.GridColumn();
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.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_departmentcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_departmentname = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
+ this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
+ this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+ this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.lb_remark = new DevExpress.XtraEditors.LabelControl();
+ this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.lb_departmentname = new DevExpress.XtraEditors.LabelControl();
+ this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
+ this.lb_departmentcode = new DevExpress.XtraEditors.LabelControl();
+ this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
+ this.lb_departmentid = new DevExpress.XtraEditors.LabelControl();
+ this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.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();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -196,7 +191,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1279, 424);
+ this.tabMxPage1.Size = new System.Drawing.Size(1279, 450);
this.tabMxPage1.Text = "浜х嚎鍒楄〃";
//
// gcMx1
@@ -208,7 +203,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemCheckEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1279, 424);
+ this.gcMx1.Size = new System.Drawing.Size(1279, 450);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -269,293 +264,9 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // lb_checkStatus
- //
- this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkStatus.Appearance.Options.UseFont = true;
- this.lb_checkStatus.Location = new System.Drawing.Point(979, 53);
- this.lb_checkStatus.Name = "lb_checkStatus";
- this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
- this.lb_checkStatus.TabIndex = 243;
- this.lb_checkStatus.Text = "瀹℃牳鐘舵��";
- //
- // gv_checkStatus
- //
- this.gv_checkStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkStatus.AppearanceCell.Options.UseFont = true;
- this.gv_checkStatus.Caption = "瀹℃牳";
- this.gv_checkStatus.FieldName = "checkStatus";
- this.gv_checkStatus.MinWidth = 50;
- this.gv_checkStatus.Name = "gv_checkStatus";
- this.gv_checkStatus.OptionsColumn.AllowEdit = false;
- this.gv_checkStatus.Tag = "query_a.check_status";
- this.gv_checkStatus.Visible = true;
- this.gv_checkStatus.VisibleIndex = 8;
- this.gv_checkStatus.Width = 94;
- //
- // lb_checkBy
- //
- this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkBy.Appearance.Options.UseFont = true;
- this.lb_checkBy.Location = new System.Drawing.Point(754, 18);
- this.lb_checkBy.Name = "lb_checkBy";
- this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
- this.lb_checkBy.TabIndex = 240;
- this.lb_checkBy.Text = "瀹℃牳浜�";
- //
- // txt_checkBy
- //
- this.txt_checkBy.Enabled = false;
- this.txt_checkBy.Location = new System.Drawing.Point(823, 14);
- this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
- this.txt_checkBy.TabIndex = 240;
- //
- // gv_checkBy
- //
- this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkBy.AppearanceCell.Options.UseFont = true;
- this.gv_checkBy.Caption = "瀹℃牳浜�";
- this.gv_checkBy.FieldName = "checkBy";
- this.gv_checkBy.MinWidth = 50;
- this.gv_checkBy.Name = "gv_checkBy";
- this.gv_checkBy.OptionsColumn.AllowEdit = false;
- this.gv_checkBy.Tag = "query_a.check_by";
- this.gv_checkBy.Visible = true;
- this.gv_checkBy.VisibleIndex = 10;
- this.gv_checkBy.Width = 94;
- //
- // lb_checkDate
- //
- this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(737, 53);
- this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
- this.lb_checkDate.TabIndex = 235;
- this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
- //
- // txt_checkDate
- //
- this.txt_checkDate.Enabled = false;
- this.txt_checkDate.Location = new System.Drawing.Point(823, 49);
- this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
- this.txt_checkDate.TabIndex = 235;
- //
- // gv_checkDate
- //
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
- this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.check_date";
- this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 9;
- this.gv_checkDate.Width = 94;
- //
- // lb_isStatus
- //
- this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(3, 53);
- this.lb_isStatus.Name = "lb_isStatus";
- this.lb_isStatus.Size = new System.Drawing.Size(73, 21);
- this.lb_isStatus.TabIndex = 231;
- this.lb_isStatus.Text = "杞﹂棿鐘舵�� ";
- //
- // gv_isStatus
- //
- this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isStatus.AppearanceCell.Options.UseFont = true;
- this.gv_isStatus.Caption = "鐘舵��";
- this.gv_isStatus.FieldName = "isStatus";
- this.gv_isStatus.MinWidth = 50;
- this.gv_isStatus.Name = "gv_isStatus";
- this.gv_isStatus.OptionsColumn.AllowEdit = false;
- this.gv_isStatus.Tag = "query_a.is_status";
- this.gv_isStatus.UnboundDataType = typeof(bool);
- this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 7;
- this.gv_isStatus.Width = 94;
- //
- // lb_createDate
- //
- this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(500, 53);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
- this.lb_createDate.TabIndex = 222;
- this.lb_createDate.Text = "寤虹珛鏃堕棿 ";
- //
- // txt_createDate
- //
- this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(580, 49);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
- this.txt_createDate.TabIndex = 222;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "寤虹珛鏃堕棿";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
- this.gv_createDate.Width = 94;
- //
- // lb_createBy
- //
- this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(517, 19);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(56, 21);
- this.lb_createBy.TabIndex = 219;
- this.lb_createBy.Text = "寤虹珛鑰� ";
- //
- // txt_createBy
- //
- this.txt_createBy.Enabled = false;
- this.txt_createBy.Location = new System.Drawing.Point(579, 15);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
- this.txt_createBy.TabIndex = 219;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 94;
- //
- // lb_remark
- //
- this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(285, 53);
- this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(39, 21);
- this.lb_remark.TabIndex = 217;
- this.lb_remark.Text = "澶囨敞 ";
- //
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(330, 49);
- 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.Size = new System.Drawing.Size(150, 28);
- this.txt_remark.TabIndex = 217;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.remark";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 4;
- this.gv_remark.Width = 94;
- //
- // lb_name
- //
- this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_name.Appearance.Options.UseFont = true;
- this.lb_name.Location = new System.Drawing.Point(251, 20);
- this.lb_name.Name = "lb_name";
- this.lb_name.Size = new System.Drawing.Size(73, 21);
- this.lb_name.TabIndex = 216;
- this.lb_name.Text = "杞﹂棿鍚嶇О ";
- //
- // txt_name
- //
- this.txt_name.Location = new System.Drawing.Point(330, 16);
- this.txt_name.Name = "txt_name";
- this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(150, 28);
- this.txt_name.TabIndex = 216;
- //
- // gv_name
- //
- this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_name.AppearanceCell.Options.UseFont = true;
- this.gv_name.Caption = "杞﹂棿鍚嶇О";
- this.gv_name.FieldName = "name";
- this.gv_name.MinWidth = 50;
- this.gv_name.Name = "gv_name";
- this.gv_name.OptionsColumn.AllowEdit = false;
- this.gv_name.Tag = "query_a.name";
- this.gv_name.Visible = true;
- this.gv_name.VisibleIndex = 3;
- this.gv_name.Width = 94;
- //
- // lb_workshopNo
- //
- this.lb_workshopNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_workshopNo.Appearance.Options.UseFont = true;
- this.lb_workshopNo.Location = new System.Drawing.Point(3, 20);
- this.lb_workshopNo.Name = "lb_workshopNo";
- this.lb_workshopNo.Size = new System.Drawing.Size(73, 21);
- this.lb_workshopNo.TabIndex = 211;
- this.lb_workshopNo.Text = "杞﹂棿缂栧彿 ";
- //
- // txt_workshopNo
- //
- this.txt_workshopNo.Location = new System.Drawing.Point(80, 16);
- this.txt_workshopNo.Name = "txt_workshopNo";
- this.txt_workshopNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_workshopNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workshopNo.Size = new System.Drawing.Size(150, 28);
- this.txt_workshopNo.TabIndex = 211;
- //
- // gv_workshopNo
- //
- this.gv_workshopNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workshopNo.AppearanceCell.Options.UseFont = true;
- this.gv_workshopNo.Caption = "杞﹂棿缂栧彿";
- this.gv_workshopNo.FieldName = "workshopNo";
- this.gv_workshopNo.MinWidth = 50;
- this.gv_workshopNo.Name = "gv_workshopNo";
- this.gv_workshopNo.OptionsColumn.AllowEdit = false;
- this.gv_workshopNo.Tag = "query_a.workshop_no";
- this.gv_workshopNo.Visible = true;
- this.gv_workshopNo.VisibleIndex = 2;
- this.gv_workshopNo.Width = 94;
- //
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "MES_WORKSHOP,check_date,check_status,check_by";
+ this.toolBarMenu1.chkParameter = "SYS_DEPARTMENT,check_date,check_status,check_by";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -566,41 +277,6 @@
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_workline{}";
- //
- // gcMain
- //
- 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(1281, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
- this.gridColumn2,
- this.gv_workshopNo,
- this.gv_name,
- this.gv_remark,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_isStatus,
- this.gv_checkStatus,
- this.gv_checkDate,
- this.gv_checkBy});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
//
// xtraTabControl1
//
@@ -621,6 +297,196 @@
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1281, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // gcMain
+ //
+ 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(1281, 531);
+ this.gcMain.TabIndex = 4;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_factory,
+ this.gv_departmentid,
+ this.gv_departmentcode,
+ this.gv_departmentname,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn1,
+ this.gv_depextr4,
+ this.gv_fmanager,
+ this.gv_remark,
+ this.gv_parentId});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsCustomization.AllowFilter = false;
+ this.gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
+ this.gridView1.OptionsFilter.AllowFilterEditor = false;
+ this.gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_factory
+ //
+ this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_factory.AppearanceCell.Options.UseFont = true;
+ this.gv_factory.Caption = "浣跨敤缁勭粐";
+ this.gv_factory.FieldName = "fSubsidiary";
+ this.gv_factory.MinWidth = 250;
+ this.gv_factory.Name = "gv_factory";
+ this.gv_factory.OptionsColumn.AllowEdit = false;
+ this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
+ this.gv_factory.OptionsFilter.ImmediateUpdateAutoFilter = false;
+ this.gv_factory.Tag = "org.fnamber";
+ this.gv_factory.Visible = true;
+ this.gv_factory.VisibleIndex = 0;
+ this.gv_factory.Width = 250;
+ //
+ // gv_departmentid
+ //
+ this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_departmentid.AppearanceCell.Options.UseFont = true;
+ this.gv_departmentid.Caption = "閮ㄩ棬ID";
+ this.gv_departmentid.FieldName = "departmentid";
+ this.gv_departmentid.MinWidth = 50;
+ this.gv_departmentid.Name = "gv_departmentid";
+ 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;
+ //
+ // gv_departmentcode
+ //
+ this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
+ this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
+ this.gv_departmentcode.FieldName = "departmentcode";
+ this.gv_departmentcode.MinWidth = 80;
+ 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.Width = 94;
+ //
+ // gv_departmentname
+ //
+ this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_departmentname.AppearanceCell.Options.UseFont = true;
+ this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
+ this.gv_departmentname.FieldName = "departmentname";
+ this.gv_departmentname.MinWidth = 150;
+ 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.Width = 150;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "瀹℃牳鐘舵��";
+ this.gridColumn3.FieldName = "checkStatus";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 4;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹℃牳浜�";
+ this.gridColumn2.FieldName = "checkBy";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹℃牳鏃ユ湡";
+ this.gridColumn1.FieldName = "checkDate";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.Width = 94;
+ //
+ // gv_depextr4
+ //
+ 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.FieldName = "depextr4";
+ this.gv_depextr4.MinWidth = 50;
+ this.gv_depextr4.Name = "gv_depextr4";
+ this.gv_depextr4.OptionsColumn.AllowEdit = false;
+ 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;
+ //
+ // 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;
+ //
+ // gv_remark
+ //
+ this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remark.AppearanceCell.Options.UseFont = true;
+ this.gv_remark.Caption = "澶囨敞";
+ this.gv_remark.FieldName = "remark";
+ this.gv_remark.MinWidth = 50;
+ this.gv_remark.Name = "gv_remark";
+ this.gv_remark.OptionsColumn.AllowEdit = false;
+ 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.Width = 94;
+ //
+ // gv_parentId
+ //
+ this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_parentId.AppearanceCell.Options.UseFont = true;
+ this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
+ this.gv_parentId.FieldName = "fParentID";
+ this.gv_parentId.MinWidth = 150;
+ 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.Width = 150;
//
// pageBar1
//
@@ -647,10 +513,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 114);
+ this.tabMx.Location = new System.Drawing.Point(0, 88);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1281, 456);
+ this.tabMx.Size = new System.Drawing.Size(1281, 482);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -659,68 +525,185 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_checkStatus);
- this.panel1.Controls.Add(this.txt_isStatus);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_checkStatus);
this.panel1.Controls.Add(this.lb_checkBy);
this.panel1.Controls.Add(this.txt_checkBy);
this.panel1.Controls.Add(this.lb_checkDate);
this.panel1.Controls.Add(this.txt_checkDate);
- this.panel1.Controls.Add(this.lb_isStatus);
- this.panel1.Controls.Add(this.lb_createDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_name);
- this.panel1.Controls.Add(this.txt_name);
- this.panel1.Controls.Add(this.lb_workshopNo);
- this.panel1.Controls.Add(this.txt_workshopNo);
+ this.panel1.Controls.Add(this.lb_departmentname);
+ this.panel1.Controls.Add(this.txt_departmentname);
+ this.panel1.Controls.Add(this.lb_departmentcode);
+ this.panel1.Controls.Add(this.txt_departmentcode);
+ this.panel1.Controls.Add(this.lb_departmentid);
+ this.panel1.Controls.Add(this.txt_departmentid);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1281, 114);
+ this.panel1.Size = new System.Drawing.Size(1281, 88);
this.panel1.TabIndex = 1;
//
// txt_checkStatus
//
this.txt_checkStatus.Enabled = false;
- this.txt_checkStatus.Location = new System.Drawing.Point(1053, 49);
+ this.txt_checkStatus.Location = new System.Drawing.Point(845, 56);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "";
this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
- this.txt_checkStatus.TabIndex = 245;
+ this.txt_checkStatus.TabIndex = 321;
//
- // txt_isStatus
+ // lb_checkStatus
//
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(80, 55);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 244;
- this.txt_isStatus.UseVisualStyleBackColor = true;
+ this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_checkStatus.Appearance.Options.UseFont = true;
+ this.lb_checkStatus.Location = new System.Drawing.Point(771, 58);
+ this.lb_checkStatus.Name = "lb_checkStatus";
+ this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
+ this.lb_checkStatus.TabIndex = 320;
+ this.lb_checkStatus.Text = "瀹℃牳鐘舵��";
+ //
+ // lb_checkBy
+ //
+ this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_checkBy.Appearance.Options.UseFont = true;
+ this.lb_checkBy.Location = new System.Drawing.Point(546, 19);
+ this.lb_checkBy.Name = "lb_checkBy";
+ this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
+ this.lb_checkBy.TabIndex = 318;
+ this.lb_checkBy.Text = "瀹℃牳浜�";
+ //
+ // txt_checkBy
+ //
+ this.txt_checkBy.Enabled = false;
+ this.txt_checkBy.Location = new System.Drawing.Point(615, 15);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkBy.TabIndex = 319;
+ //
+ // lb_checkDate
+ //
+ this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_checkDate.Appearance.Options.UseFont = true;
+ this.lb_checkDate.Location = new System.Drawing.Point(529, 58);
+ this.lb_checkDate.Name = "lb_checkDate";
+ this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
+ this.lb_checkDate.TabIndex = 316;
+ this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
+ //
+ // txt_checkDate
+ //
+ this.txt_checkDate.Enabled = false;
+ this.txt_checkDate.Location = new System.Drawing.Point(615, 54);
+ this.txt_checkDate.Name = "txt_checkDate";
+ this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkDate.TabIndex = 317;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(37, 83);
+ this.labelControl11.Location = new System.Drawing.Point(857, 19);
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.TabIndex = 293;
this.labelControl11.Text = "涓婚敭锛�";
this.labelControl11.Visible = false;
//
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(88, 83);
+ this.lbGuid.Location = new System.Drawing.Point(908, 19);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
+ this.lbGuid.TabIndex = 292;
this.lbGuid.Visible = false;
+ //
+ // lb_remark
+ //
+ this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_remark.Appearance.Options.UseFont = true;
+ this.lb_remark.Location = new System.Drawing.Point(315, 58);
+ this.lb_remark.Name = "lb_remark";
+ this.lb_remark.Size = new System.Drawing.Size(39, 21);
+ this.lb_remark.TabIndex = 315;
+ this.lb_remark.Text = "澶囨敞 ";
+ //
+ // txt_remark
+ //
+ this.txt_remark.Enabled = false;
+ this.txt_remark.Location = new System.Drawing.Point(360, 54);
+ 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.Size = new System.Drawing.Size(150, 28);
+ this.txt_remark.TabIndex = 314;
+ //
+ // lb_departmentname
+ //
+ this.lb_departmentname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_departmentname.Appearance.Options.UseFont = true;
+ this.lb_departmentname.Location = new System.Drawing.Point(39, 57);
+ this.lb_departmentname.Name = "lb_departmentname";
+ this.lb_departmentname.Size = new System.Drawing.Size(73, 21);
+ this.lb_departmentname.TabIndex = 299;
+ this.lb_departmentname.Text = "閮ㄩ棬鍚嶇О ";
+ //
+ // txt_departmentname
+ //
+ this.txt_departmentname.Enabled = false;
+ this.txt_departmentname.Location = new System.Drawing.Point(118, 53);
+ this.txt_departmentname.Name = "txt_departmentname";
+ this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentname.Size = new System.Drawing.Size(150, 28);
+ this.txt_departmentname.TabIndex = 298;
+ //
+ // lb_departmentcode
+ //
+ this.lb_departmentcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_departmentcode.Appearance.Options.UseFont = true;
+ this.lb_departmentcode.Location = new System.Drawing.Point(281, 19);
+ this.lb_departmentcode.Name = "lb_departmentcode";
+ this.lb_departmentcode.Size = new System.Drawing.Size(73, 21);
+ this.lb_departmentcode.TabIndex = 297;
+ this.lb_departmentcode.Text = "閮ㄩ棬缂栧彿 ";
+ //
+ // txt_departmentcode
+ //
+ this.txt_departmentcode.Enabled = false;
+ this.txt_departmentcode.Location = new System.Drawing.Point(360, 15);
+ this.txt_departmentcode.Name = "txt_departmentcode";
+ this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentcode.Size = new System.Drawing.Size(150, 28);
+ this.txt_departmentcode.TabIndex = 296;
+ //
+ // lb_departmentid
+ //
+ this.lb_departmentid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_departmentid.Appearance.Options.UseFont = true;
+ this.lb_departmentid.Location = new System.Drawing.Point(55, 19);
+ this.lb_departmentid.Name = "lb_departmentid";
+ this.lb_departmentid.Size = new System.Drawing.Size(57, 21);
+ this.lb_departmentid.TabIndex = 294;
+ this.lb_departmentid.Text = "閮ㄩ棬ID ";
+ //
+ // txt_departmentid
+ //
+ this.txt_departmentid.Enabled = false;
+ this.txt_departmentid.Location = new System.Drawing.Point(118, 15);
+ this.txt_departmentid.Name = "txt_departmentid";
+ this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentid.Size = new System.Drawing.Size(150, 28);
+ this.txt_departmentid.TabIndex = 295;
//
// picCheckBox
//
@@ -732,28 +715,6 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浣跨敤缁勭粐";
- this.gridColumn1.FieldName = "fSubsidiary";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "org.fnamber";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "杞﹂棿ID";
- this.gridColumn2.FieldName = "workid";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Tag = "query_a.workid";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
//
// Frm_MesWorkshop
//
@@ -769,39 +730,34 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.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);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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 UserControls.Data.UcPageBar pageBar1;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
@@ -812,47 +768,39 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraEditors.LabelControl lb_checkStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
-
- private DevExpress.XtraEditors.LabelControl lb_checkBy;
- private DevExpress.XtraEditors.TextEdit txt_checkBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
-
- private DevExpress.XtraEditors.LabelControl lb_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-
- private DevExpress.XtraEditors.LabelControl lb_isStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
-
- private DevExpress.XtraEditors.LabelControl lb_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
- private DevExpress.XtraEditors.LabelControl lb_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_remark;
- private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-
- private DevExpress.XtraEditors.LabelControl lb_name;
- private DevExpress.XtraEditors.TextEdit txt_name;
- private DevExpress.XtraGrid.Columns.GridColumn gv_name;
-
- private DevExpress.XtraEditors.LabelControl lb_workshopNo;
- private DevExpress.XtraEditors.TextEdit txt_workshopNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workshopNo;
- private System.Windows.Forms.CheckBox txt_isStatus;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1isStatus;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
- private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_departmentcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_departmentname;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depextr4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl lb_remark;
+ private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.LabelControl lb_departmentname;
+ private DevExpress.XtraEditors.TextEdit txt_departmentname;
+ private DevExpress.XtraEditors.LabelControl lb_departmentcode;
+ private DevExpress.XtraEditors.TextEdit txt_departmentcode;
+ private DevExpress.XtraEditors.LabelControl lb_departmentid;
+ private DevExpress.XtraEditors.TextEdit txt_departmentid;
+ private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+ private DevExpress.XtraEditors.LabelControl lb_checkStatus;
+ private DevExpress.XtraEditors.LabelControl lb_checkBy;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
+ private DevExpress.XtraEditors.LabelControl lb_checkDate;
+ private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index e4a1b2f..320eea2 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
@@ -18,17 +19,14 @@
public partial class Frm_MesWorkshop : XtraForm
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
- private readonly string _webServiceName = "MesWorkshopManager/";
-
+ private readonly string _webServiceName = "SysDepartmentManager/";
public Frm_MesWorkshop()
{
InitializeComponent();
- toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
@@ -37,21 +35,25 @@
{
UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
};
- getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.CustomDrawRowIndicator +=
+ GridView1_CustomDrawRowIndicator;
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ }
+
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ private void GridView1_CustomDrawRowIndicator(object sender,
+ RowIndicatorCustomDrawEventArgs e)
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
}
/// <summary>
@@ -74,7 +76,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -84,6 +86,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
@@ -97,87 +102,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
- }
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1, "workshopNo");
- toolBarMenu1.guidKey = rowGuid;
- }
-
- /// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1, "workshopNo");
- toolBarMenu1.guidKey = rowGuid;
- }
-
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1, "workshopNo");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var lst = new List<string>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ getPageList(1);
}
/// <summary>
@@ -190,111 +115,15 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
- }
-
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- getModel(rowGuid, true, 1);
- }
-
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- var gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_workshopNo.Text.Trim()))
- {
- MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
- txt_workshopNo.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_name.Text.Trim()))
- {
- MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
- txt_name.Focus();
- return;
- }
-
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var lst = new List<dynamic>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- lst.Add(new
- {
- guid = UtilityHelper.ToGuid(row["guid"].ToString()),
- lineNo = row["lineNo"].ToString(),
- name = row["name"].ToString(),
- remark = row["remark"].ToString(),
- isStatus = row["isStatus"].ToString()
- });
- }
-
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- workshopNo = txt_workshopNo.Text.Trim(),
- name = txt_name.Text.Trim(),
- remark = txt_remark.Text.Trim(),
- isStatus = txt_isStatus.Checked,
- list = lst
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
{
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- var gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
- gridViews);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
}
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ getPageList(1);
}
}
@@ -302,32 +131,35 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date",
- "asc", "", _sbSqlWhere.ToString());
+
+ UcLoading _loading = new UcLoading();
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
+ "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("",
+ var strReturn = await UtilityHelper.HttpPostAsync("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -338,6 +170,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -396,6 +229,120 @@
}
}
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_departmentname, gridView1, "departmentcode");
+ toolBarMenu1.guidKey = rowGuid;
+ }
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ }
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_departmentname, gridView1, "departmentcode");
+ toolBarMenu1.guidKey = rowGuid;
+ }
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_departmentcode, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+
+ getModel(rowGuid, true, 1);
+ }
+
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ if (string.IsNullOrEmpty(txt_departmentcode.Text.Trim()))
+ {
+ MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
+ txt_departmentcode.Focus();
+ return;
+ }
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var lst = new List<dynamic>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ lst.Add(new
+ {
+ guid = UtilityHelper.ToGuid(row["guid"].ToString()),
+ lineNo = row["lineNo"].ToString(),
+ name = row["name"].ToString(),
+ remark = row["remark"].ToString(),
+ isStatus = row["isStatus"].ToString()
+ });
+ }
+
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ list = lst
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
+ gridViews);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
private void repositoryItemButtonEdit1_ButtonClick(object sender,
ButtonPressedEventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 6441c19..307416f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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.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();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -181,7 +181,7 @@
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "query_a.reporttime";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 32;
+ this.gvMx1reporttime.VisibleIndex = 34;
this.gvMx1reporttime.Width = 94;
//
// gvMx1isReportcheck
@@ -199,7 +199,7 @@
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
this.gvMx1isReportcheck.Visible = true;
- this.gvMx1isReportcheck.VisibleIndex = 31;
+ this.gvMx1isReportcheck.VisibleIndex = 33;
this.gvMx1isReportcheck.Width = 94;
//
// gvMx1daa026
@@ -216,7 +216,7 @@
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "query_a.daa026";
this.gvMx1daa026.Visible = true;
- this.gvMx1daa026.VisibleIndex = 30;
+ this.gvMx1daa026.VisibleIndex = 32;
this.gvMx1daa026.Width = 94;
//
// gvMx1daa025
@@ -230,7 +230,7 @@
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
this.gvMx1daa025.Visible = true;
- this.gvMx1daa025.VisibleIndex = 29;
+ this.gvMx1daa025.VisibleIndex = 31;
this.gvMx1daa025.Width = 94;
//
// gvMx1daa024
@@ -244,7 +244,7 @@
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
this.gvMx1daa024.Visible = true;
- this.gvMx1daa024.VisibleIndex = 28;
+ this.gvMx1daa024.VisibleIndex = 30;
this.gvMx1daa024.Width = 94;
//
// gvMx1daa023
@@ -258,7 +258,7 @@
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
this.gvMx1daa023.Visible = true;
- this.gvMx1daa023.VisibleIndex = 27;
+ this.gvMx1daa023.VisibleIndex = 29;
this.gvMx1daa023.Width = 94;
//
// gvMx1daa022
@@ -272,7 +272,7 @@
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
this.gvMx1daa022.Visible = true;
- this.gvMx1daa022.VisibleIndex = 26;
+ this.gvMx1daa022.VisibleIndex = 28;
this.gvMx1daa022.Width = 94;
//
// gvMx1daa021
@@ -286,7 +286,7 @@
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
this.gvMx1daa021.Visible = true;
- this.gvMx1daa021.VisibleIndex = 25;
+ this.gvMx1daa021.VisibleIndex = 27;
this.gvMx1daa021.Width = 94;
//
// gvMx1daa020
@@ -300,7 +300,7 @@
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
this.gvMx1daa020.Visible = true;
- this.gvMx1daa020.VisibleIndex = 24;
+ this.gvMx1daa020.VisibleIndex = 26;
this.gvMx1daa020.Width = 94;
//
// gvMx1checkUser
@@ -314,7 +314,7 @@
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
this.gvMx1checkUser.Visible = true;
- this.gvMx1checkUser.VisibleIndex = 23;
+ this.gvMx1checkUser.VisibleIndex = 25;
this.gvMx1checkUser.Width = 94;
//
// gvMx1checkDate
@@ -328,7 +328,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 22;
+ this.gvMx1checkDate.VisibleIndex = 24;
this.gvMx1checkDate.Width = 94;
//
// gvMx1fstatus
@@ -342,7 +342,7 @@
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 21;
+ this.gvMx1fstatus.VisibleIndex = 23;
this.gvMx1fstatus.Width = 94;
//
// gvMx1daa019
@@ -356,7 +356,7 @@
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
this.gvMx1daa019.Visible = true;
- this.gvMx1daa019.VisibleIndex = 20;
+ this.gvMx1daa019.VisibleIndex = 22;
this.gvMx1daa019.Width = 94;
//
// gvMx1daa018
@@ -369,7 +369,7 @@
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "query_a.daa018";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 19;
+ this.gvMx1daa018.VisibleIndex = 21;
this.gvMx1daa018.Width = 94;
//
// gvMx1daa017
@@ -386,7 +386,7 @@
this.gvMx1daa017.Name = "gvMx1daa017";
this.gvMx1daa017.Tag = "query_a.daa017";
this.gvMx1daa017.Visible = true;
- this.gvMx1daa017.VisibleIndex = 18;
+ this.gvMx1daa017.VisibleIndex = 19;
this.gvMx1daa017.Width = 94;
//
// gvMx1daa016
@@ -404,7 +404,7 @@
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "query_a.daa016";
this.gvMx1daa016.Visible = true;
- this.gvMx1daa016.VisibleIndex = 19;
+ this.gvMx1daa016.VisibleIndex = 20;
this.gvMx1daa016.Width = 200;
//
// repositoryItemDateEdit2
@@ -427,7 +427,7 @@
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
- this.gvMx1daa014.VisibleIndex = 16;
+ this.gvMx1daa014.VisibleIndex = 18;
this.gvMx1daa014.Width = 94;
//
// gvMx1daa013
@@ -441,7 +441,7 @@
this.gvMx1daa013.OptionsColumn.ReadOnly = true;
this.gvMx1daa013.Tag = "query_a.daa013";
this.gvMx1daa013.Visible = true;
- this.gvMx1daa013.VisibleIndex = 15;
+ this.gvMx1daa013.VisibleIndex = 17;
this.gvMx1daa013.Width = 94;
//
// gvMx1daa012
@@ -458,7 +458,7 @@
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "query_a.daa012";
this.gvMx1daa012.Visible = true;
- this.gvMx1daa012.VisibleIndex = 14;
+ this.gvMx1daa012.VisibleIndex = 16;
this.gvMx1daa012.Width = 94;
//
// gvMx1daa011
@@ -475,7 +475,7 @@
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "query_a.daa011";
this.gvMx1daa011.Visible = true;
- this.gvMx1daa011.VisibleIndex = 13;
+ this.gvMx1daa011.VisibleIndex = 15;
this.gvMx1daa011.Width = 94;
//
// gvMx1daa010
@@ -489,7 +489,7 @@
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
- this.gvMx1daa010.VisibleIndex = 5;
+ this.gvMx1daa010.VisibleIndex = 7;
this.gvMx1daa010.Width = 110;
//
// gvMx1daa009
@@ -503,7 +503,7 @@
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
- this.gvMx1daa009.VisibleIndex = 12;
+ this.gvMx1daa009.VisibleIndex = 14;
this.gvMx1daa009.Width = 94;
//
// gvMx1daa008
@@ -517,7 +517,7 @@
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
- this.gvMx1daa008.VisibleIndex = 9;
+ this.gvMx1daa008.VisibleIndex = 11;
this.gvMx1daa008.Width = 94;
//
// gvMx1daa007
@@ -531,7 +531,7 @@
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
- this.gvMx1daa007.VisibleIndex = 11;
+ this.gvMx1daa007.VisibleIndex = 13;
this.gvMx1daa007.Width = 94;
//
// gvMx1daa006
@@ -545,7 +545,7 @@
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
- this.gvMx1daa006.VisibleIndex = 10;
+ this.gvMx1daa006.VisibleIndex = 12;
this.gvMx1daa006.Width = 94;
//
// gvMx1daa005
@@ -559,7 +559,7 @@
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 8;
+ this.gvMx1daa005.VisibleIndex = 10;
this.gvMx1daa005.Width = 94;
//
// gvMx1daa004
@@ -573,7 +573,7 @@
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 7;
+ this.gvMx1daa004.VisibleIndex = 9;
this.gvMx1daa004.Width = 150;
//
// gvMx1daa003
@@ -587,7 +587,7 @@
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 6;
+ this.gvMx1daa003.VisibleIndex = 8;
this.gvMx1daa003.Width = 150;
//
// gvMx1daa002
@@ -601,7 +601,7 @@
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
- this.gvMx1daa002.VisibleIndex = 4;
+ this.gvMx1daa002.VisibleIndex = 6;
this.gvMx1daa002.Width = 110;
//
// gvMx1daa001
@@ -615,7 +615,7 @@
this.gvMx1daa001.OptionsColumn.ReadOnly = true;
this.gvMx1daa001.Tag = "query_a.daa001";
this.gvMx1daa001.Visible = true;
- this.gvMx1daa001.VisibleIndex = 3;
+ this.gvMx1daa001.VisibleIndex = 5;
this.gvMx1daa001.Width = 94;
//
// gvMx1pid
@@ -629,7 +629,7 @@
this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 2;
+ this.gvMx1pid.VisibleIndex = 4;
this.gvMx1pid.Width = 94;
//
// gvMx1id
@@ -643,7 +643,7 @@
this.gvMx1id.OptionsColumn.ReadOnly = true;
this.gvMx1id.Tag = "query_a.id";
this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 1;
+ this.gvMx1id.VisibleIndex = 2;
this.gvMx1id.Width = 94;
//
// gvMx1guid
@@ -748,16 +748,16 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 3;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1181,6 +1181,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -1189,6 +1190,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// Frm_Wompba
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index f0436b6..fc3e2b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -51,7 +51,7 @@
{
if (string.IsNullOrEmpty(this.txt_pba013.Text))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
return;
}
var frm = new SelectWompba(this.txt_pba013.Text);
@@ -366,9 +366,9 @@
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
LineId = int.Parse(row["daa015"].ToString()),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- Jhrs = row["daa015"].ToString(),//璁″垝浜烘暟
+ Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
- Bz = row["daa009"].ToString(),//鎹㈢嚎鏃堕棿
+ Bz = row["daa009"].ToString(),//澶囨敞
Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
});
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 8353b62..7f3bd66 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -953,6 +953,7 @@
<None Include="Resources\sortasc_32x32.png" />
<None Include="Resources\sortasc_32x321.png" />
<None Include="Resources\sortasc_16x161.png" />
+ <None Include="Resources\knowledgebasearticle_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index cebb4cf..7a74901 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 08caab5..38fcf8b 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -953,6 +953,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap knowledgebasearticle_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("knowledgebasearticle_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap last_16x16 {
get {
object obj = ResourceManager.GetObject("last_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 8edbfdb..9ddc06a 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -118,13 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
+ <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_32x32.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>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
@@ -139,11 +139,6 @@
</data>
<data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatetableofcontents_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="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -171,6 +166,11 @@
</data>
<data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -202,6 +202,11 @@
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>
<data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -226,21 +231,21 @@
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>
<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,
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="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="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -294,21 +299,11 @@
<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>
</data>
<data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\addcalculatedfield_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>
@@ -534,6 +529,9 @@
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="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -544,8 +542,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
+ <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -701,6 +699,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -708,26 +711,23 @@
<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>
</data>
- <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
+ <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>
</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="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="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -740,13 +740,13 @@
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>
@@ -755,6 +755,9 @@
<value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap,
@@ -774,8 +777,8 @@
<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="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\dropandhighlowlines_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>
@@ -787,7 +790,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
index 080d4bf..0fffc8c 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -36,7 +36,9 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -52,7 +54,6 @@
this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -117,12 +118,17 @@
//
// 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_chk,
this.gv_guid,
+ this.gridColumn2,
this.gv_ebelnK3id,
+ this.gridColumn12,
this.gv_billNo,
this.gridColumn3,
this.gridColumn4,
@@ -136,8 +142,7 @@
this.gridColumn9,
this.gv_purchaseUnit,
this.gv_inventoryUnit,
- this.gv_remarks,
- this.gridColumn12});
+ this.gv_remarks});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -168,11 +173,21 @@
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "ErpId";
+ this.gridColumn2.FieldName = "erpId";
+ this.gridColumn2.MinWidth = 80;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 94;
+ //
// gv_ebelnK3id
//
this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gv_ebelnK3id.Caption = "宸ュ崟鍙�";
+ this.gv_ebelnK3id.Caption = "浠诲姟鍗曞彿";
this.gv_ebelnK3id.FieldName = "gdh";
this.gv_ebelnK3id.MinWidth = 100;
this.gv_ebelnK3id.Name = "gv_ebelnK3id";
@@ -180,8 +195,18 @@
this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
this.gv_ebelnK3id.Visible = true;
- this.gv_ebelnK3id.VisibleIndex = 1;
+ this.gv_ebelnK3id.VisibleIndex = 2;
this.gv_ebelnK3id.Width = 100;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "宸ュ崟鎬绘暟";
+ this.gridColumn12.FieldName = "gdzs";
+ this.gridColumn12.MinWidth = 80;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 3;
+ this.gridColumn12.Width = 94;
//
// gv_billNo
//
@@ -189,13 +214,13 @@
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鏈帓鏁伴噺";
this.gv_billNo.FieldName = "caa012";
- this.gv_billNo.MinWidth = 110;
+ this.gv_billNo.MinWidth = 80;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.VisibleIndex = 4;
this.gv_billNo.Width = 110;
//
// gridColumn3
@@ -206,7 +231,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 125;
//
// gridColumn4
@@ -217,7 +242,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 120;
//
// gridColumn1
@@ -228,7 +253,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.VisibleIndex = 7;
this.gridColumn1.Width = 94;
//
// gv_supplierItemCode
@@ -243,7 +268,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 6;
+ this.gv_supplierItemCode.VisibleIndex = 8;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -258,7 +283,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 7;
+ this.gv_supplierItemName.VisibleIndex = 9;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -269,7 +294,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 10;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -280,7 +305,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 11;
this.gridColumn6.Width = 100;
//
// gridColumn8
@@ -291,7 +316,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 12;
this.gridColumn8.Width = 100;
//
// gridColumn7
@@ -302,7 +327,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.VisibleIndex = 13;
this.gridColumn7.Width = 100;
//
// gridColumn9
@@ -313,7 +338,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.VisibleIndex = 14;
this.gridColumn9.Width = 100;
//
// gv_purchaseUnit
@@ -328,7 +353,7 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 13;
+ this.gv_purchaseUnit.VisibleIndex = 15;
this.gv_purchaseUnit.Width = 100;
//
// gv_inventoryUnit
@@ -343,7 +368,7 @@
this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 14;
+ this.gv_inventoryUnit.VisibleIndex = 16;
this.gv_inventoryUnit.Width = 100;
//
// gv_remarks
@@ -358,7 +383,7 @@
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 15;
+ this.gv_remarks.VisibleIndex = 17;
this.gv_remarks.Width = 100;
//
// xtraTabControl1
@@ -372,24 +397,18 @@
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
//
- // gridColumn12
- //
- this.gridColumn12.Caption = "宸ュ崟鎬绘暟";
- this.gridColumn12.FieldName = "gdzs";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 16;
- this.gridColumn12.Width = 94;
- //
// SelectWompba
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1047, 560);
this.Controls.Add(this.xtraTabControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "SelectWompba";
- this.Text = "SelectWompba";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨鐢熶骇浠诲姟鍗�";
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -428,5 +447,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index f26ff57..56531cf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -66,11 +66,11 @@
this.btnBdll = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnTb = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -116,10 +116,10 @@
this.btnZanTing,
this.btnBdll,
this.btnWg,
- this.barLargeButtonItem1,
- this.btnTb});
+ this.btnTb,
+ this.btnHelp});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 49;
+ this.barManager1.MaxItemId = 50;
//
// bar2
//
@@ -160,7 +160,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnZanTing),
new DevExpress.XtraBars.LinkPersistInfo(this.btnBdll),
new DevExpress.XtraBars.LinkPersistInfo(this.btnWg),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnTb)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnTb),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
this.bar2.Text = "Main menu";
@@ -491,6 +492,16 @@
this.btnTb.Name = "btnTb";
this.btnTb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnHelp
+ //
+ this.btnHelp.Caption = "甯姪";
+ this.btnHelp.Id = 49;
+ this.btnHelp.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
+ this.btnHelp.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
+ this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
+ this.btnHelp.Name = "btnHelp";
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -503,7 +514,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 61);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 66);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -523,12 +534,6 @@
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
//
- // barLargeButtonItem1
- //
- this.barLargeButtonItem1.Caption = "barLargeButtonItem1";
- this.barLargeButtonItem1.Id = 47;
- this.barLargeButtonItem1.Name = "barLargeButtonItem1";
- //
// UcToolBarMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -538,7 +543,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 61);
+ this.Size = new System.Drawing.Size(1543, 66);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -584,7 +589,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnZanTing;
private DevExpress.XtraBars.BarLargeButtonItem btnBdll;
private DevExpress.XtraBars.BarLargeButtonItem btnWg;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
private DevExpress.XtraBars.BarLargeButtonItem btnTb;
+ private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 95c7388..5e0fda8 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -705,6 +705,7 @@
//榛樿鍚敤鐨勬寜閽�
_enabledList.Add(btnLoad.Name);
+ _enabledList.Add(btnHelp.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
--
Gitblit v1.9.3