From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 9780866..fe632be 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -67,10 +67,10 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptSrm = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.label1 = new System.Windows.Forms.Label();
this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -160,6 +160,7 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 60;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// colChkInt
@@ -258,6 +259,8 @@
this.gridColumn6.MinWidth = 10;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
this.gridColumn6.Width = 11;
@@ -269,6 +272,8 @@
this.gridColumn9.MinWidth = 10;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
this.gridColumn9.Width = 50;
@@ -284,6 +289,8 @@
this.gridColumn7.MinWidth = 10;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
this.gridColumn7.Width = 10;
@@ -495,6 +502,16 @@
this.rptSrm.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptSrm.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptSrm_ButtonClick);
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn11.FieldName = "createDate";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 4;
+ this.gridColumn11.Width = 94;
+ //
// panelControl3
//
this.panelControl3.Controls.Add(this.label1);
@@ -524,16 +541,6 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "濮斿")});
this.radioGroup1.Size = new System.Drawing.Size(197, 34);
this.radioGroup1.TabIndex = 0;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "寤虹珛鏃堕棿";
- this.gridColumn11.FieldName = "createDate";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 94;
//
// SelectCgMx
//
--
Gitblit v1.9.3