From 98267f9dfb90aa98eb55e7abeabc52d3f8a5b694 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 27 八月 2025 15:25:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 332 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 189 insertions(+), 143 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index 57d57ef..61917b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -37,6 +37,7 @@
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.XtraLayout.RowDefinition rowDefinition5 = 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();
@@ -58,10 +59,12 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_OrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
@@ -83,7 +86,10 @@
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.layoutControlItem4 = 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();
@@ -94,11 +100,9 @@
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.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.缁勭粐鏈烘瀯 = new DevExpress.XtraLayout.LayoutControlItem();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -155,7 +159,10 @@
((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.layoutControlItem4)).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();
@@ -166,11 +173,9 @@
((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.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
@@ -269,7 +274,8 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn7,
- this.gridColumn17});
+ this.gridColumn17,
+ this.gridColumn8});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -392,6 +398,17 @@
this.gridColumn17.VisibleIndex = 9;
this.gridColumn17.Width = 112;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn8.FieldName = "orgName";
+ this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Tag = "org.orgName";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 112;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -436,6 +453,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_OrgId);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
@@ -465,10 +483,20 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_OrgId
+ //
+ this.txt_OrgId.IsReadly = false;
+ this.txt_OrgId.Location = new System.Drawing.Point(96, 12);
+ this.txt_OrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_OrgId.Name = "txt_OrgId";
+ this.txt_OrgId.Size = new System.Drawing.Size(259, 28);
+ this.txt_OrgId.TabIndex = 460;
+ this.txt_OrgId.Tag = "edit";
+ //
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(359, 221);
+ this.btnSelect.Location = new System.Drawing.Point(706, 179);
this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(121, 32);
@@ -488,7 +516,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(96, 221);
+ this.txt_createDate.Location = new System.Drawing.Point(443, 179);
this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -499,7 +527,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1137, 151);
+ this.txt_createBy.Location = new System.Drawing.Point(96, 179);
this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -510,7 +538,7 @@
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(443, 151);
+ this.txt_checkBy.Location = new System.Drawing.Point(790, 123);
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);
@@ -520,7 +548,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(790, 151);
+ this.txt_checkDate.Location = new System.Drawing.Point(1137, 123);
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);
@@ -530,7 +558,7 @@
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(12, 151);
+ this.txt_checkStatus.Location = new System.Drawing.Point(359, 123);
this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
@@ -541,7 +569,7 @@
//
// txt_Remark
//
- this.txt_Remark.Location = new System.Drawing.Point(443, 81);
+ this.txt_Remark.Location = new System.Drawing.Point(790, 67);
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);
@@ -551,7 +579,7 @@
//
// txt_Guid
//
- this.txt_Guid.Location = new System.Drawing.Point(1137, 221);
+ this.txt_Guid.Location = new System.Drawing.Point(790, 235);
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);
@@ -562,7 +590,7 @@
// txt_ErrorTime
//
this.txt_ErrorTime.EditValue = null;
- this.txt_ErrorTime.Location = new System.Drawing.Point(96, 81);
+ this.txt_ErrorTime.Location = new System.Drawing.Point(443, 67);
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[] {
@@ -582,7 +610,7 @@
// txt_ErrorType
//
this.txt_ErrorType.EditValue = "";
- this.txt_ErrorType.Location = new System.Drawing.Point(1137, 12);
+ this.txt_ErrorType.Location = new System.Drawing.Point(96, 67);
this.txt_ErrorType.Margin = new System.Windows.Forms.Padding(4);
this.txt_ErrorType.Name = "txt_ErrorType";
this.txt_ErrorType.Size = new System.Drawing.Size(259, 28);
@@ -592,7 +620,7 @@
//
// txt_DAAType
//
- this.txt_DAAType.Location = new System.Drawing.Point(1137, 81);
+ this.txt_DAAType.Location = new System.Drawing.Point(96, 123);
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;
@@ -604,7 +632,7 @@
//
// txt_DAA001
//
- this.txt_DAA001.Location = new System.Drawing.Point(790, 81);
+ this.txt_DAA001.Location = new System.Drawing.Point(1137, 67);
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[] {
@@ -625,7 +653,7 @@
//
// txt_HourlyType
//
- this.txt_HourlyType.Location = new System.Drawing.Point(443, 12);
+ this.txt_HourlyType.Location = new System.Drawing.Point(790, 12);
this.txt_HourlyType.Margin = new System.Windows.Forms.Padding(4);
this.txt_HourlyType.Name = "txt_HourlyType";
this.txt_HourlyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -648,7 +676,7 @@
//
// txt_HourlySalary
//
- this.txt_HourlySalary.Location = new System.Drawing.Point(790, 12);
+ this.txt_HourlySalary.Location = new System.Drawing.Point(1137, 12);
this.txt_HourlySalary.Margin = new System.Windows.Forms.Padding(4);
this.txt_HourlySalary.Name = "txt_HourlySalary";
this.txt_HourlySalary.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -660,7 +688,7 @@
//
// txt_ErrorNo
//
- this.txt_ErrorNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_ErrorNo.Location = new System.Drawing.Point(443, 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;
@@ -672,7 +700,7 @@
//
// btnFZ
//
- this.btnFZ.Location = new System.Drawing.Point(706, 221);
+ this.btnFZ.Location = new System.Drawing.Point(1053, 179);
this.btnFZ.Name = "btnFZ";
this.btnFZ.Size = new System.Drawing.Size(146, 32);
this.btnFZ.StyleController = this.layoutMx1;
@@ -696,7 +724,10 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem12,
+ this.layoutControlItem13,
+ this.layoutControlItem4,
+ this.layoutControlItem15,
+ this.layoutControlItem6,
this.layoutControlItem5,
this.layoutControlItem8,
this.layoutControlItem7,
@@ -707,11 +738,9 @@
this.layoutControlItem2,
this.layoutControlItem11,
this.layoutControlItem16,
- this.layoutControlItem13,
- this.layoutControlItem6,
- this.layoutControlItem15,
+ this.layoutControlItem12,
this.layoutControlItem17,
- this.layoutControlItem4});
+ this.缁勭粐鏈烘瀯});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -735,66 +764,111 @@
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4});
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1408, 299);
this.Root.TextVisible = false;
//
- // layoutControlItem12
+ // layoutControlItem13
//
- this.layoutControlItem12.Control = this.txt_HourlyType;
- this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem12.CustomizationFormText = "璁℃椂绫诲瀷";
- 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, 69);
- this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ 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, 223);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 56);
+ this.layoutControlItem13.Text = "Guid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.btnFZ;
+ this.layoutControlItem4.Location = new System.Drawing.Point(1041, 167);
+ this.layoutControlItem4.MaxSize = new System.Drawing.Size(150, 36);
+ this.layoutControlItem4.MinSize = new System.Drawing.Size(121, 36);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 56);
+ this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem4.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.btnSelect;
+ this.layoutControlItem15.Location = new System.Drawing.Point(694, 167);
+ 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 = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 56);
+ this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem15.Text = "閫夊彇浜哄憳";
+ 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(347, 167);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 56);
+ 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, 139);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 167);
this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 56);
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, 139);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1041, 111);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 56);
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, 139);
+ this.layoutControlItem7.Location = new System.Drawing.Point(694, 111);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 56);
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, 139);
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 111);
this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem10.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -804,11 +878,10 @@
this.layoutControlItem14.Control = this.txt_DAAType;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "宸ュ崟绫诲瀷";
- this.layoutControlItem14.Location = new System.Drawing.Point(1041, 69);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 111);
this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem14.Text = "宸ュ崟绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
//
@@ -817,11 +890,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, 69);
+ this.layoutControlItem3.Location = new System.Drawing.Point(1041, 55);
this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem3.Text = "宸ュ崟鍙�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
@@ -830,11 +903,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, 69);
+ this.layoutControlItem1.Location = new System.Drawing.Point(694, 55);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem1.Text = "璇存槑";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
@@ -843,10 +916,11 @@
this.layoutControlItem2.Control = this.txt_ErrorTime;
this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem2.CustomizationFormText = "寮傚父鏃ユ湡";
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 69);
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 55);
this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(347, 70);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem2.Text = "寮傚父鏃ユ湡";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
@@ -855,10 +929,10 @@
this.layoutControlItem11.Control = this.txt_ErrorType;
this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem11.CustomizationFormText = "鍗曟嵁绫诲瀷";
- this.layoutControlItem11.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 55);
this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(347, 69);
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 56);
this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
//
@@ -867,76 +941,44 @@
this.layoutControlItem16.Control = this.txt_HourlySalary;
this.layoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem16.CustomizationFormText = "璁℃椂鍗曚环";
- this.layoutControlItem16.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(347, 69);
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(347, 55);
this.layoutControlItem16.Text = "璁℃椂鍗曚环";
this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem13
+ // layoutControlItem12
//
- 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;
+ this.layoutControlItem12.Control = this.txt_HourlyType;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "璁℃椂绫诲瀷";
+ this.layoutControlItem12.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 55);
+ this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// 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.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.Size = new System.Drawing.Size(347, 69);
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.Size = new System.Drawing.Size(347, 55);
this.layoutControlItem17.Text = "寮傚父鍗曞彿";
this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem4
+ // 缁勭粐鏈烘瀯
//
- 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.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;
+ this.缁勭粐鏈烘瀯.Control = this.txt_OrgId;
+ this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(0, 0);
+ this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(347, 55);
+ this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
//
// gridControl1
//
@@ -967,9 +1009,9 @@
this.gridColumn19,
this.gvMxDel});
this.gridView2.GridControl = this.gridControl1;
+ this.gridView2.IndicatorWidth = 60;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsView.ShowGroupPanel = false;
- this.gridView2.IndicatorWidth = 60;
//
// gridColumn16
//
@@ -1175,7 +1217,10 @@
((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.layoutControlItem4)).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();
@@ -1186,11 +1231,9 @@
((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.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
@@ -1236,7 +1279,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1253,6 +1295,19 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.SearchLookUpEdit txt_HourlyType;
private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+ private DevExpress.XtraEditors.TextEdit txt_HourlySalary;
+ 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.XtraEditors.TextEdit txt_ErrorNo;
+ private DevExpress.XtraEditors.SimpleButton btnFZ;
+ private UserControl.UcLookOrg txt_OrgId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ 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;
@@ -1262,19 +1317,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.TextEdit txt_HourlySalary;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- 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 layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraEditors.SimpleButton btnFZ;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem 缁勭粐鏈烘瀯;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
--
Gitblit v1.9.3