From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 123 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 60 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 11ef6a8..810f48f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
+
+using Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.QC
{
partial class Frm_MesQaItemsDetect01
{
@@ -91,7 +94,7 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -139,6 +142,7 @@
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.txt_xblb = new DevExpress.XtraEditors.MemoEdit();
this.txt_xbsl = new DevExpress.XtraEditors.TextEdit();
+ this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -165,6 +169,9 @@
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -225,10 +232,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -289,6 +292,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -315,6 +319,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -355,10 +362,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -1381,6 +1384,14 @@
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
//
+ // txt_iqcRemark
+ //
+ this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
+ this.txt_iqcRemark.Name = "txt_iqcRemark";
+ this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
+ this.txt_iqcRemark.StyleController = this.layoutMx1;
+ this.txt_iqcRemark.TabIndex = 819;
+ //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
@@ -1725,6 +1736,43 @@
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_iqcRemark;
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem39.Text = "妫�楠屽娉�";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
//
// xtraTabControl2
//
@@ -2423,51 +2471,6 @@
//
this.gridView4.Name = "gridView4";
//
- // txt_iqcRemark
- //
- this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
- this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
- this.txt_iqcRemark.StyleController = this.layoutMx1;
- this.txt_iqcRemark.TabIndex = 819;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
- this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem39
- //
- this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem39.Name = "layoutControlItem39";
- this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
- this.layoutControlItem39.Text = "妫�楠屽娉�";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
- this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
- //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2538,6 +2541,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2564,6 +2568,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2604,10 +2611,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -2618,7 +2621,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
--
Gitblit v1.9.3