From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
index c5ec84e..dba0ef3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
@@ -52,6 +52,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
this.SuspendLayout();
@@ -89,7 +90,8 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn11});
this.gridView1Report.GridControl = this.gcMain1Report;
this.gridView1Report.IndicatorWidth = 50;
this.gridView1Report.Name = "gridView1Report";
@@ -127,7 +129,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 74;
//
// gridColumn2
@@ -137,7 +139,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 74;
//
// gridColumn4
@@ -166,38 +168,30 @@
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 = 3;
+ this.gv_quantity.VisibleIndex = 2;
this.gv_quantity.Width = 74;
//
// gv_depotId
//
- this.gv_depotId.AppearanceCell.ForeColor = System.Drawing.Color.Red;
this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.AppearanceCell.Options.UseForeColor = true;
- this.gv_depotId.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gv_depotId.AppearanceHeader.Options.UseForeColor = true;
this.gv_depotId.Caption = "妫�楠岀姸鎬�";
- this.gv_depotId.FieldName = "checkStates";
+ this.gv_depotId.FieldName = "txtColor";
this.gv_depotId.MinWidth = 50;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 5;
+ this.gv_depotId.VisibleIndex = 4;
this.gv_depotId.Width = 73;
//
// gridColumn6
//
- this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Red;
- this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn6.Caption = "妫�楠岀粨鏋�";
this.gridColumn6.FieldName = "checkRes";
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.VisibleIndex = 5;
this.gridColumn6.Width = 74;
//
// gridColumn1
@@ -233,7 +227,7 @@
this.gv_ownerType.OptionsColumn.AllowEdit = false;
this.gv_ownerType.Tag = "query_a.Owner_Type";
this.gv_ownerType.Visible = true;
- this.gv_ownerType.VisibleIndex = 0;
+ this.gv_ownerType.VisibleIndex = 17;
this.gv_ownerType.Width = 74;
//
// gv_ownerId
@@ -246,7 +240,7 @@
this.gv_ownerId.OptionsColumn.AllowEdit = false;
this.gv_ownerId.Tag = "query_a.Owner_Id";
this.gv_ownerId.Visible = true;
- this.gv_ownerId.VisibleIndex = 1;
+ this.gv_ownerId.VisibleIndex = 0;
this.gv_ownerId.Width = 74;
//
// gridColumn5
@@ -256,7 +250,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.VisibleIndex = 1;
this.gridColumn5.Width = 74;
//
// gv_indepUserCode
@@ -296,7 +290,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 4;
+ this.gridColumn7.VisibleIndex = 3;
this.gridColumn7.Width = 77;
//
// gridColumn8
@@ -341,6 +335,16 @@
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "渚涘簲鍟�";
+ this.gridColumn11.FieldName = "gysName";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.Width = 94;
+ //
// UcRptCgdhd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -378,5 +382,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
--
Gitblit v1.9.3