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_MesQmCheckitemDt.Designer.cs | 381 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 247 insertions(+), 134 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 11017ee..330edbc 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -34,6 +34,11 @@
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.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -60,7 +65,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
@@ -99,18 +103,26 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
+ this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.panel1 = new System.Windows.Forms.Panel();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
- this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
- this.labelCreateDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.labelUserName = new DevExpress.XtraEditors.LabelControl();
- this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
@@ -137,13 +149,16 @@
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
+ this.xtraTabPageCopy.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -188,7 +203,7 @@
this.gvMx1fstand.FieldName = "fstand";
this.gvMx1fstand.MinWidth = 60;
this.gvMx1fstand.Name = "gvMx1fstand";
- this.gvMx1fstand.Tag = "query_a.FSTAND";
+ this.gvMx1fstand.Tag = "yz_quantity_0";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 10;
this.gvMx1fstand.Width = 150;
@@ -223,7 +238,7 @@
this.gvMx1fdownAllow.FieldName = "fdownAllow";
this.gvMx1fdownAllow.MinWidth = 60;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
- this.gvMx1fdownAllow.Tag = "query_a.FDOWN_ALLOW";
+ this.gvMx1fdownAllow.Tag = "yz_quantity_0";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 11;
this.gvMx1fdownAllow.Width = 60;
@@ -303,7 +318,7 @@
this.gvMx1fupAllow.FieldName = "fupAllow";
this.gvMx1fupAllow.MinWidth = 60;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
- this.gvMx1fupAllow.Tag = "query_a.FUP_ALLOW";
+ this.gvMx1fupAllow.Tag = "yz_quantity_0";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 9;
this.gvMx1fupAllow.Width = 60;
@@ -350,7 +365,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1125, 371);
- this.tabMxPage1.Text = "鏄庣粏";
+ this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
//
// gcMx1
//
@@ -441,7 +456,7 @@
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(9, 59);
+ this.lb_tname.Location = new System.Drawing.Point(9, 54);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 370;
@@ -450,22 +465,12 @@
// txt_itemNo
//
this.txt_itemNo.Enabled = false;
- this.txt_itemNo.Location = new System.Drawing.Point(85, 55);
+ this.txt_itemNo.Location = new System.Drawing.Point(85, 50);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(266, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(262, 28);
this.txt_itemNo.TabIndex = 370;
- //
- // lb_isenabled
- //
- this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isenabled.Appearance.Options.UseFont = true;
- this.lb_isenabled.Location = new System.Drawing.Point(989, 96);
- this.lb_isenabled.Name = "lb_isenabled";
- this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
- this.lb_isenabled.TabIndex = 306;
- this.lb_isenabled.Text = "鏄惁鍙敤 ";
//
// gv_isenabled
//
@@ -485,7 +490,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(389, 139);
+ this.lb_fversion.Location = new System.Drawing.Point(361, 54);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(39, 21);
this.lb_fversion.TabIndex = 298;
@@ -493,7 +498,8 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(433, 132);
+ this.txt_fversion.Enabled = false;
+ this.txt_fversion.Location = new System.Drawing.Point(405, 50);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
@@ -511,14 +517,14 @@
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 8;
+ this.gv_fversion.VisibleIndex = 4;
this.gv_fversion.Width = 94;
//
// lb_ftwoCheckdate
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 59);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 54);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 285;
@@ -527,11 +533,11 @@
// txt_ftwoCheckdate
//
this.txt_ftwoCheckdate.Enabled = false;
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 55);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 50);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(158, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(172, 28);
this.txt_ftwoCheckdate.TabIndex = 285;
//
// lb_ftwoCheckor
@@ -551,7 +557,7 @@
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(158, 28);
+ this.txt_ftwoCheckor.Size = new System.Drawing.Size(172, 28);
this.txt_ftwoCheckor.TabIndex = 280;
//
// gv_ftwoCheckor
@@ -560,7 +566,7 @@
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
- this.gv_ftwoCheckor.MinWidth = 50;
+ this.gv_ftwoCheckor.MinWidth = 80;
this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
@@ -572,11 +578,11 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(612, 96);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 86);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
- this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
+ this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
this.lb_ftwoChecked.TabIndex = 273;
- this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪 ";
+ this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪";
//
// gv_ftwoChecked
//
@@ -596,7 +602,7 @@
//
this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckdate.Appearance.Options.UseFont = true;
- this.lb_foneCheckdate.Location = new System.Drawing.Point(849, 59);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 127);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 267;
@@ -605,7 +611,7 @@
// txt_foneCheckdate
//
this.txt_foneCheckdate.Enabled = false;
- this.txt_foneCheckdate.Location = new System.Drawing.Point(928, 55);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 123);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -630,7 +636,7 @@
//
this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckor.Appearance.Options.UseFont = true;
- this.lb_foneCheckor.Location = new System.Drawing.Point(866, 20);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(629, 86);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 262;
@@ -639,7 +645,7 @@
// txt_foneCheckor
//
this.txt_foneCheckor.Enabled = false;
- this.txt_foneCheckor.Location = new System.Drawing.Point(928, 16);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(685, 86);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -664,11 +670,11 @@
//
this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneChecked.Appearance.Options.UseFont = true;
- this.lb_foneChecked.Location = new System.Drawing.Point(849, 96);
+ this.lb_foneChecked.Location = new System.Drawing.Point(361, 127);
this.lb_foneChecked.Name = "lb_foneChecked";
- this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
+ this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
this.lb_foneChecked.TabIndex = 258;
- this.lb_foneChecked.Text = "瀹℃壒鏍囪 ";
+ this.lb_foneChecked.Text = "瀹℃壒鏍囪";
//
// gv_foneChecked
//
@@ -705,14 +711,14 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 5;
+ this.gv_itemNo.VisibleIndex = 6;
this.gv_itemNo.Width = 150;
//
// lb_memo
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(389, 96);
+ this.lb_memo.Location = new System.Drawing.Point(361, 20);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 219;
@@ -720,7 +726,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(433, 96);
+ this.txt_memo.Location = new System.Drawing.Point(405, 16);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -743,7 +749,7 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
+ this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -779,11 +785,11 @@
this.gv_isenabled,
this.gv_foneChecked,
this.gv_ftwoChecked,
+ this.gv_fversion,
this.gridColumn7,
this.gv_itemNo,
this.gridColumn3,
this.gridColumn2,
- this.gv_fversion,
this.gv_foneCheckor,
this.gv_foneCheckdate,
this.gv_ftwoCheckor,
@@ -818,7 +824,7 @@
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 4;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
//
// gridColumn3
@@ -830,7 +836,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 7;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -842,14 +848,14 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 8;
this.gridColumn2.Width = 100;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒朵綔浜�";
this.gridColumn1.FieldName = "createBy";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
@@ -919,26 +925,181 @@
this.tabMx.Size = new System.Drawing.Size(1127, 403);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.xtraTabPageCopy});
+ //
+ // xtraTabPageCopy
+ //
+ this.xtraTabPageCopy.Controls.Add(this.gridControl2);
+ this.xtraTabPageCopy.Controls.Add(this.panelControl1);
+ this.xtraTabPageCopy.Name = "xtraTabPageCopy";
+ this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 371);
+ this.xtraTabPageCopy.Text = "澶嶅埗鍒板叾瀹冪墿鏂�";
+ //
+ // gridControl2
+ //
+ this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl2.Location = new System.Drawing.Point(0, 43);
+ this.gridControl2.MainView = this.gridView2;
+ this.gridControl2.Name = "gridControl2";
+ this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit3});
+ this.gridControl2.Size = new System.Drawing.Size(1125, 328);
+ this.gridControl2.TabIndex = 1;
+ this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView2});
+ //
+ // gridView2
+ //
+ this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn6,
+ this.gridColumn9});
+ this.gridView2.GridControl = this.gridControl2;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gridView2.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn11.AppearanceCell.Options.UseFont = true;
+ this.gridColumn11.Caption = "浣跨敤缁勭粐";
+ this.gridColumn11.FieldName = "fSubsidiary";
+ this.gridColumn11.MinWidth = 150;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
+ this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 0;
+ this.gridColumn11.Width = 150;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鐗╂枡ID";
+ this.gridColumn12.FieldName = "id";
+ this.gridColumn12.MinWidth = 150;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.OptionsColumn.ReadOnly = true;
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 1;
+ this.gridColumn12.Width = 150;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn13.AppearanceCell.Options.UseFont = true;
+ this.gridColumn13.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn13.FieldName = "itemNo";
+ this.gridColumn13.MinWidth = 150;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Tag = "query_a.MEMO";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 2;
+ this.gridColumn13.Width = 150;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn14.AppearanceCell.Options.UseFont = true;
+ this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn14.FieldName = "itemName";
+ this.gridColumn14.MinWidth = 150;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Tag = "query_a.FCHECK_TOOL";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 3;
+ this.gridColumn14.Width = 150;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn15.AppearanceCell.Options.UseFont = true;
+ this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn15.FieldName = "itemModel";
+ this.gridColumn15.MinWidth = 150;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
+ this.gridColumn15.Tag = "query_a.SAMPLE_SIZE_NO";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 4;
+ this.gridColumn15.Width = 150;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "绉诲嚭";
+ this.gridColumn6.ColumnEdit = this.repositoryItemButtonEdit3;
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "gridColumn9";
+ this.gridColumn9.FieldName = "guid";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Width = 94;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnSave);
+ this.panelControl1.Controls.Add(this.btnSelect);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelControl1.Location = new System.Drawing.Point(0, 0);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1125, 43);
+ this.panelControl1.TabIndex = 0;
+ //
+ // btnSave
+ //
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
+ this.btnSave.Location = new System.Drawing.Point(139, 6);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(187, 29);
+ this.btnSave.TabIndex = 450;
+ this.btnSave.Text = "淇濆瓨澶嶅埗鐨勭墿鏂欏拰椤圭洰";
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(10, 6);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(101, 29);
+ this.btnSelect.TabIndex = 449;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.btnSelect);
this.panel1.Controls.Add(this.txt_itemModel);
this.panel1.Controls.Add(this.txt_ItemId);
- this.panel1.Controls.Add(this.txt_isenabled);
this.panel1.Controls.Add(this.txt_ftwoChecked);
this.panel1.Controls.Add(this.txt_foneChecked);
this.panel1.Controls.Add(this.lb_itemModel);
- this.panel1.Controls.Add(this.labelCreateDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.labelUserName);
- this.panel1.Controls.Add(this.txt_userName);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_tname);
this.panel1.Controls.Add(this.txt_itemNo);
- this.panel1.Controls.Add(this.lb_isenabled);
this.panel1.Controls.Add(this.lb_fversion);
this.panel1.Controls.Add(this.txt_fversion);
this.panel1.Controls.Add(this.lb_ftwoCheckdate);
@@ -961,23 +1122,14 @@
this.panel1.Size = new System.Drawing.Size(1127, 167);
this.panel1.TabIndex = 1;
//
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(612, 131);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(85, 29);
- this.btnSelect.TabIndex = 449;
- this.btnSelect.Text = "鍘诲鍒�";
- //
// txt_itemModel
//
this.txt_itemModel.Enabled = false;
- this.txt_itemModel.Location = new System.Drawing.Point(85, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(85, 86);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
+ this.txt_itemModel.Size = new System.Drawing.Size(262, 64);
this.txt_itemModel.TabIndex = 381;
this.txt_itemModel.Tag = "itemName";
//
@@ -990,18 +1142,10 @@
this.txt_ItemId.TabIndex = 380;
this.txt_ItemId.Tag = "no";
//
- // txt_isenabled
- //
- this.txt_isenabled.Location = new System.Drawing.Point(1062, 96);
- this.txt_isenabled.Name = "txt_isenabled";
- this.txt_isenabled.Properties.Caption = "";
- this.txt_isenabled.Size = new System.Drawing.Size(27, 24);
- this.txt_isenabled.TabIndex = 379;
- //
// txt_ftwoChecked
//
this.txt_ftwoChecked.Enabled = false;
- this.txt_ftwoChecked.Location = new System.Drawing.Point(685, 96);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 86);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Caption = "";
this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -1010,7 +1154,7 @@
// txt_foneChecked
//
this.txt_foneChecked.Enabled = false;
- this.txt_foneChecked.Location = new System.Drawing.Point(928, 96);
+ this.txt_foneChecked.Location = new System.Drawing.Point(434, 125);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "";
this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -1020,51 +1164,11 @@
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(9, 96);
+ this.lb_itemModel.Location = new System.Drawing.Point(9, 86);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 375;
this.lb_itemModel.Text = "鐗╂枡瑙勬牸";
- //
- // labelCreateDate
- //
- this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelCreateDate.Appearance.Options.UseFont = true;
- this.labelCreateDate.Location = new System.Drawing.Point(360, 59);
- this.labelCreateDate.Name = "labelCreateDate";
- this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
- this.labelCreateDate.TabIndex = 373;
- this.labelCreateDate.Text = "鍒朵綔鏃ユ湡";
- //
- // txt_createDate
- //
- this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(433, 55);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(175, 28);
- this.txt_createDate.TabIndex = 374;
- //
- // labelUserName
- //
- this.labelUserName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelUserName.Appearance.Options.UseFont = true;
- this.labelUserName.Location = new System.Drawing.Point(377, 20);
- this.labelUserName.Name = "labelUserName";
- this.labelUserName.Size = new System.Drawing.Size(51, 21);
- this.labelUserName.TabIndex = 371;
- this.labelUserName.Text = "鍒朵綔浜�";
- //
- // txt_userName
- //
- this.txt_userName.Enabled = false;
- this.txt_userName.Location = new System.Drawing.Point(433, 16);
- this.txt_userName.Name = "txt_userName";
- this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_userName.Properties.Appearance.Options.UseFont = true;
- this.txt_userName.Size = new System.Drawing.Size(175, 28);
- this.txt_userName.TabIndex = 372;
//
// lbGuid
//
@@ -1118,14 +1222,17 @@
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
+ this.xtraTabPageCopy.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1161,8 +1268,6 @@
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
-
-private DevExpress.XtraEditors.LabelControl lb_isenabled;
private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
private DevExpress.XtraEditors.LabelControl lb_fversion;
@@ -1202,14 +1307,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
- private DevExpress.XtraEditors.LabelControl labelCreateDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.LabelControl labelUserName;
- private DevExpress.XtraEditors.TextEdit txt_userName;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
- private DevExpress.XtraEditors.CheckEdit txt_isenabled;
private UserControl.UcLookItems txt_ItemId;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1223,5 +1323,18 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageCopy;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraGrid.GridControl gridControl2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
--
Gitblit v1.9.3