From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index a386b1a..60d83aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -134,7 +134,7 @@
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_factory = new DevExpress.XtraEditors.LabelControl();
this.txt_factory = new DevExpress.XtraEditors.TextEdit();
- this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -1357,21 +1357,21 @@
this.txt_factory.TabIndex = 211;
this.txt_factory.Tag = "factory";
//
- // gv_factory
+ // gv_id
//
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "宸ュ巶";
- this.gv_factory.FieldName = "factory";
- this.gv_factory.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_factory.MinWidth = 80;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.OptionsColumn.ReadOnly = true;
- this.gv_factory.Tag = "query_a.factory";
- this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 0;
- this.gv_factory.Width = 94;
+ this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_id.AppearanceCell.Options.UseFont = true;
+ this.gv_id.Caption = "鐗╂枡ID";
+ this.gv_id.FieldName = "id";
+ this.gv_id.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gv_id.MinWidth = 80;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.OptionsColumn.ReadOnly = true;
+ this.gv_id.Tag = "query_a.factory";
+ this.gv_id.Visible = true;
+ this.gv_id.VisibleIndex = 0;
+ this.gv_id.Width = 94;
//
// toolBarMenu1
//
@@ -1409,7 +1409,7 @@
this.gridView1.Appearance.Row.Options.UseTextOptions = true;
this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_factory,
+ this.gv_id,
this.gv_itemNo,
this.gv_itemName,
this.gv_itemModel,
@@ -1584,6 +1584,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -1592,6 +1593,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// txt_itemName
//
@@ -1836,7 +1838,7 @@
private DevExpress.XtraEditors.LabelControl lb_factory;
private DevExpress.XtraEditors.TextEdit txt_factory;
- private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraEditors.MemoEdit txt_itemName;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
--
Gitblit v1.9.3