From 94b872a684fa6c065b22d1cf7088243a0900353b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 19 三月 2025 08:26:17 +0800
Subject: [PATCH] 异常
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 +
DevApp/Gs.DevApp/Resources/splinearea_32x32.png | 0
DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs | 13
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 152 ++++----
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 207 ++++++------
DevApp/Gs.DevApp/Properties/Resources.resx | 50 +-
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs | 84 +---
DevApp/Gs.DevApp/Resources/stackedsplinearea_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 407 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs | 2
12 files changed, 469 insertions(+), 470 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 1315abd..91077d2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -44,7 +44,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
@@ -66,20 +65,22 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
- this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
- this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_qt023 = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_qt013 = new Gs.DevApp.UserControl.UcLookCustomer();
- this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_qt020 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.lbGuid = new System.Windows.Forms.Label();
- this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
- this.txt_qt002 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
+ this.txt_qt013 = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_qtck = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
+ this.txt_qt020 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_qt023 = new Gs.DevApp.UserControl.UcLookOrg();
+ this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt002 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -88,12 +89,10 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
@@ -121,9 +120,9 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
@@ -139,14 +138,16 @@
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
this.splitMx1.Panel2.SuspendLayout();
this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
- this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -155,12 +156,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
@@ -171,12 +170,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -200,17 +201,6 @@
this.xtraTabPage1,
this.xtraTabPage2});
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(952, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 6;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
@@ -225,13 +215,13 @@
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
//
- // split1.split1_Panel1
+ // split1.Panel1
//
this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
- // split1.split1_Panel2
+ // split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 570);
@@ -489,157 +479,18 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // splitMx1.Panel2
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 136;
this.splitMx1.TabIndex = 0;
- //
- // txt_qt008
- //
- this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(626, 76);
- this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
- this.txt_qt008.Name = "txt_qt008";
- this.txt_qt008.Size = new System.Drawing.Size(195, 28);
- this.txt_qt008.TabIndex = 320;
- //
- // ucLookHuoZhu1
- //
- this.ucLookHuoZhu1.HzId = null;
- this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 76);
- this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
- this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 60);
- this.ucLookHuoZhu1.TabIndex = 318;
- //
- // txt_qt009
- //
- this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(626, 44);
- this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(195, 28);
- this.txt_qt009.TabIndex = 316;
- //
- // txt_qt024
- //
- this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(355, 44);
- this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(195, 28);
- this.txt_qt024.TabIndex = 309;
- //
- // txt_qt023
- //
- this.txt_qt023.IsReadly = false;
- this.txt_qt023.Location = new System.Drawing.Point(84, 44);
- this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(195, 28);
- this.txt_qt023.TabIndex = 307;
- //
- // txt_qt013
- //
- this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(355, 76);
- this.txt_qt013.Name = "txt_qt013";
- this.txt_qt013.Size = new System.Drawing.Size(195, 28);
- this.txt_qt013.TabIndex = 304;
- //
- // txt_qt019
- //
- this.txt_qt019.EditValue = "璇烽�夋嫨";
- this.txt_qt019.Location = new System.Drawing.Point(355, 12);
- this.txt_qt019.Name = "txt_qt019";
- this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_qt019.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
- "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)",
- "璧勪骇鍑哄簱(QTCKD02_SYS)",
- "VMI鍑哄簱(QTCKD03_SYS)",
- "璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
- "搴撳瓨璋冩暣(QTCKD05_SYS)"});
- this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(195, 24);
- this.txt_qt019.StyleController = this.layoutMx1;
- this.txt_qt019.TabIndex = 301;
- //
- // txt_qt020
- //
- this.txt_qt020.EditValue = "璇烽�夋嫨";
- this.txt_qt020.Location = new System.Drawing.Point(626, 12);
- this.txt_qt020.Name = "txt_qt020";
- this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_qt020.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
- "鏅��(GENERAL)",
- "閫�璐�(RETURN)"});
- this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(195, 24);
- this.txt_qt020.StyleController = this.layoutMx1;
- this.txt_qt020.TabIndex = 300;
- //
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(840, 162);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 46);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Text = "lbGuid";
- this.lbGuid.Visible = false;
- //
- // txt_qt016
- //
- this.txt_qt016.Location = new System.Drawing.Point(897, 12);
- this.txt_qt016.Name = "txt_qt016";
- this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(196, 28);
- this.txt_qt016.StyleController = this.layoutMx1;
- this.txt_qt016.TabIndex = 262;
- this.txt_qt016.Tag = "readonly";
- //
- // txt_qt010
- //
- this.txt_qt010.Location = new System.Drawing.Point(355, 108);
- this.txt_qt010.Name = "txt_qt010";
- this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(466, 28);
- this.txt_qt010.StyleController = this.layoutMx1;
- this.txt_qt010.TabIndex = 235;
- //
- // txt_qt002
- //
- this.txt_qt002.Location = new System.Drawing.Point(897, 44);
- this.txt_qt002.Name = "txt_qt002";
- this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(196, 28);
- this.txt_qt002.StyleController = this.layoutMx1;
- this.txt_qt002.TabIndex = 216;
- this.txt_qt002.Tag = "readonly";
-
- //
- // txt_qtck
- //
- this.txt_qtck.Location = new System.Drawing.Point(84, 12);
- this.txt_qtck.Name = "txt_qtck";
- this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(195, 28);
- this.txt_qtck.StyleController = this.layoutMx1;
- this.txt_qtck.TabIndex = 211;
- this.txt_qtck.Tag = "readonly";
//
// layoutMx1
//
@@ -667,6 +518,166 @@
this.layoutMx1.Size = new System.Drawing.Size(1126, 136);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(840, 162);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(274, 46);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_qt008
+ //
+ this.txt_qt008.IsReadly = false;
+ this.txt_qt008.Location = new System.Drawing.Point(626, 76);
+ this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_qt008.Name = "txt_qt008";
+ this.txt_qt008.Size = new System.Drawing.Size(195, 28);
+ this.txt_qt008.TabIndex = 320;
+ //
+ // ucLookHuoZhu1
+ //
+ this.ucLookHuoZhu1.HzId = null;
+ this.ucLookHuoZhu1.IsReadly = false;
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 76);
+ this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
+ this.ucLookHuoZhu1.OrgId = null;
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 60);
+ this.ucLookHuoZhu1.TabIndex = 318;
+ //
+ // txt_qt010
+ //
+ this.txt_qt010.Location = new System.Drawing.Point(355, 108);
+ this.txt_qt010.Name = "txt_qt010";
+ this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qt010.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt010.Size = new System.Drawing.Size(466, 28);
+ this.txt_qt010.StyleController = this.layoutMx1;
+ this.txt_qt010.TabIndex = 235;
+ //
+ // txt_qt009
+ //
+ this.txt_qt009.IsReadly = false;
+ this.txt_qt009.Location = new System.Drawing.Point(626, 44);
+ this.txt_qt009.Name = "txt_qt009";
+ this.txt_qt009.Size = new System.Drawing.Size(195, 28);
+ this.txt_qt009.TabIndex = 316;
+ //
+ // txt_qt013
+ //
+ this.txt_qt013.IsReadly = false;
+ this.txt_qt013.Location = new System.Drawing.Point(355, 76);
+ this.txt_qt013.Name = "txt_qt013";
+ this.txt_qt013.Size = new System.Drawing.Size(195, 28);
+ this.txt_qt013.TabIndex = 304;
+ //
+ // txt_qtck
+ //
+ this.txt_qtck.Location = new System.Drawing.Point(84, 12);
+ this.txt_qtck.Name = "txt_qtck";
+ this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qtck.Properties.Appearance.Options.UseFont = true;
+ this.txt_qtck.Size = new System.Drawing.Size(195, 28);
+ this.txt_qtck.StyleController = this.layoutMx1;
+ this.txt_qtck.TabIndex = 211;
+ this.txt_qtck.Tag = "readonly";
+ //
+ // txt_qt019
+ //
+ this.txt_qt019.EditValue = "璇烽�夋嫨";
+ this.txt_qt019.Location = new System.Drawing.Point(355, 12);
+ this.txt_qt019.Name = "txt_qt019";
+ this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_qt019.Properties.Items.AddRange(new object[] {
+ "璇烽�夋嫨",
+ "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)",
+ "璧勪骇鍑哄簱(QTCKD02_SYS)",
+ "VMI鍑哄簱(QTCKD03_SYS)",
+ "璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
+ "搴撳瓨璋冩暣(QTCKD05_SYS)"});
+ this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_qt019.Size = new System.Drawing.Size(195, 24);
+ this.txt_qt019.StyleController = this.layoutMx1;
+ this.txt_qt019.TabIndex = 301;
+ //
+ // txt_qt024
+ //
+ this.txt_qt024.IsReadly = false;
+ this.txt_qt024.Location = new System.Drawing.Point(355, 44);
+ this.txt_qt024.Name = "txt_qt024";
+ this.txt_qt024.Size = new System.Drawing.Size(195, 28);
+ this.txt_qt024.TabIndex = 309;
+ //
+ // txt_qt020
+ //
+ this.txt_qt020.EditValue = "璇烽�夋嫨";
+ this.txt_qt020.Location = new System.Drawing.Point(626, 12);
+ this.txt_qt020.Name = "txt_qt020";
+ this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_qt020.Properties.Items.AddRange(new object[] {
+ "璇烽�夋嫨",
+ "鏅��(GENERAL)",
+ "閫�璐�(RETURN)"});
+ this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_qt020.Size = new System.Drawing.Size(195, 24);
+ this.txt_qt020.StyleController = this.layoutMx1;
+ this.txt_qt020.TabIndex = 300;
+ //
+ // txt_qt023
+ //
+ this.txt_qt023.IsReadly = false;
+ this.txt_qt023.Location = new System.Drawing.Point(84, 44);
+ this.txt_qt023.Name = "txt_qt023";
+ this.txt_qt023.Size = new System.Drawing.Size(195, 28);
+ this.txt_qt023.TabIndex = 307;
+ //
+ // txt_qt016
+ //
+ this.txt_qt016.Location = new System.Drawing.Point(897, 12);
+ this.txt_qt016.Name = "txt_qt016";
+ this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qt016.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt016.Size = new System.Drawing.Size(196, 28);
+ this.txt_qt016.StyleController = this.layoutMx1;
+ this.txt_qt016.TabIndex = 262;
+ this.txt_qt016.Tag = "readonly";
+ //
+ // txt_qt002
+ //
+ this.txt_qt002.Location = new System.Drawing.Point(897, 44);
+ this.txt_qt002.Name = "txt_qt002";
+ this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qt002.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt002.Size = new System.Drawing.Size(196, 28);
+ this.txt_qt002.StyleController = this.layoutMx1;
+ this.txt_qt002.TabIndex = 216;
+ this.txt_qt002.Tag = "readonly";
+ //
+ // txt_qt015
+ //
+ this.txt_qt015.Location = new System.Drawing.Point(825, 76);
+ this.txt_qt015.Name = "txt_qt015";
+ this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
+ this.txt_qt015.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt015.StyleController = this.layoutMx1;
+ this.txt_qt015.TabIndex = 310;
+ this.txt_qt015.Tag = "readonly";
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.lbGuid;
+ this.layoutControlItem14.Location = new System.Drawing.Point(828, 150);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(278, 50);
+ this.layoutControlItem14.Text = "lbGuid";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// Root
//
@@ -788,15 +799,6 @@
this.layoutControlItem7.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
- // txt_qt015
- //
- this.txt_qt015.Location = new System.Drawing.Point(825, 76);
- this.txt_qt015.Name = "txt_qt015";
- this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(268, 24);
- this.txt_qt015.StyleController = this.layoutMx1;
- this.txt_qt015.TabIndex = 310;
- //
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt015;
@@ -842,18 +844,6 @@
this.layoutControlItem13.Size = new System.Drawing.Size(542, 32);
this.layoutControlItem13.Text = "鍑哄簱澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.lbGuid;
- this.layoutControlItem14.Location = new System.Drawing.Point(828, 150);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(278, 50);
- this.layoutControlItem14.Text = "lbGuid";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
//
// layoutControlItem9
//
@@ -979,6 +969,7 @@
this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
this.repositoryItemSearchLookUpEdit1.ValueMember = "id";
+ this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
//
// gridView2
//
@@ -1170,6 +1161,7 @@
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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// gridColumn12
//
@@ -1178,6 +1170,17 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Width = 94;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(952, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_MesItemQt
//
@@ -1191,7 +1194,6 @@
this.Text = "鍏跺畠鍑哄簱鐢宠";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
@@ -1207,14 +1209,16 @@
this.splitMx1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
- this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1223,12 +1227,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
@@ -1239,6 +1241,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index 080093d..04e1e96 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -48,7 +48,6 @@
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -58,7 +57,7 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -67,7 +66,7 @@
this.txt_lybm = new DevExpress.XtraEditors.TextEdit();
this.txt_hz = new DevExpress.XtraEditors.TextEdit();
this.txt_lyfx = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_hzlx = new DevExpress.XtraEditors.TextEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
this.txt_lyOrg = new DevExpress.XtraEditors.TextEdit();
@@ -80,6 +79,7 @@
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -98,6 +98,7 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -148,7 +149,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lybm.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyOrg.Properties)).BeginInit();
@@ -161,6 +162,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -179,6 +181,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -194,6 +197,7 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -267,7 +271,6 @@
this.gv_status,
this.gv_itemOutNo,
this.gv_workNo,
- this.gv_pbillNo,
this.gv_outDate,
this.gv_outType,
this.gv_checkUser,
@@ -277,7 +280,7 @@
this.gv_createBy,
this.gv_createDate,
this.gv_remark,
- this.gv_reason});
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -328,20 +331,6 @@
this.gv_workNo.VisibleIndex = 2;
this.gv_workNo.Width = 100;
//
- // gv_pbillNo
- //
- this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
- this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
- this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 25;
- this.gv_pbillNo.Name = "gv_pbillNo";
- this.gv_pbillNo.OptionsColumn.AllowEdit = false;
- this.gv_pbillNo.Tag = "query_a.pbill_no";
- this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 3;
- this.gv_pbillNo.Width = 94;
- //
// gv_outDate
//
this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -353,7 +342,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 4;
+ this.gv_outDate.VisibleIndex = 3;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -367,7 +356,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 5;
+ this.gv_outType.VisibleIndex = 4;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -381,7 +370,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 6;
+ this.gv_checkUser.VisibleIndex = 5;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -395,7 +384,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 6;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -409,7 +398,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 8;
+ this.gv_receiver.VisibleIndex = 7;
this.gv_receiver.Width = 94;
//
// gv_outPart
@@ -423,7 +412,7 @@
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 9;
+ this.gv_outPart.VisibleIndex = 8;
this.gv_outPart.Width = 94;
//
// gv_createBy
@@ -437,7 +426,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 10;
+ this.gv_createBy.VisibleIndex = 9;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -451,7 +440,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 11;
+ this.gv_createDate.VisibleIndex = 10;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -459,28 +448,22 @@
this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
+ this.gv_remark.FieldName = "sqRemark";
this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 94;
//
- // gv_reason
+ // gridColumn1
//
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_reason.AppearanceCell.Options.UseFont = true;
- this.gv_reason.Caption = "鍑哄簱鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 25;
- this.gv_reason.Name = "gv_reason";
- this.gv_reason.OptionsColumn.AllowEdit = false;
- this.gv_reason.Tag = "query_a.reason";
- this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 13;
- this.gv_reason.Width = 94;
+ this.gridColumn1.Caption = "涓婚敭GUID";
+ this.gridColumn1.FieldName = "guid";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Width = 94;
//
// pageBar1
//
@@ -527,7 +510,7 @@
this.layoutMx1.Controls.Add(this.txt_lybm);
this.layoutMx1.Controls.Add(this.txt_hz);
this.layoutMx1.Controls.Add(this.txt_lyfx);
- this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Controls.Add(this.txt_hzlx);
this.layoutMx1.Controls.Add(this.txt_itemOutNo);
this.layoutMx1.Controls.Add(this.txt_lyOrg);
@@ -540,6 +523,7 @@
this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17});
@@ -561,151 +545,151 @@
//
// txt_lybm
//
- this.txt_lybm.Location = new System.Drawing.Point(355, 108);
+ this.txt_lybm.Location = new System.Drawing.Point(361, 108);
this.txt_lybm.Name = "txt_lybm";
this.txt_lybm.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lybm.Properties.Appearance.Options.UseFont = true;
- this.txt_lybm.Size = new System.Drawing.Size(195, 28);
+ this.txt_lybm.Size = new System.Drawing.Size(189, 28);
this.txt_lybm.StyleController = this.layoutMx1;
this.txt_lybm.TabIndex = 583;
//
// txt_hz
//
- this.txt_hz.Location = new System.Drawing.Point(84, 108);
+ this.txt_hz.Location = new System.Drawing.Point(90, 108);
this.txt_hz.Name = "txt_hz";
this.txt_hz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_hz.Properties.Appearance.Options.UseFont = true;
- this.txt_hz.Size = new System.Drawing.Size(195, 28);
+ this.txt_hz.Size = new System.Drawing.Size(189, 28);
this.txt_hz.StyleController = this.layoutMx1;
this.txt_hz.TabIndex = 579;
//
// txt_lyfx
//
- this.txt_lyfx.Location = new System.Drawing.Point(626, 12);
+ this.txt_lyfx.Location = new System.Drawing.Point(632, 12);
this.txt_lyfx.Name = "txt_lyfx";
this.txt_lyfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lyfx.Properties.Appearance.Options.UseFont = true;
- this.txt_lyfx.Size = new System.Drawing.Size(195, 28);
+ this.txt_lyfx.Size = new System.Drawing.Size(189, 28);
this.txt_lyfx.StyleController = this.layoutMx1;
this.txt_lyfx.TabIndex = 581;
//
- // txt_remark
+ // txt_sqRemark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 140);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(466, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 243;
+ this.txt_sqRemark.Location = new System.Drawing.Point(90, 140);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_sqRemark.Size = new System.Drawing.Size(460, 28);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 243;
//
// txt_hzlx
//
- this.txt_hzlx.Location = new System.Drawing.Point(84, 76);
+ this.txt_hzlx.Location = new System.Drawing.Point(90, 76);
this.txt_hzlx.Name = "txt_hzlx";
this.txt_hzlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_hzlx.Properties.Appearance.Options.UseFont = true;
- this.txt_hzlx.Size = new System.Drawing.Size(195, 28);
+ this.txt_hzlx.Size = new System.Drawing.Size(189, 28);
this.txt_hzlx.StyleController = this.layoutMx1;
this.txt_hzlx.TabIndex = 577;
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(90, 12);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(189, 28);
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 213;
//
// txt_lyOrg
//
- this.txt_lyOrg.Location = new System.Drawing.Point(355, 44);
+ this.txt_lyOrg.Location = new System.Drawing.Point(361, 44);
this.txt_lyOrg.Name = "txt_lyOrg";
this.txt_lyOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lyOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_lyOrg.Size = new System.Drawing.Size(195, 28);
+ this.txt_lyOrg.Size = new System.Drawing.Size(189, 28);
this.txt_lyOrg.StyleController = this.layoutMx1;
this.txt_lyOrg.TabIndex = 573;
//
// txt_djlx
//
- this.txt_djlx.Location = new System.Drawing.Point(355, 12);
+ this.txt_djlx.Location = new System.Drawing.Point(361, 12);
this.txt_djlx.Name = "txt_djlx";
this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_djlx.Properties.Appearance.Options.UseFont = true;
- this.txt_djlx.Size = new System.Drawing.Size(195, 28);
+ this.txt_djlx.Size = new System.Drawing.Size(189, 28);
this.txt_djlx.StyleController = this.layoutMx1;
this.txt_djlx.TabIndex = 575;
//
// txt_lykh
//
- this.txt_lykh.Location = new System.Drawing.Point(355, 76);
+ this.txt_lykh.Location = new System.Drawing.Point(361, 76);
this.txt_lykh.Name = "txt_lykh";
this.txt_lykh.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lykh.Properties.Appearance.Options.UseFont = true;
- this.txt_lykh.Size = new System.Drawing.Size(195, 28);
+ this.txt_lykh.Size = new System.Drawing.Size(189, 28);
this.txt_lykh.StyleController = this.layoutMx1;
this.txt_lykh.TabIndex = 450;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(897, 76);
+ this.txt_checkDate.Location = new System.Drawing.Point(903, 76);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(190, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(897, 12);
+ this.txt_abtNo.Location = new System.Drawing.Point(903, 12);
this.txt_abtNo.Name = "txt_abtNo";
this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(196, 28);
+ this.txt_abtNo.Size = new System.Drawing.Size(190, 28);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 387;
//
// txt_kcOrg
//
- this.txt_kcOrg.Location = new System.Drawing.Point(84, 44);
+ this.txt_kcOrg.Location = new System.Drawing.Point(90, 44);
this.txt_kcOrg.Name = "txt_kcOrg";
this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_kcOrg.Size = new System.Drawing.Size(195, 28);
+ this.txt_kcOrg.Size = new System.Drawing.Size(189, 28);
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 216;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 44);
+ this.txt_createBy.Location = new System.Drawing.Point(632, 44);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(195, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(189, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(897, 44);
+ this.txt_checkUser.Location = new System.Drawing.Point(903, 44);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(190, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(626, 76);
+ this.txt_createDate.Location = new System.Drawing.Point(632, 76);
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(195, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(189, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
@@ -717,6 +701,14 @@
this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 584;
+ //
+ // txt_guid
+ //
+ this.txt_guid.Location = new System.Drawing.Point(632, 108);
+ this.txt_guid.Name = "txt_guid";
+ this.txt_guid.Size = new System.Drawing.Size(189, 24);
+ this.txt_guid.StyleController = this.layoutMx1;
+ this.txt_guid.TabIndex = 586;
//
// layoutControlItem17
//
@@ -750,7 +742,8 @@
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem16,
- this.layoutControlItem15});
+ this.layoutControlItem15,
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -792,7 +785,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem2
//
@@ -802,7 +795,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem3
//
@@ -812,7 +805,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem4
//
@@ -822,7 +815,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem5
//
@@ -832,7 +825,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem6
//
@@ -843,7 +836,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem6.Text = "棰嗙敤缁勭粐";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem7
//
@@ -854,7 +847,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem7.Text = "鍒涘缓浜�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem8
//
@@ -865,7 +858,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem8.Text = "瀹℃牳浜�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem9
//
@@ -875,7 +868,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem10
//
@@ -886,7 +879,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem10.Text = "瀹㈡埛";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem11
//
@@ -897,7 +890,7 @@
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem11.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem12
//
@@ -908,7 +901,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem13
//
@@ -918,7 +911,7 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem13.Text = "璐т富";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem14
//
@@ -929,7 +922,7 @@
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem14.Text = "棰嗘枡閮ㄩ棬";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem16
//
@@ -945,14 +938,25 @@
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_remark;
+ this.layoutControlItem15.Control = this.txt_sqRemark;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 128);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
this.layoutControlItem15.Text = "澶囨敞淇℃伅";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_guid;
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem18.Text = "涓婚敭GUID";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(66, 18);
//
// tabMx
//
@@ -1329,7 +1333,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lybm.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyOrg.Properties)).EndInit();
@@ -1342,6 +1346,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1360,6 +1365,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1383,7 +1389,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
@@ -1393,7 +1398,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
@@ -1409,7 +1413,7 @@
private DevExpress.XtraEditors.TextEdit txt_abtNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_kcOrg;
@@ -1460,5 +1464,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.TextEdit txt_guid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
index 44ce275..36facfd 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
@@ -145,7 +145,7 @@
//
// gridColumn3
//
- this.gridColumn3.Caption = "缁戝畾瀵瑰儚";
+ this.gridColumn3.Caption = "缁戝畾瀵瑰儚(椤甸潰/鎵撳嵃鏈�/浠撳簱)";
this.gridColumn3.FieldName = "gnName";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 578d495..1b73e3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -70,6 +70,7 @@
this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -92,6 +93,7 @@
this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -106,11 +108,9 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -163,9 +163,9 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -199,6 +199,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -213,11 +214,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -239,14 +238,16 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -550,6 +551,16 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Width = 94;
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn12.FieldName = "daa014";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 15;
+ this.gridColumn12.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -634,7 +645,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 140);
+ this.btnSelect.Location = new System.Drawing.Point(12, 130);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -644,18 +655,20 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 44);
+ this.txt_tbl023.Location = new System.Drawing.Point(84, 34);
this.txt_tbl023.Name = "txt_tbl023";
this.txt_tbl023.Size = new System.Drawing.Size(195, 28);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl005
//
- this.txt_tbl005.Location = new System.Drawing.Point(84, 108);
+ this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 98);
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)});
this.txt_tbl005.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
"鑹搧閫�鏂�",
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
@@ -666,7 +679,7 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 108);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 98);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
@@ -677,14 +690,14 @@
// txt_tbl002
//
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 76);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 66);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(195, 28);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(355, 76);
+ this.txt_workName.Location = new System.Drawing.Point(355, 66);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workName.Properties.Appearance.Options.UseFont = true;
@@ -695,7 +708,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 44);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 34);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
@@ -706,7 +719,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 2);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -717,7 +730,7 @@
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(897, 108);
+ this.txt_rwd.Location = new System.Drawing.Point(897, 130);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
@@ -728,7 +741,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 2);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
@@ -739,7 +752,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(355, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(355, 2);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
@@ -750,7 +763,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
+ 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);
@@ -760,7 +773,7 @@
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(626, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(626, 2);
this.txt_tbl009.Name = "txt_tbl009";
this.txt_tbl009.Size = new System.Drawing.Size(195, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
@@ -769,7 +782,7 @@
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(626, 44);
+ this.txt_tbl010.Location = new System.Drawing.Point(626, 34);
this.txt_tbl010.Name = "txt_tbl010";
this.txt_tbl010.Size = new System.Drawing.Size(195, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
@@ -778,7 +791,7 @@
//
// txt_tbl020
//
- this.txt_tbl020.Location = new System.Drawing.Point(554, 76);
+ this.txt_tbl020.Location = new System.Drawing.Point(554, 66);
this.txt_tbl020.Name = "txt_tbl020";
this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
@@ -788,7 +801,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(355, 44);
+ this.txt_daa003.Location = new System.Drawing.Point(355, 34);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Size = new System.Drawing.Size(195, 24);
this.txt_daa003.StyleController = this.layoutMx1;
@@ -803,6 +816,15 @@
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 468;
this.txt_id.Tag = "readonly";
+ //
+ // txt_daa014
+ //
+ this.txt_daa014.Location = new System.Drawing.Point(897, 98);
+ this.txt_daa014.Name = "txt_daa014";
+ this.txt_daa014.Size = new System.Drawing.Size(196, 24);
+ this.txt_daa014.StyleController = this.layoutMx1;
+ this.txt_daa014.TabIndex = 469;
+ this.txt_daa014.Tag = "readonly";
//
// layoutControlItem7
//
@@ -843,12 +865,12 @@
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem16,
- this.layoutControlItem2,
this.layoutControlItem8,
this.layoutControlItem18,
this.layoutControlItem6,
- this.layoutControlItem15,
- this.lab_daa014});
+ this.lab_daa014,
+ this.layoutControlItem2,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1002,17 +1024,6 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemName;
@@ -1044,18 +1055,6 @@
this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_tbl006;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem15.Text = "澶囨敞璇存槑";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1641,34 +1640,39 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn12
- //
- this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
- this.gridColumn12.FieldName = "daa014";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 15;
- this.gridColumn12.Width = 94;
- //
- // txt_daa014
- //
- this.txt_daa014.Location = new System.Drawing.Point(897, 140);
- this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(196, 24);
- this.txt_daa014.StyleController = this.layoutMx1;
- this.txt_daa014.TabIndex = 469;
- //
// lab_daa014
//
this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(813, 128);
+ this.lab_daa014.Location = new System.Drawing.Point(813, 96);
this.lab_daa014.Name = "lab_daa014";
this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 3;
- this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
+ this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
this.lab_daa014.Size = new System.Drawing.Size(272, 32);
this.lab_daa014.Text = "鎶曟枡鍗曞彿";
this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_rwd;
+ this.layoutControlItem2.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem2.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_tbl006;
+ this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem15.Text = "澶囨敞璇存槑";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_MesItemTbl
//
@@ -1713,6 +1717,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1727,11 +1732,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1754,8 +1757,9 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1870,13 +1874,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 521c1a4..a61cd9a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1737,6 +1737,8 @@
<None Include="Resources\column2_32x32.png" />
<None Include="Resources\projectfile_16x16.png" />
<None Include="Resources\selectvaluespivottable_16x16.png" />
+ <None Include="Resources\splinearea_32x32.png" />
+ <None Include="Resources\stackedsplinearea_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 559cd71..8800591 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1923,6 +1923,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap splinearea_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("splinearea_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap stackedsplinearea_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("stackedsplinearea_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap task_16x16 {
get {
object obj = ResourceManager.GetObject("task_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index a5571a8..378ad79 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -154,6 +154,11 @@
<data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -286,11 +291,6 @@
<data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -359,6 +359,9 @@
</data>
<data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -503,6 +506,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -641,9 +647,6 @@
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -681,8 +684,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -758,6 +763,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="splinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\splinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -776,15 +784,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -947,8 +951,10 @@
<data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -958,7 +964,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="stackedsplinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\stackedsplinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/splinearea_32x32.png b/DevApp/Gs.DevApp/Resources/splinearea_32x32.png
new file mode 100644
index 0000000..eb76146
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/splinearea_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/stackedsplinearea_32x32.png b/DevApp/Gs.DevApp/Resources/stackedsplinearea_32x32.png
new file mode 100644
index 0000000..0f1bafb
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/stackedsplinearea_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
index f9f1409..9443e90 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
@@ -28,11 +28,8 @@
/// </summary>
private void InitializeComponent()
{
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -45,33 +42,11 @@
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
this.SuspendLayout();
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1023, 465);
- this.xtraTabControl1.TabIndex = 5;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.panelControl1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1021, 433);
- this.xtraTabPage1.Text = "璇烽�夋嫨闇�瑕侀��鐨勬暟鎹�";
//
// gcMain
//
@@ -80,8 +55,8 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1021, 390);
- this.gcMain.TabIndex = 1;
+ this.gcMain.Size = new System.Drawing.Size(1034, 422);
+ this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -93,7 +68,6 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_chk,
this.gv_guid,
this.gridColumn1,
this.gv_supplierItemCode,
@@ -107,20 +81,10 @@
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.MultiSelect = true;
+ this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_chk
- //
- this.gv_chk.Caption = "閫夋嫨";
- this.gv_chk.FieldName = "gvChk";
- this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_chk.MaxWidth = 40;
- this.gv_chk.MinWidth = 40;
- this.gv_chk.Name = "gv_chk";
- this.gv_chk.Visible = true;
- this.gv_chk.VisibleIndex = 0;
- this.gv_chk.Width = 40;
//
// gv_guid
//
@@ -235,16 +199,18 @@
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 390);
+ this.panelControl1.Location = new System.Drawing.Point(0, 422);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1021, 43);
- this.panelControl1.TabIndex = 4;
+ this.panelControl1.Size = new System.Drawing.Size(1034, 43);
+ this.panelControl1.TabIndex = 9;
//
// btnIn
//
- this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
- this.btnIn.Location = new System.Drawing.Point(2, 2);
+ this.btnIn.Location = new System.Drawing.Point(938, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
this.btnIn.TabIndex = 4;
@@ -253,28 +219,26 @@
// pageBar1
//
this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
- this.pageBar1.Location = new System.Drawing.Point(35, 2);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pageBar1.Location = new System.Drawing.Point(2, 2);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 8, 3, 8);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(984, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.Size = new System.Drawing.Size(1023, 39);
+ this.pageBar1.TabIndex = 8;
this.pageBar1.TotalPages = 0;
//
// SelectItemTbl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1023, 465);
- this.Controls.Add(this.xtraTabControl1);
+ this.ClientSize = new System.Drawing.Size(1034, 465);
+ this.Controls.Add(this.gcMain);
+ this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Name = "SelectItemTbl";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "鐢熶骇閫�鏂欑敵璇烽�夋嫨鐗╂枡";
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
@@ -284,23 +248,19 @@
}
#endregion
-
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.SimpleButton btnIn;
- private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private UserControls.Data.UcPageBar pageBar1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs
index eb1e577..1b1dab5 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs
@@ -32,15 +32,12 @@
btnIn.Click += (s, e) =>
{
var list = new List<string>();
- for (var i = 0; i < gridView1.DataRowCount; i++)
+ int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
+ DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
+ foreach (int idx in rows)
{
- var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
- if (checkBox == "Checked")
- {
- var _guid = gridView1.GetRowCellValue(i, "dabGuid")
- .ToString();
- list.Add(_guid);
- }
+ string _guid = dt.Rows[idx]["dabGuid"].ToString();
+ list.Add(_guid);
}
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { StringList = list });
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index 8fe6c76..9830c42 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -33,7 +33,7 @@
//
// simpleButton1
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.column2_32x32;
+ this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.stackedsplinearea_32x32;
this.simpleButton1.Location = new System.Drawing.Point(343, 110);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
--
Gitblit v1.9.3