From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 131 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 64 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 6a153a8..ea55d79 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,22 +29,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- 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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -142,6 +142,9 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -158,9 +161,6 @@
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -197,14 +197,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -511,6 +511,7 @@
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MaxWidth = 200;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
@@ -522,23 +523,25 @@
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 80;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn1.FieldName = "fstand";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 80;
//
// lb_remarks
//
@@ -1233,7 +1236,7 @@
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.Size = new System.Drawing.Size(1340, 460);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1246,7 +1249,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 403);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1342,10 +1345,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
@@ -1363,10 +1366,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1384,10 +1387,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1446,6 +1449,33 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 196);
this.panel1.TabIndex = 1;
+ //
+ // txt_fsubmit
+ //
+ this.txt_fsubmit.Enabled = false;
+ this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
+ this.txt_fsubmit.Name = "txt_fsubmit";
+ this.txt_fsubmit.Properties.Caption = "";
+ this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
+ this.txt_fsubmit.TabIndex = 800;
+ //
+ // txt_qualityAudit
+ //
+ this.txt_qualityAudit.Enabled = false;
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Caption = "";
+ this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
+ this.txt_qualityAudit.TabIndex = 799;
+ //
+ // txt_modify1Flag
+ //
+ this.txt_modify1Flag.Enabled = false;
+ this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
+ this.txt_modify1Flag.Name = "txt_modify1Flag";
+ this.txt_modify1Flag.Properties.Caption = "";
+ this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
+ this.txt_modify1Flag.TabIndex = 798;
//
// lb_qualityAudit
//
@@ -1610,33 +1640,6 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
- // txt_modify1Flag
- //
- this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Caption = "";
- this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
- this.txt_modify1Flag.TabIndex = 798;
- //
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Caption = "";
- this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
- this.txt_qualityAudit.TabIndex = 799;
- //
- // txt_fsubmit
- //
- this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Caption = "";
- this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
- this.txt_fsubmit.TabIndex = 800;
- //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1682,14 +1685,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
this.ResumeLayout(false);
}
--
Gitblit v1.9.3