From 22ea524beef76405f6c9583d5a51fa55f4512014 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 07 六月 2025 09:10:51 +0800 Subject: [PATCH] 基础信息 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 176 +++++++++++++++++++++---------------------- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 24 ++--- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 4 DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 2 DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 23 ++--- DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 4 + 6 files changed, 112 insertions(+), 121 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs index b5a6633..cd31151 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs @@ -320,8 +320,6 @@ this.gv_isFinish.Name = "gv_isFinish"; this.gv_isFinish.OptionsColumn.AllowEdit = false; this.gv_isFinish.Tag = "query_a.IS_FINISH"; - this.gv_isFinish.Visible = true; - this.gv_isFinish.VisibleIndex = 2; this.gv_isFinish.Width = 50; // // gv_isOut @@ -335,7 +333,7 @@ this.gv_isOut.OptionsColumn.AllowEdit = false; this.gv_isOut.Tag = "query_a.IS_OUT"; this.gv_isOut.Visible = true; - this.gv_isOut.VisibleIndex = 3; + this.gv_isOut.VisibleIndex = 2; this.gv_isOut.Width = 50; // // gv_billNo @@ -347,7 +345,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 4; + this.gv_billNo.VisibleIndex = 3; this.gv_billNo.Width = 120; // // gv_lastUpdateUser @@ -359,7 +357,7 @@ this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false; this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER"; this.gv_lastUpdateUser.Visible = true; - this.gv_lastUpdateUser.VisibleIndex = 5; + this.gv_lastUpdateUser.VisibleIndex = 4; this.gv_lastUpdateUser.Width = 94; // // gv_lastUpdateTime @@ -371,7 +369,7 @@ this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false; this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME"; this.gv_lastUpdateTime.Visible = true; - this.gv_lastUpdateTime.VisibleIndex = 6; + this.gv_lastUpdateTime.VisibleIndex = 5; this.gv_lastUpdateTime.Width = 180; // // gv_checkUser @@ -383,7 +381,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.CHECK_USER"; this.gv_checkUser.Visible = true; - this.gv_checkUser.VisibleIndex = 7; + this.gv_checkUser.VisibleIndex = 6; this.gv_checkUser.Width = 94; // // gv_checkDate @@ -395,7 +393,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.CHECK_DATE"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 8; + this.gv_checkDate.VisibleIndex = 7; this.gv_checkDate.Width = 94; // // gv_returnMethod @@ -407,7 +405,7 @@ this.gv_returnMethod.OptionsColumn.AllowEdit = false; this.gv_returnMethod.Tag = "query_a.RETURN_METHOD"; this.gv_returnMethod.Visible = true; - this.gv_returnMethod.VisibleIndex = 9; + this.gv_returnMethod.VisibleIndex = 8; this.gv_returnMethod.Width = 94; // // gv_returnType @@ -419,7 +417,7 @@ this.gv_returnType.OptionsColumn.AllowEdit = false; this.gv_returnType.Tag = "query_a.RETURN_TYPE"; this.gv_returnType.Visible = true; - this.gv_returnType.VisibleIndex = 10; + this.gv_returnType.VisibleIndex = 9; this.gv_returnType.Width = 94; // // gv_depotId @@ -431,7 +429,7 @@ this.gv_depotId.OptionsColumn.AllowEdit = false; this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; - this.gv_depotId.VisibleIndex = 11; + this.gv_depotId.VisibleIndex = 10; this.gv_depotId.Width = 94; // // gv_suppId @@ -443,7 +441,7 @@ this.gv_suppId.OptionsColumn.AllowEdit = false; this.gv_suppId.Tag = "query_a.SUPP_ID"; this.gv_suppId.Visible = true; - this.gv_suppId.VisibleIndex = 12; + this.gv_suppId.VisibleIndex = 11; this.gv_suppId.Width = 94; // // gv_remark @@ -455,7 +453,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.REMARK"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 13; + this.gv_remark.VisibleIndex = 12; this.gv_remark.Width = 94; // // gridColumn7 diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs index 7e2d12a..69ce2e2 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs @@ -977,6 +977,10 @@ // // gridColumn14 // + this.gridColumn14.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn14.AppearanceCell.Options.UseForeColor = true; + this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn14.AppearanceHeader.Options.UseForeColor = true; this.gridColumn14.Caption = "澶勭疆鎰忚"; this.gridColumn14.FieldName = "handResult"; this.gridColumn14.MinWidth = 25; diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs index 1c1c58f..2be82bb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs @@ -294,7 +294,7 @@ // gv_ischeck // this.gv_ischeck.AppearanceCell.Options.UseFont = true; - this.gv_ischeck.Caption = "瀹℃牳鏍囪瘑"; + this.gv_ischeck.Caption = "瀹℃牳"; this.gv_ischeck.FieldName = "checkStatus"; this.gv_ischeck.Name = "gv_ischeck"; this.gv_ischeck.OptionsColumn.AllowEdit = false; @@ -305,7 +305,7 @@ // // gridColumn9 // - this.gridColumn9.Caption = "濮斿鏍囪瘑"; + this.gridColumn9.Caption = "濮斿"; this.gridColumn9.FieldName = "isWw"; this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs index 30c1e94..9ccbbba 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs @@ -101,19 +101,21 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; // - // split1.split1_Panel1 + // split1.Panel1 // this.split1.Panel1.Controls.Add(this.gcMain1); this.split1.Panel1.Controls.Add(this.pageBar1); this.split1.Panel1.Text = "Panel1"; // - // split1.split1_Panel2 + // split1.Panel2 // - this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -121,7 +123,6 @@ // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; @@ -132,7 +133,6 @@ // // gridView1 // - this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_guid, @@ -156,11 +156,11 @@ this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowFooter = true; this.gridView1.OptionsView.ShowGroupPanel = false; // // gv_guid // - this.gv_guid.AppearanceCell.Options.UseFont = true; this.gv_guid.Caption = "涓婚敭GUID"; this.gv_guid.FieldName = "guid"; @@ -172,7 +172,6 @@ // // gv_itemId // - this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "鐗╂枡ID "; this.gv_itemId.FieldName = "itemId"; @@ -216,7 +215,6 @@ // // gv_itemBarcode // - this.gv_itemBarcode.AppearanceCell.Options.UseFont = true; this.gv_itemBarcode.Caption = "鐗╂枡鏉$爜"; this.gv_itemBarcode.FieldName = "itemBarcode"; @@ -230,13 +228,14 @@ // // gv_quantity // - this.gv_quantity.AppearanceCell.Options.UseFont = true; this.gv_quantity.Caption = "鏁伴噺 "; this.gv_quantity.FieldName = "quantity"; this.gv_quantity.MinWidth = 50; this.gv_quantity.Name = "gv_quantity"; this.gv_quantity.OptionsColumn.AllowEdit = false; + this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { + new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")}); this.gv_quantity.Tag = "query_a.QUANTITY"; this.gv_quantity.Visible = true; this.gv_quantity.VisibleIndex = 5; @@ -244,7 +243,6 @@ // // gv_depotId // - this.gv_depotId.AppearanceCell.Options.UseFont = true; this.gv_depotId.Caption = "浠撳簱ID"; this.gv_depotId.FieldName = "depotId"; @@ -278,7 +276,6 @@ // // gv_depotSectionsCode // - this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true; this.gv_depotSectionsCode.Caption = "璐т綅缂栧彿"; this.gv_depotSectionsCode.FieldName = "depotSectionsCode"; @@ -292,7 +289,6 @@ // // gv_ownerType // - this.gv_ownerType.AppearanceCell.Options.UseFont = true; this.gv_ownerType.Caption = "璐т富绫诲瀷"; this.gv_ownerType.FieldName = "ownerType"; @@ -306,7 +302,6 @@ // // gv_ownerId // - this.gv_ownerId.AppearanceCell.Options.UseFont = true; this.gv_ownerId.Caption = "璐т富ID"; this.gv_ownerId.FieldName = "ownerId"; @@ -330,7 +325,6 @@ // // gv_indepUserCode // - this.gv_indepUserCode.AppearanceCell.Options.UseFont = true; this.gv_indepUserCode.Caption = "鍏ュ簱浜�"; this.gv_indepUserCode.FieldName = "indepUserCode"; @@ -344,7 +338,6 @@ // // gv_indepDate // - this.gv_indepDate.AppearanceCell.Options.UseFont = true; this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 "; this.gv_indepDate.FieldName = "indepDate"; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index e5a8256..b733e24 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -30,29 +30,29 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -381,7 +381,7 @@ // gv_urgentFlag // this.gv_urgentFlag.AppearanceCell.Options.UseFont = true; - this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑"; + this.gv_urgentFlag.Caption = "鎬ユ枡"; this.gv_urgentFlag.FieldName = "urgentFlag"; this.gv_urgentFlag.MaxWidth = 50; this.gv_urgentFlag.MinWidth = 50; @@ -394,7 +394,7 @@ // // gridColumn25 // - this.gridColumn25.Caption = "濮斿鏍囪瘑"; + this.gridColumn25.Caption = "濮斿"; this.gridColumn25.FieldName = "fType"; this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; @@ -773,32 +773,32 @@ this.layoutControlItem13}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition21.Width = 100D; - columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition22.Width = 100D; - columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition23.Width = 100D; - columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition24.Width = 100D; + columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition11.Width = 100D; + columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition12.Width = 100D; + columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition13.Width = 100D; + columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition14.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition21, - columnDefinition22, - columnDefinition23, - columnDefinition24}); - rowDefinition17.Height = 100D; - rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition18.Height = 100D; - rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition19.Height = 100D; - rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition20.Height = 100D; - rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition11, + columnDefinition12, + columnDefinition13, + columnDefinition14}); + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition10.Height = 100D; + rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition11.Height = 100D; + rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition12.Height = 100D; + rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition17, - rowDefinition18, - rowDefinition19, - rowDefinition20}); + rowDefinition9, + rowDefinition10, + rowDefinition11, + rowDefinition12}); this.Root.Size = new System.Drawing.Size(1344, 140); this.Root.TextVisible = false; // @@ -1036,17 +1036,17 @@ this.layoutControlItem27}); this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup2.Name = "layoutControlGroup2"; - columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition25.Width = 100D; - columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition26.Width = 100D; + columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition15.Width = 100D; + columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition16.Width = 100D; this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition25, - columnDefinition26}); - rowDefinition21.Height = 100D; - rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition15, + columnDefinition16}); + rowDefinition13.Height = 100D; + rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition21}); + rowDefinition13}); this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); this.layoutControlGroup2.TextVisible = false; @@ -1207,29 +1207,29 @@ this.layoutControlItem25}); this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup1.Name = "Root"; - columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition27.Width = 100D; - columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition28.Width = 100D; - columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition29.Width = 100D; - columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition30.Width = 100D; + columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition17.Width = 100D; + columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition18.Width = 100D; + columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition19.Width = 100D; + columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition20.Width = 100D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition27, - columnDefinition28, - columnDefinition29, - columnDefinition30}); - rowDefinition22.Height = 100D; - rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition23.Height = 100D; - rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition24.Height = 100D; - rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition17, + columnDefinition18, + columnDefinition19, + columnDefinition20}); + rowDefinition14.Height = 100D; + rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition15.Height = 100D; + rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition16.Height = 100D; + rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition22, - rowDefinition23, - rowDefinition24}); + rowDefinition14, + rowDefinition15, + rowDefinition16}); this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); this.layoutControlGroup1.TextVisible = false; // @@ -1521,8 +1521,6 @@ this.gridColumn5.MinWidth = 50; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 9; this.gridColumn5.Width = 159; // // gridColumn9 @@ -1533,7 +1531,7 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 10; + this.gridColumn9.VisibleIndex = 9; this.gridColumn9.Width = 83; // // gridColumn7 @@ -1543,8 +1541,6 @@ this.gridColumn7.MinWidth = 50; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 11; this.gridColumn7.Width = 83; // // gridColumn15 @@ -1554,7 +1550,7 @@ this.gridColumn15.MinWidth = 50; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 12; + this.gridColumn15.VisibleIndex = 10; this.gridColumn15.Width = 83; // // gridColumn19 @@ -1564,7 +1560,7 @@ this.gridColumn19.MinWidth = 50; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 13; + this.gridColumn19.VisibleIndex = 11; this.gridColumn19.Width = 91; // // gridColumn12 @@ -1574,7 +1570,7 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 14; + this.gridColumn12.VisibleIndex = 12; this.gridColumn12.Width = 94; // // tabMxPage2 @@ -1774,10 +1770,10 @@ // rptChongDa // this.rptChongDa.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; - editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptChongDa.Name = "rptChongDa"; this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs index 5b70469..27dc737 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs @@ -34,7 +34,7 @@ private void getSuppler() { - var pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1"); + var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", " and IS_STATUS=1"); var json = JsonConvert.SerializeObject(pgq); try { -- Gitblit v1.9.3