From af065dd4a06281251a36de69052570c1c8be692d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 27 八月 2025 14:24:52 +0800
Subject: [PATCH] 增加组织机构的字段和查询条件
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs | 16 +
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 20
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 92 ++----
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs | 10
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs | 4
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs | 6
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs | 5
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs | 53 +++
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs | 10
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs | 125 ++++++---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 332 ++++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs | 8
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs | 11
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs | 36 ++
14 files changed, 455 insertions(+), 273 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
index 831dc95..337899c 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -82,6 +82,7 @@
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -115,6 +116,7 @@
this.txt_SP_DATE = new DevExpress.XtraEditors.DateEdit();
this.txt_JY_DATE = new DevExpress.XtraEditors.DateEdit();
this.txt_checkDate = new DevExpress.XtraEditors.DateEdit();
+ this.txt_OrgName = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -144,6 +146,7 @@
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -234,6 +237,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OrgName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -263,6 +267,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
@@ -384,7 +389,8 @@
this.gridColumn32,
this.gridColumn33,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn52});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -643,6 +649,16 @@
this.gridColumn35.VisibleIndex = 24;
this.gridColumn35.Width = 112;
//
+ // gridColumn52
+ //
+ this.gridColumn52.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn52.FieldName = "orgName";
+ this.gridColumn52.MinWidth = 30;
+ this.gridColumn52.Name = "gridColumn52";
+ this.gridColumn52.Visible = true;
+ this.gridColumn52.VisibleIndex = 25;
+ this.gridColumn52.Width = 112;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -716,6 +732,7 @@
this.layoutMx1.Controls.Add(this.txt_SP_DATE);
this.layoutMx1.Controls.Add(this.txt_JY_DATE);
this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Controls.Add(this.txt_OrgName);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -788,7 +805,7 @@
this.txt_LineNo.Size = new System.Drawing.Size(241, 28);
this.txt_LineNo.StyleController = this.layoutMx1;
this.txt_LineNo.TabIndex = 250;
- this.txt_LineNo.Tag = "";
+ this.txt_LineNo.Tag = "readonly";
//
// txt_ItemName
//
@@ -818,7 +835,7 @@
this.txt_WorkShop.Size = new System.Drawing.Size(241, 28);
this.txt_WorkShop.StyleController = this.layoutMx1;
this.txt_WorkShop.TabIndex = 250;
- this.txt_WorkShop.Tag = "";
+ this.txt_WorkShop.Tag = "readonly";
//
// txt_Brand
//
@@ -1084,6 +1101,16 @@
this.txt_checkDate.TabIndex = 248;
this.txt_checkDate.Tag = "";
//
+ // txt_OrgName
+ //
+ this.txt_OrgName.Location = new System.Drawing.Point(114, 283);
+ this.txt_OrgName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_OrgName.Name = "txt_OrgName";
+ this.txt_OrgName.Size = new System.Drawing.Size(241, 28);
+ this.txt_OrgName.StyleController = this.layoutMx1;
+ this.txt_OrgName.TabIndex = 250;
+ this.txt_OrgName.Tag = "readonly";
+ //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.lbGuid;
@@ -1128,6 +1155,7 @@
this.layoutControlItem28,
this.layoutControlItem29,
this.layoutControlItem30,
+ this.layoutControlItem10,
this.layoutControlItem17});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -1506,6 +1534,18 @@
this.layoutControlItem30.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem30.Text = "澶囨敞";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_OrgName;
+ this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem10.CustomizationFormText = "缁勭粐鏈烘瀯";
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 271);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 39);
+ this.layoutControlItem10.Text = "缁勭粐鏈烘瀯";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem17
//
@@ -1993,6 +2033,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OrgName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -2022,6 +2063,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
@@ -2128,7 +2170,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraEditors.TextEdit txt_Remark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gridControl1;
@@ -2173,5 +2214,9 @@
private DevExpress.XtraEditors.DateEdit txt_SP_DATE;
private DevExpress.XtraEditors.DateEdit txt_JY_DATE;
private DevExpress.XtraEditors.DateEdit txt_checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+ private DevExpress.XtraEditors.TextEdit txt_OrgName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
index 41e5c1b..5605b63 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
@@ -427,7 +427,10 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and OrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
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
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 788cf68..97211ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -40,6 +40,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
btnFZ.Click += btnFZ_Click;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
@@ -52,11 +53,6 @@
{
getPageList(this.pageBar1.CurrentPage);
}, lbGuid);
- // 寤惰繜璋冪敤 getXmlConfig锛岀‘淇� GridView 瀹屽叏鍒濆鍖栧悗鍐嶆仮澶嶅竷灞�
- this.Load += (s, e) =>
- {
- this.toolBarMenu1.getXmlConfig();
- };
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;
@@ -64,7 +60,8 @@
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- var frm = new SelectSTAFF();
+ var orgId = txt_OrgId.GetId();
+ var frm = new SelectSTAFF(orgId);
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -373,6 +370,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMain1, gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
txt_ErrorType.EditValue = "璁℃椂宸ユ椂";
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_OrgId);
GetTimeType();
GetWOMDAAInfo();
}
@@ -391,6 +389,7 @@
getModel(rowGuid);
GetTimeType();
GetWOMDAAInfo();
+ txt_OrgId.IsReadly = true;
}
/// <summary>
@@ -425,6 +424,7 @@
remark = txt_Remark.Text.Trim(),//璇存槑
DAA001 = txt_DAA001.Text.Trim(),//宸ュ崟鍙�
DAAType = txt_DAAType.Text.Trim(),//宸ュ崟绫诲瀷
+ OrgId = txt_OrgId.GetId().Trim(),//宸ュ崟绫诲瀷
list = new List<dynamic>(),
};
gridView2.CloseEditor();
@@ -509,8 +509,12 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.OrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
index 9766c05..d196bbb 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -26,6 +26,7 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
string date;
string lineNo;
+ string orgId;
// 鐢ㄤ簬璺熻釜鍘熷鍊肩殑瀛楀吀
private Dictionary<string, Dictionary<string, object>> _originalValues = new Dictionary<string, Dictionary<string, object>>();
@@ -65,7 +66,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- var frm = new KQCX(lineNo, date);
+ var frm = new KQCX(lineNo, date, orgId);
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -73,6 +74,7 @@
lst = ee.StringList;
lineNo = string.IsNullOrEmpty(lst[0]) ? "0" : lst[0];
date = string.IsNullOrEmpty(lst[1]) ? DateTime.Now.AddMonths(-1).ToString() : lst[1];
+ orgId = string.IsNullOrEmpty(lst[2]) ? "1" : lst[2];
getPageList();
};
frm.ShowDialog();
@@ -121,7 +123,8 @@
var _obj = new
{
date = date,
- lineNo = lineNo
+ lineNo = lineNo,
+ orgId = orgId
};
// gcMain1.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
@@ -249,7 +252,8 @@
var _obj = new
{
date = date,
- lineNo = lineNo
+ lineNo = lineNo,
+ orgId = orgId
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
index 1061938..125ad2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
@@ -46,6 +46,7 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,9 +68,9 @@
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.txt_DepartmentName = new DevExpress.XtraEditors.TextEdit();
this.txt_LineName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_OrgId = new Gs.DevApp.UserControl.UcLookOrg();
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.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,8 +78,10 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.缁勭粐鏈烘瀯 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -113,7 +116,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_LineName.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.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -121,8 +123,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -210,6 +214,7 @@
this.gv_createBy,
this.gv_createDate,
this.gridColumn6,
+ this.gridColumn5,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
@@ -262,6 +267,17 @@
this.gridColumn6.VisibleIndex = 0;
this.gridColumn6.Width = 117;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn5.FieldName = "orgName";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "orgName";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 112;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "閮ㄩ棬ID";
@@ -272,7 +288,7 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "departmentId";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -285,7 +301,7 @@
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Tag = "departmentName";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 120;
//
// gridColumn3
@@ -296,9 +312,9 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Tag = "lineNo";
+ this.gridColumn3.Tag = "line_No";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -309,9 +325,9 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Tag = "lineName";
+ this.gridColumn4.Tag = "line_Name";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 120;
//
// pageBar1
@@ -368,6 +384,7 @@
this.layoutMx1.Controls.Add(this.txt_LineNo);
this.layoutMx1.Controls.Add(this.txt_DepartmentName);
this.layoutMx1.Controls.Add(this.txt_LineName);
+ this.layoutMx1.Controls.Add(this.txt_OrgId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -434,11 +451,11 @@
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(1056, 46);
+ this.txt_checkStatus.Location = new System.Drawing.Point(1053, 46);
this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_checkStatus.Size = new System.Drawing.Size(340, 27);
+ this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
this.txt_checkStatus.StyleController = this.layoutMx1;
this.txt_checkStatus.TabIndex = 249;
this.txt_checkStatus.Tag = "readonly";
@@ -455,7 +472,7 @@
//
// txt_DepartmentId
//
- this.txt_DepartmentId.Location = new System.Drawing.Point(96, 12);
+ this.txt_DepartmentId.Location = new System.Drawing.Point(443, 12);
this.txt_DepartmentId.Margin = new System.Windows.Forms.Padding(4);
this.txt_DepartmentId.Name = "txt_DepartmentId";
this.txt_DepartmentId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -497,7 +514,7 @@
//
// txt_DepartmentName
//
- this.txt_DepartmentName.Location = new System.Drawing.Point(443, 12);
+ this.txt_DepartmentName.Location = new System.Drawing.Point(790, 12);
this.txt_DepartmentName.Margin = new System.Windows.Forms.Padding(4);
this.txt_DepartmentName.Name = "txt_DepartmentName";
this.txt_DepartmentName.Properties.ReadOnly = true;
@@ -517,6 +534,16 @@
this.txt_LineName.TabIndex = 253;
this.txt_LineName.Tag = "readonly";
//
+ // 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";
+ //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.lbGuid;
@@ -534,7 +561,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem11,
this.layoutControlItem10,
@@ -542,8 +568,10 @@
this.layoutControlItem7,
this.layoutControlItem6,
this.layoutControlItem5,
+ this.layoutControlItem2,
this.layoutControlItem1,
- this.layoutControlItem2});
+ this.layoutControlItem12,
+ this.缁勭粐鏈烘瀯});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -574,17 +602,6 @@
rowDefinition4});
this.Root.Size = new System.Drawing.Size(1408, 159);
this.Root.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_DepartmentId;
- this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem12.CustomizationFormText = "閮ㄩ棬";
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
- this.layoutControlItem12.Text = "閮ㄩ棬";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
@@ -664,16 +681,6 @@
this.layoutControlItem5.Text = "寤虹珛鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_DepartmentName;
- this.layoutControlItem1.Location = new System.Drawing.Point(347, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
- this.layoutControlItem1.Text = "閮ㄩ棬鍚嶇О";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
- //
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_LineName;
@@ -684,6 +691,38 @@
this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem2.Text = "浜х嚎鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_DepartmentName;
+ this.layoutControlItem1.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem1.Text = "閮ㄩ棬鍚嶇О";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_DepartmentId;
+ 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, 34);
+ this.layoutControlItem12.Text = "閮ㄩ棬";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // 缁勭粐鏈烘瀯
+ //
+ this.缁勭粐鏈烘瀯.Control = this.txt_OrgId;
+ this.缁勭粐鏈烘瀯.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.缁勭粐鏈烘瀯.CustomizationFormText = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(0, 0);
+ this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
+ this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(347, 34);
+ this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
//
// picCheckBox
//
@@ -740,7 +779,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_LineName.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.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -748,8 +786,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.缁勭粐鏈烘瀯)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -783,7 +823,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.TextEdit txt_Guid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.SearchLookUpEdit txt_DepartmentId;
private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
private DevExpress.XtraEditors.SearchLookUpEdit txt_LineNo;
@@ -797,7 +836,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private UserControl.UcLookOrg txt_OrgId;
+ private DevExpress.XtraLayout.LayoutControlItem 缁勭粐鏈烘瀯;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
index f922fd6..3d996f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
@@ -306,6 +306,7 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
GetDepartmentData();
GetLineData();
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_OrgId);
getPageList(this.pageBar1.CurrentPage);
}
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
@@ -323,6 +324,7 @@
getModel(rowGuid);
GetDepartmentData();
GetLineData();
+ txt_OrgId.IsReadly = true;
getPageList(this.pageBar1.CurrentPage);
}
@@ -382,7 +384,8 @@
departmentId = departmentId,
departmentName = departmentName,
lineNo = lineNo,
- lineName = lineName
+ lineName = lineName,
+ orgId = txt_OrgId.GetId().Trim(),//宸ュ崟绫诲瀷
};
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
@@ -409,7 +412,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.OrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
index e8f5d26..4145570 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
@@ -54,6 +54,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -239,7 +240,8 @@
this.gridColumn3,
this.gridColumn4,
this.gridColumn5,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn9});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -385,6 +387,17 @@
this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Tag = "itemId";
this.gridColumn10.Width = 112;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn9.FieldName = "orgName";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "org.NAME";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.Width = 112;
//
// pageBar1
//
@@ -1024,5 +1037,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
index 91327b1..1911b51 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
@@ -196,7 +196,7 @@
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
-
+ this.txt_itemId.ReadOnly = true;
}
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
@@ -211,7 +211,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
getModel(rowGuid);
-
+ txt_itemId.Enabled = false;
}
/// <summary>
@@ -291,7 +291,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and b.FSubsidiary in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
index 8f64045..1dfc3b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
@@ -34,6 +34,8 @@
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.textEdit1 = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.txtOrgId = new Gs.DevApp.UserControl.UcLookOrg();
((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
@@ -43,7 +45,7 @@
// dateEdit1
//
this.dateEdit1.EditValue = null;
- this.dateEdit1.Location = new System.Drawing.Point(209, 99);
+ this.dateEdit1.Location = new System.Drawing.Point(210, 142);
this.dateEdit1.Margin = new System.Windows.Forms.Padding(2);
this.dateEdit1.Name = "dateEdit1";
this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -56,7 +58,7 @@
// simpleButton1
//
this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x161;
- this.simpleButton1.Location = new System.Drawing.Point(247, 172);
+ this.simpleButton1.Location = new System.Drawing.Point(248, 215);
this.simpleButton1.Margin = new System.Windows.Forms.Padding(2);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(138, 44);
@@ -66,7 +68,7 @@
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(65, 45);
+ this.labelControl1.Location = new System.Drawing.Point(66, 88);
this.labelControl1.Margin = new System.Windows.Forms.Padding(2);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(78, 22);
@@ -75,7 +77,7 @@
//
// labelControl2
//
- this.labelControl2.Location = new System.Drawing.Point(65, 105);
+ this.labelControl2.Location = new System.Drawing.Point(66, 148);
this.labelControl2.Margin = new System.Windows.Forms.Padding(2);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(54, 22);
@@ -84,7 +86,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(209, 45);
+ this.textEdit1.Location = new System.Drawing.Point(210, 88);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -100,11 +102,31 @@
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // labelControl3
+ //
+ this.labelControl3.Location = new System.Drawing.Point(66, 28);
+ this.labelControl3.Margin = new System.Windows.Forms.Padding(2);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(78, 22);
+ this.labelControl3.TabIndex = 7;
+ this.labelControl3.Text = "閫夋嫨缁勭粐:";
+ //
+ // txtOrgId
+ //
+ this.txtOrgId.IsReadly = false;
+ this.txtOrgId.Location = new System.Drawing.Point(210, 28);
+ this.txtOrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOrgId.Name = "txtOrgId";
+ this.txtOrgId.Size = new System.Drawing.Size(386, 37);
+ this.txtOrgId.TabIndex = 8;
+ //
// KQCX
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(646, 248);
+ this.ClientSize = new System.Drawing.Size(646, 314);
+ this.Controls.Add(this.txtOrgId);
+ this.Controls.Add(this.labelControl3);
this.Controls.Add(this.labelControl2);
this.Controls.Add(this.labelControl1);
this.Controls.Add(this.simpleButton1);
@@ -132,5 +154,7 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.SearchLookUpEdit textEdit1;
private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private UserControl.UcLookOrg txtOrgId;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
index b1c11b6..6618f03 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
@@ -24,12 +24,13 @@
GetWORKSHOPLINE();
}
- public KQCX(string lineNo,string date)
+ public KQCX(string lineNo,string date, string orgId)
{
InitializeComponent();
GetWORKSHOPLINE();
textEdit1.EditValue = lineNo;
dateEdit1.EditValue = date;
+ txtOrgId.SetIdOrCode(orgId ?? "1");
}
/// <summary>
@@ -43,6 +44,7 @@
list.Add(textEdit1.EditValue?.ToString() ?? "");
list.Add(dateEdit1.EditValue?.ToString() ?? "");
+ list.Add(txtOrgId.GetId());
UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
index 6eb5909..d1a6d7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
@@ -12,7 +12,7 @@
{
private readonly string _webServiceName = "MesJjgzErrorJs/";
private string daaGuid = "";
- public SelectSTAFF()
+ public SelectSTAFF( string orgId )
{
InitializeComponent();
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
@@ -24,7 +24,7 @@
this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.colChkInt.VisibleIndex = 0;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
- getPageList(1);
+ getPageList(1, orgId);
btnIn.Click += (s, e) =>
{
gridView1.PostEditor();
@@ -58,7 +58,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage, string orgId)
{
var _obj = new
{
@@ -66,7 +66,7 @@
everyPageSize = 999999,
sortName = "",
keyWhere = "",
- daaGuid = daaGuid
+ orgId = orgId
};
var json = JsonConvert.SerializeObject(_obj);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
index aa6267a..889940e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -33,7 +33,6 @@
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -47,6 +46,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,7 +61,7 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -69,13 +69,8 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.Panel2.SuspendLayout();
this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
- this.splitContainerControl1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
- this.splitContainerControl1.Panel2.SuspendLayout();
- this.splitContainerControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
@@ -130,37 +125,18 @@
//
// split1.Panel1
//
- this.split1.Panel1.Controls.Add(this.splitContainerControl1);
+ this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
// split1.Panel2
//
+ this.split1.Panel2.Controls.Add(this.gridControl1);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1408, 698);
- this.split1.SplitterPosition = 0;
+ this.split1.SplitterPosition = 268;
this.split1.TabIndex = 0;
- //
- // splitContainerControl1
- //
- this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
- this.splitContainerControl1.Name = "splitContainerControl1";
- //
- // splitContainerControl1.Panel1
- //
- this.splitContainerControl1.Panel1.Controls.Add(this.gcMain1);
- this.splitContainerControl1.Panel1.Text = "Panel1";
- //
- // splitContainerControl1.Panel2
- //
- this.splitContainerControl1.Panel2.Controls.Add(this.gridControl1);
- this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1408, 635);
- this.splitContainerControl1.SplitterPosition = 365;
- this.splitContainerControl1.TabIndex = 5;
//
// gcMain1
//
@@ -170,8 +146,8 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 365);
- this.gcMain1.TabIndex = 3;
+ this.gcMain1.Size = new System.Drawing.Size(1408, 367);
+ this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -189,7 +165,8 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn6,
- this.gridColumn7});
+ this.gridColumn7,
+ this.gridColumn18});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -312,6 +289,18 @@
this.gridColumn7.VisibleIndex = 10;
this.gridColumn7.Width = 112;
//
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 367);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
// gridControl1
//
this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -320,8 +309,8 @@
this.gridControl1.MainView = this.gridView2;
this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Name = "gridControl1";
- this.gridControl1.Size = new System.Drawing.Size(1408, 255);
- this.gridControl1.TabIndex = 4;
+ this.gridControl1.Size = new System.Drawing.Size(1408, 268);
+ this.gridControl1.TabIndex = 5;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
//
@@ -473,17 +462,15 @@
this.gridColumn17.VisibleIndex = 11;
this.gridColumn17.Width = 112;
//
- // pageBar1
+ // gridColumn18
//
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
+ this.gridColumn18.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn18.FieldName = "orgName";
+ this.gridColumn18.MinWidth = 30;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.Width = 112;
//
// CPMX
//
@@ -502,14 +489,9 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ this.split1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
- this.splitContainerControl1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
- this.splitContainerControl1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
- this.splitContainerControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
@@ -523,7 +505,6 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
@@ -540,16 +521,17 @@
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
index 044a7df..ea51c6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
@@ -196,7 +196,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3