From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
index 61000ab..0fb967a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -30,6 +30,7 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ 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();
@@ -44,17 +45,17 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
- this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(219, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(219, 24);
this.lookSearchSupplier.TabIndex = 8;
//
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn5,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
@@ -64,23 +65,27 @@
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浣跨敤缁勭粐";
+ this.gridColumn5.FieldName = "fSubsidiary";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "浠撳簱ID";
this.gridColumn1.FieldName = "depotId";
this.gridColumn1.MaxWidth = 100;
- this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.UnboundDataType = typeof(short);
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.UnboundDataType = typeof(string);
this.gridColumn1.Width = 80;
//
// gridColumn2
//
this.gridColumn2.Caption = "浠撳簱缂栧彿";
this.gridColumn2.FieldName = "depotCode";
- this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
@@ -91,7 +96,6 @@
//
this.gridColumn3.Caption = "浠撳簱鍚嶇О";
this.gridColumn3.FieldName = "depotName";
- this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
@@ -125,5 +129,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
--
Gitblit v1.9.3