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/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 250 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 188 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index e3095ca..1f5aac0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,6 +29,17 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -112,12 +123,19 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.btnUp = new DevExpress.XtraEditors.SimpleButton();
- this.btnUpSelect = new System.Windows.Forms.Button();
- this.txtUpUrl = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
+ this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
@@ -133,6 +151,7 @@
this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -165,9 +184,11 @@
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
- this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
+ this.tabMxPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
@@ -1213,61 +1234,147 @@
this.xtraTabControl2.TabIndex = 2;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.xtraTabPage3});
+ this.tabMxPage3});
//
- // xtraTabPage3
+ // tabMxPage3
//
- this.xtraTabPage3.Controls.Add(this.panelControl1);
- this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1340, 448);
- this.xtraTabPage3.Text = "闄勪欢淇℃伅";
+ this.tabMxPage3.Controls.Add(this.gcMx3);
+ this.tabMxPage3.Controls.Add(this.ucUpFile1);
+ this.tabMxPage3.Name = "tabMxPage3";
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 448);
+ this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
- // panelControl1
+ // gcMx3
//
- this.panelControl1.Controls.Add(this.btnUp);
- this.panelControl1.Controls.Add(this.btnUpSelect);
- this.panelControl1.Controls.Add(this.txtUpUrl);
- this.panelControl1.Controls.Add(this.label7);
- this.panelControl1.Location = new System.Drawing.Point(297, 11);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(609, 151);
- this.panelControl1.TabIndex = 1;
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.Location = new System.Drawing.Point(0, 57);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2});
+ this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.TabIndex = 1;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
//
- // btnUp
+ // gvMx3
//
- this.btnUp.Location = new System.Drawing.Point(157, 81);
- this.btnUp.Name = "btnUp";
- this.btnUp.Size = new System.Drawing.Size(94, 29);
- this.btnUp.TabIndex = 270;
- this.btnUp.Text = "纭畾涓婁紶";
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn11,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn10,
+ this.gridColumn9});
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
//
- // btnUpSelect
+ // gridColumn4
//
- this.btnUpSelect.Location = new System.Drawing.Point(452, 48);
- this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4);
- this.btnUpSelect.Name = "btnUpSelect";
- this.btnUpSelect.Size = new System.Drawing.Size(79, 26);
- this.btnUpSelect.TabIndex = 269;
- this.btnUpSelect.Text = "閫夋嫨璺緞";
- this.btnUpSelect.UseVisualStyleBackColor = true;
+ this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Width = 94;
//
- // txtUpUrl
+ // gridColumn5
//
- this.txtUpUrl.Location = new System.Drawing.Point(125, 48);
- this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4);
- this.txtUpUrl.Name = "txtUpUrl";
- this.txtUpUrl.Size = new System.Drawing.Size(307, 26);
- this.txtUpUrl.TabIndex = 268;
+ this.gridColumn5.Caption = "闄勪欢鍚嶇О";
+ this.gridColumn5.FieldName = "fileTitle";
+ this.gridColumn5.MinWidth = 100;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
+ this.gridColumn5.Width = 100;
//
- // label7
+ // gridColumn6
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 52);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(83, 18);
- this.label7.TabIndex = 267;
- this.label7.Text = "閫夋嫨鏂囦欢锛�";
+ this.gridColumn6.Caption = "娴忚鍦板潃";
+ this.gridColumn6.FieldName = "urlPath";
+ this.gridColumn6.MinWidth = 200;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ this.gridColumn6.Width = 200;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婁紶鑰�";
+ this.gridColumn7.FieldName = "createBy";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓婁紶鏃堕棿";
+ this.gridColumn8.FieldName = "createDate";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 4;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "娴忚";
+ this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 5;
+ this.gridColumn10.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "绉诲嚭";
+ this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // ucUpFile1
+ //
+ this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFile1.Name = "ucUpFile1";
+ this.ucUpFile1.parentGuid = null;
+ this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
+ this.ucUpFile1.TabIndex = 0;
//
// panel1
//
@@ -1446,6 +1553,16 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "闄勪欢绫诲瀷";
+ this.gridColumn11.FieldName = "fileType";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 1;
+ this.gridColumn11.Width = 94;
+ //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1486,10 +1603,11 @@
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
- this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
- this.panelControl1.PerformLayout();
+ this.tabMxPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
@@ -1572,12 +1690,7 @@
private DevExpress.XtraEditors.LabelControl lb_releaseNo;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.SimpleButton btnUp;
- private System.Windows.Forms.Button btnUpSelect;
- private System.Windows.Forms.TextBox txtUpUrl;
- private System.Windows.Forms.Label label7;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage3;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
@@ -1615,5 +1728,18 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private UserControl.UCUpFile ucUpFile1;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
--
Gitblit v1.9.3