From c6ec5dda891c9b6ef9c3ff97cc964a826c0ddbff Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 09 八月 2025 17:42:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 43 +++++
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs | 28 +++
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 376 ++++++++++++++++++++++++++--------------------
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs | 2
4 files changed, 282 insertions(+), 167 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index d0d4cda..2238904 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -29,19 +29,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -72,7 +72,6 @@
this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
this.txt_ErrorTime = new DevExpress.XtraEditors.DateEdit();
- this.txt_ErrorNo = new DevExpress.XtraEditors.TextEdit();
this.txt_ErrorType = new DevExpress.XtraEditors.TextEdit();
this.txt_DAAType = new DevExpress.XtraEditors.TextEdit();
this.txt_DAA001 = new DevExpress.XtraEditors.SearchLookUpEdit();
@@ -80,12 +79,11 @@
this.txt_HourlyType = new DevExpress.XtraEditors.SearchLookUpEdit();
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.txt_HourlySalary = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ErrorNo = new DevExpress.XtraEditors.TextEdit();
+ this.btnFZ = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -96,6 +94,10 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -115,6 +117,7 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumnIndex = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -143,7 +146,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_DAAType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_DAA001.Properties)).BeginInit();
@@ -151,12 +153,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -167,6 +167,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
@@ -257,6 +261,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumnIndex,
this.gv_createBy,
this.gv_createDate,
this.gridColumn6,
@@ -285,7 +290,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 1;
+ this.gv_createBy.VisibleIndex = 2;
this.gv_createBy.Width = 100;
//
// gv_createDate
@@ -298,7 +303,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 2;
+ this.gv_createDate.VisibleIndex = 3;
this.gv_createDate.Width = 286;
//
// gridColumn6
@@ -309,7 +314,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.VisibleIndex = 1;
this.gridColumn6.Width = 117;
//
// gridColumn1
@@ -320,7 +325,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "errorNo";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 112;
//
// gridColumn2
@@ -331,7 +336,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "errorTime";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 112;
//
// gridColumn3
@@ -342,7 +347,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "errorType";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 112;
//
// gridColumn4
@@ -353,7 +358,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "hourlyType";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 112;
//
// gridColumn5
@@ -364,7 +369,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "remark";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.VisibleIndex = 8;
this.gridColumn5.Width = 112;
//
// gridColumn7
@@ -375,7 +380,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "dAA001";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 8;
+ this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 112;
//
// gridColumn17
@@ -386,7 +391,7 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "dAAType";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 9;
+ this.gridColumn17.VisibleIndex = 10;
this.gridColumn17.Width = 112;
//
// pageBar1
@@ -428,7 +433,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1408, 698);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.SplitterPosition = 299;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -443,28 +448,29 @@
this.layoutMx1.Controls.Add(this.txt_Remark);
this.layoutMx1.Controls.Add(this.txt_Guid);
this.layoutMx1.Controls.Add(this.txt_ErrorTime);
- this.layoutMx1.Controls.Add(this.txt_ErrorNo);
this.layoutMx1.Controls.Add(this.txt_ErrorType);
this.layoutMx1.Controls.Add(this.txt_DAAType);
this.layoutMx1.Controls.Add(this.txt_DAA001);
this.layoutMx1.Controls.Add(this.txt_HourlyType);
this.layoutMx1.Controls.Add(this.txt_HourlySalary);
+ this.layoutMx1.Controls.Add(this.txt_ErrorNo);
+ this.layoutMx1.Controls.Add(this.btnFZ);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(925, 474, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1408, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 299);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(359, 135);
+ this.btnSelect.Location = new System.Drawing.Point(359, 221);
this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(121, 32);
@@ -484,7 +490,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(96, 135);
+ this.txt_createDate.Location = new System.Drawing.Point(96, 221);
this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -495,7 +501,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1137, 94);
+ this.txt_createBy.Location = new System.Drawing.Point(1137, 151);
this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -506,7 +512,7 @@
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(443, 94);
+ this.txt_checkBy.Location = new System.Drawing.Point(443, 151);
this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkBy.Name = "txt_checkBy";
this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
@@ -516,7 +522,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(790, 94);
+ this.txt_checkDate.Location = new System.Drawing.Point(790, 151);
this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
@@ -526,7 +532,7 @@
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(12, 94);
+ this.txt_checkStatus.Location = new System.Drawing.Point(12, 151);
this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
@@ -537,7 +543,7 @@
//
// txt_Remark
//
- this.txt_Remark.Location = new System.Drawing.Point(443, 53);
+ this.txt_Remark.Location = new System.Drawing.Point(443, 81);
this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
this.txt_Remark.Name = "txt_Remark";
this.txt_Remark.Size = new System.Drawing.Size(259, 28);
@@ -547,7 +553,7 @@
//
// txt_Guid
//
- this.txt_Guid.Location = new System.Drawing.Point(790, 135);
+ this.txt_Guid.Location = new System.Drawing.Point(1137, 221);
this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
this.txt_Guid.Name = "txt_Guid";
this.txt_Guid.Size = new System.Drawing.Size(259, 28);
@@ -558,7 +564,7 @@
// txt_ErrorTime
//
this.txt_ErrorTime.EditValue = null;
- this.txt_ErrorTime.Location = new System.Drawing.Point(96, 53);
+ this.txt_ErrorTime.Location = new System.Drawing.Point(96, 81);
this.txt_ErrorTime.Margin = new System.Windows.Forms.Padding(4);
this.txt_ErrorTime.Name = "txt_ErrorTime";
this.txt_ErrorTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -575,18 +581,6 @@
this.txt_ErrorTime.TabIndex = 250;
this.txt_ErrorTime.Tag = "";
//
- // txt_ErrorNo
- //
- this.txt_ErrorNo.Location = new System.Drawing.Point(96, 12);
- this.txt_ErrorNo.Margin = new System.Windows.Forms.Padding(4);
- this.txt_ErrorNo.Name = "txt_ErrorNo";
- this.txt_ErrorNo.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
- this.txt_ErrorNo.Properties.Appearance.Options.UseBackColor = true;
- this.txt_ErrorNo.Size = new System.Drawing.Size(259, 28);
- this.txt_ErrorNo.StyleController = this.layoutMx1;
- this.txt_ErrorNo.TabIndex = 250;
- this.txt_ErrorNo.Tag = "readonly";
- //
// txt_ErrorType
//
this.txt_ErrorType.EditValue = "";
@@ -600,7 +594,7 @@
//
// txt_DAAType
//
- this.txt_DAAType.Location = new System.Drawing.Point(1137, 53);
+ this.txt_DAAType.Location = new System.Drawing.Point(1137, 81);
this.txt_DAAType.Margin = new System.Windows.Forms.Padding(4);
this.txt_DAAType.Name = "txt_DAAType";
this.txt_DAAType.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -612,7 +606,7 @@
//
// txt_DAA001
//
- this.txt_DAA001.Location = new System.Drawing.Point(790, 53);
+ this.txt_DAA001.Location = new System.Drawing.Point(790, 81);
this.txt_DAA001.Margin = new System.Windows.Forms.Padding(4);
this.txt_DAA001.Name = "txt_DAA001";
this.txt_DAA001.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -666,6 +660,27 @@
this.txt_HourlySalary.TabIndex = 250;
this.txt_HourlySalary.Tag = "readonly";
//
+ // txt_ErrorNo
+ //
+ this.txt_ErrorNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_ErrorNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_ErrorNo.Name = "txt_ErrorNo";
+ this.txt_ErrorNo.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.txt_ErrorNo.Properties.Appearance.Options.UseBackColor = true;
+ this.txt_ErrorNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_ErrorNo.StyleController = this.layoutMx1;
+ this.txt_ErrorNo.TabIndex = 250;
+ this.txt_ErrorNo.Tag = "readonly";
+ //
+ // btnFZ
+ //
+ this.btnFZ.Location = new System.Drawing.Point(706, 221);
+ this.btnFZ.Name = "btnFZ";
+ this.btnFZ.Size = new System.Drawing.Size(146, 32);
+ this.btnFZ.StyleController = this.layoutMx1;
+ this.btnFZ.TabIndex = 459;
+ this.btnFZ.Text = "鍚戜笅澶嶅埗鏃堕暱";
+ //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.lbGuid;
@@ -684,9 +699,6 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem12,
- this.layoutControlItem13,
- this.layoutControlItem15,
- this.layoutControlItem6,
this.layoutControlItem5,
this.layoutControlItem8,
this.layoutControlItem7,
@@ -697,36 +709,40 @@
this.layoutControlItem2,
this.layoutControlItem11,
this.layoutControlItem16,
+ this.layoutControlItem13,
+ this.layoutControlItem6,
+ this.layoutControlItem15,
+ this.layoutControlItem17,
this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1408, 185);
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.Root.Size = new System.Drawing.Size(1408, 299);
this.Root.TextVisible = false;
//
// layoutControlItem12
@@ -737,88 +753,51 @@
this.layoutControlItem12.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 69);
this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_Guid;
- this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem13.CustomizationFormText = "Guid";
- this.layoutControlItem13.Location = new System.Drawing.Point(694, 123);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(347, 42);
- this.layoutControlItem13.Text = "Guid";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
- this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.btnSelect;
- this.layoutControlItem15.Location = new System.Drawing.Point(347, 123);
- this.layoutControlItem15.MaxSize = new System.Drawing.Size(125, 36);
- this.layoutControlItem15.MinSize = new System.Drawing.Size(37, 36);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(347, 42);
- this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem15.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_createDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 123);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(347, 42);
- this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createBy;
- this.layoutControlItem5.Location = new System.Drawing.Point(1041, 82);
+ this.layoutControlItem5.Location = new System.Drawing.Point(1041, 139);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem5.Text = "寤虹珛鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_checkDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(694, 82);
+ this.layoutControlItem8.Location = new System.Drawing.Point(694, 139);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_checkBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(347, 82);
+ this.layoutControlItem7.Location = new System.Drawing.Point(347, 139);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem7.Text = "瀹℃牳鑰�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkStatus;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 82);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 139);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem10.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
//
@@ -827,11 +806,11 @@
this.layoutControlItem14.Control = this.txt_DAAType;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "宸ュ崟绫诲瀷";
- this.layoutControlItem14.Location = new System.Drawing.Point(1041, 41);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1041, 69);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem14.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem14.Text = "宸ュ崟绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
//
@@ -840,11 +819,11 @@
this.layoutControlItem3.Control = this.txt_DAA001;
this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem3.CustomizationFormText = "宸ュ崟鍙�";
- this.layoutControlItem3.Location = new System.Drawing.Point(694, 41);
+ this.layoutControlItem3.Location = new System.Drawing.Point(694, 69);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem3.Text = "宸ュ崟鍙�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
@@ -853,11 +832,11 @@
this.layoutControlItem1.Control = this.txt_Remark;
this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem1.CustomizationFormText = "璁℃椂璇存槑";
- this.layoutControlItem1.Location = new System.Drawing.Point(347, 41);
+ this.layoutControlItem1.Location = new System.Drawing.Point(347, 69);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem1.Text = "璇存槑";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
@@ -866,10 +845,10 @@
this.layoutControlItem2.Control = this.txt_ErrorTime;
this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem2.CustomizationFormText = "寮傚父鏃ユ湡";
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 41);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 70);
this.layoutControlItem2.Text = "寮傚父鏃ユ湡";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
@@ -881,7 +860,7 @@
this.layoutControlItem11.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 69);
this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
//
@@ -893,20 +872,73 @@
this.layoutControlItem16.Location = new System.Drawing.Point(694, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(347, 41);
+ this.layoutControlItem16.Size = new System.Drawing.Size(347, 69);
this.layoutControlItem16.Text = "璁℃椂鍗曚环";
this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_Guid;
+ this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem13.CustomizationFormText = "Guid";
+ this.layoutControlItem13.Location = new System.Drawing.Point(1041, 209);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem13.Text = "Guid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_createDate;
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 209);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.btnSelect;
+ this.layoutControlItem15.Location = new System.Drawing.Point(347, 209);
+ this.layoutControlItem15.MaxSize = new System.Drawing.Size(125, 36);
+ this.layoutControlItem15.MinSize = new System.Drawing.Size(37, 36);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem15.Text = "閫夊彇浜哄憳";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem15.TextVisible = false;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_ErrorNo;
+ this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem17.CustomizationFormText = "寮傚父鍗曞彿";
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.Size = new System.Drawing.Size(347, 69);
+ this.layoutControlItem17.Text = "寮傚父鍗曞彿";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22);
+ //
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.txt_ErrorNo;
- this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem4.CustomizationFormText = "寮傚父鍗曞彿";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem4.Control = this.btnFZ;
+ this.layoutControlItem4.Location = new System.Drawing.Point(694, 209);
+ this.layoutControlItem4.MaxSize = new System.Drawing.Size(150, 36);
+ this.layoutControlItem4.MinSize = new System.Drawing.Size(121, 36);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(347, 41);
- this.layoutControlItem4.Text = "寮傚父鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem4.TextVisible = false;
//
// gridControl1
//
@@ -917,7 +949,7 @@
this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1});
- this.gridControl1.Size = new System.Drawing.Size(1408, 498);
+ this.gridControl1.Size = new System.Drawing.Size(1408, 384);
this.gridControl1.TabIndex = 0;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@@ -1029,7 +1061,8 @@
this.gridColumn14.FieldName = "salary";
this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Tag = "edit";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Tag = "";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 6;
this.gridColumn14.Width = 112;
@@ -1074,10 +1107,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -1093,6 +1126,15 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumnIndex
+ //
+ this.gridColumnIndex.Caption = "搴忓彿";
+ this.gridColumnIndex.FieldName = "rowNo";
+ this.gridColumnIndex.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
+ this.gridColumnIndex.Visible = true;
+ this.gridColumnIndex.VisibleIndex = 0; // 鏀惧湪绗竴鍒�
+ this.gridView2.Columns.Insert(0, this.gridColumnIndex);
//
// Frm_MESJJERRORJS
//
@@ -1133,7 +1175,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ErrorType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_DAAType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_DAA001.Properties)).EndInit();
@@ -1141,12 +1182,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -1157,6 +1196,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
@@ -1192,7 +1235,6 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraEditors.TextEdit txt_Remark;
- private DevExpress.XtraEditors.TextEdit txt_Guid;
private DevExpress.XtraEditors.DateEdit txt_ErrorTime;
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
@@ -1205,7 +1247,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraEditors.TextEdit txt_ErrorNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1222,9 +1263,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.SearchLookUpEdit txt_HourlyType;
private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -1236,10 +1274,18 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.TextEdit txt_HourlySalary;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.TextEdit txt_Guid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraEditors.TextEdit txt_ErrorNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraEditors.SimpleButton btnFZ;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumnIndex;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 79650d0..c9dde64 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -38,6 +38,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ btnFZ.Click += btnFZ_Click;
+ gridView2.CustomUnboundColumnData += gridView2_CustomUnboundColumnData;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
@@ -717,5 +719,46 @@
}
}
}
+
+ private void gridView2_CustomUnboundColumnData(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDataEventArgs e)
+ {
+ if (e.Column.FieldName == "rowNo" && e.IsGetData)
+ {
+ e.Value = e.ListSourceRowIndex + 1;
+ }
+ }
+
+ private void btnFZ_Click(object sender, EventArgs e)
+ {
+ // 鑾峰彇褰撳墠閫変腑琛岀殑琛屽彿
+ int focusedRowHandle = gridView2.FocusedRowHandle;
+ if (focusedRowHandle < 0) return;
+
+ // 鑾峰彇褰撳墠琛岀殑鏃堕暱
+ DataRow currentRow = gridView2.GetDataRow(focusedRowHandle);
+ if (currentRow == null) return;
+
+ var hourValue = currentRow["hour"];
+ if (hourValue == null) return;
+
+ decimal hourlySalary = 0;
+ decimal hour = 0;
+ decimal.TryParse(txt_HourlySalary.Text, out hourlySalary);
+ // 鑾峰彇鏃堕暱
+ decimal.TryParse(currentRow["hour"]?.ToString(), out hour);
+
+ // 鎵归噺璁剧疆涓嬮潰鎵�鏈夎鐨勬椂闀�
+ for (int i = focusedRowHandle + 1; i < gridView2.DataRowCount; i++)
+ {
+ var row = gridView2.GetDataRow(i);
+ if (row != null)
+ {
+ row["hour"] = hourValue;
+ // 璁＄畻璁℃椂宸ヨ祫
+ row["salary"] = hourlySalary * hour;
+ }
+ }
+ gridView2.RefreshData();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
index e39749b..6c167c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
@@ -596,7 +596,7 @@
// gridColumn26
//
this.gridColumn26.Caption = "宸ュ崟";
- this.gridColumn26.FieldName = "dAA001";
+ this.gridColumn26.FieldName = "daa001";
this.gridColumn26.MinWidth = 30;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
index 5d7d4d1..b291d56 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -36,6 +36,8 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -65,7 +67,9 @@
this.colChkInt,
this.gridColumn1,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 62;
@@ -137,6 +141,26 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜х嚎鍙�";
+ this.gridColumn4.FieldName = "lineNo";
+ this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.Width = 112;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浜х嚎缂栫爜";
+ this.gridColumn5.FieldName = "lineName";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 112;
+ //
// SelectSTAFF
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -166,5 +190,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
--
Gitblit v1.9.3