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 | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 7352f38..fe632be 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -63,9 +63,11 @@
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
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();
@@ -158,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
@@ -256,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;
@@ -267,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;
@@ -282,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;
@@ -413,8 +422,10 @@
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_operationTime,
this.gv_operationTable,
+ this.gridColumn8,
this.gv_userName,
- this.gv_Btn});
+ this.gv_Btn,
+ this.gridColumn11});
this.gridView2.GridControl = this.gridControl2;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsFind.ShowSearchNavButtons = false;
@@ -447,6 +458,16 @@
this.gv_operationTable.VisibleIndex = 1;
this.gv_operationTable.Width = 100;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn8.FieldName = "documentTypeTxt";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 3;
+ this.gridColumn8.Width = 94;
+ //
// gv_userName
//
this.gv_userName.AppearanceCell.Options.UseFont = true;
@@ -467,7 +488,7 @@
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.VisibleIndex = 5;
this.gv_Btn.Width = 94;
//
// rptSrm
@@ -480,6 +501,16 @@
this.rptSrm.Name = "rptSrm";
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
//
@@ -580,5 +611,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptSrm;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
--
Gitblit v1.9.3