From da1667144a6160a2ea78e9c4b112272dea20cbec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:55:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index a488161..f9377e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -49,6 +49,7 @@
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -116,6 +117,8 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptBl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -186,6 +189,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBl)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -267,6 +271,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn13,
this.gv_tbl013,
this.gv_tbl020,
this.gv_billNo,
@@ -287,6 +292,14 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "涓婚敭Guid";
+ this.gridColumn13.FieldName = "guid";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Width = 94;
//
// gv_tbl013
//
@@ -540,7 +553,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 105);
+ this.btnSelect.Location = new System.Drawing.Point(12, 97);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(86, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -549,7 +562,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(626, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(626, 35);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(195, 24);
@@ -560,7 +573,7 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 74);
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 66);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -577,14 +590,14 @@
// txt_tbl002
//
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 43);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 35);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
this.txt_tbl002.TabIndex = 462;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(195, 24);
@@ -594,7 +607,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 35);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
@@ -604,7 +617,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(355, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(355, 4);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Size = new System.Drawing.Size(195, 24);
@@ -614,7 +627,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(626, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
@@ -624,7 +637,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 4);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
@@ -634,7 +647,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(626, 74);
+ this.txt_itemModel.Location = new System.Drawing.Point(626, 66);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
@@ -644,7 +657,7 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 74);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 66);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
@@ -653,7 +666,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 66);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
@@ -663,7 +676,7 @@
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 43);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 35);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
@@ -917,7 +930,8 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
+ this.repositoryItemButtonEdit1,
+ this.rptBl});
this.gcMx1.Size = new System.Drawing.Size(1124, 400);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -939,7 +953,8 @@
this.gridColumn1,
this.gridColumn2,
this.gvMxDel,
- this.gridColumn5});
+ this.gridColumn5,
+ this.gridColumn12});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1037,7 +1052,7 @@
this.gvMx1tld006.Name = "gvMx1tld006";
this.gvMx1tld006.Tag = "query_a.tld006";
this.gvMx1tld006.Visible = true;
- this.gvMx1tld006.VisibleIndex = 6;
+ this.gvMx1tld006.VisibleIndex = 7;
this.gvMx1tld006.Width = 94;
//
// gvMx1tld007
@@ -1049,7 +1064,7 @@
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
this.gvMx1tld007.Visible = true;
- this.gvMx1tld007.VisibleIndex = 7;
+ this.gvMx1tld007.VisibleIndex = 8;
this.gvMx1tld007.Width = 94;
//
// gvMx1tld009
@@ -1060,8 +1075,6 @@
this.gvMx1tld009.MinWidth = 50;
this.gvMx1tld009.Name = "gvMx1tld009";
this.gvMx1tld009.Tag = "query_a.tld009";
- this.gvMx1tld009.Visible = true;
- this.gvMx1tld009.VisibleIndex = 8;
this.gvMx1tld009.Width = 94;
//
// gridColumn1
@@ -1119,6 +1132,30 @@
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn12.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
+ this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn12.Caption = "閫夋嫨涓嶈壇绫诲埆";
+ this.gridColumn12.ColumnEdit = this.rptBl;
+ this.gridColumn12.FieldName = "tld015";
+ this.gridColumn12.MinWidth = 100;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "edit";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 6;
+ this.gridColumn12.Width = 100;
+ //
+ // rptBl
+ //
+ this.rptBl.AutoHeight = false;
+ this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.rptBl.Name = "rptBl";
+ this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
// xtraTabPage3
//
@@ -1331,6 +1368,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBl)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1426,5 +1464,8 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
--
Gitblit v1.9.3