From 75d7e3793fccb25e03a2dfce7bd13331d6c15e10 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 07 十一月 2025 08:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 653 +++++++++++++++++++++++++++++++---------------------------
3 files changed, 353 insertions(+), 307 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..c31e074 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,8 +36,8 @@
</runtime>
<appSettings>
- <!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
+ <add key="webapiurl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index df81b01..ce7abe3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -131,6 +131,12 @@
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -163,12 +169,6 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -228,6 +228,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -238,12 +244,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -255,9 +255,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -265,10 +266,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -277,8 +279,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -287,6 +290,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -299,17 +303,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -319,7 +325,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_qt015,
this.gv_qt014,
@@ -343,8 +349,9 @@
this.gridColumn23,
this.gridColumn24,
this.gridColumn25});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -355,270 +362,271 @@
this.gv_qt015.AppearanceCell.Options.UseFont = true;
this.gv_qt015.Caption = "瀹℃牳鐘舵�� ";
this.gv_qt015.FieldName = "isChk";
- this.gv_qt015.MaxWidth = 50;
- this.gv_qt015.MinWidth = 50;
+ this.gv_qt015.MaxWidth = 62;
+ this.gv_qt015.MinWidth = 62;
this.gv_qt015.Name = "gv_qt015";
this.gv_qt015.OptionsColumn.AllowEdit = false;
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.UnboundDataType = typeof(bool);
this.gv_qt015.Visible = true;
this.gv_qt015.VisibleIndex = 1;
- this.gv_qt015.Width = 50;
+ this.gv_qt015.Width = 62;
//
// gv_qt014
//
this.gv_qt014.AppearanceCell.Options.UseFont = true;
this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_qt014.FieldName = "isWj";
- this.gv_qt014.MaxWidth = 50;
- this.gv_qt014.MinWidth = 50;
+ this.gv_qt014.MaxWidth = 62;
+ this.gv_qt014.MinWidth = 62;
this.gv_qt014.Name = "gv_qt014";
this.gv_qt014.OptionsColumn.AllowEdit = false;
this.gv_qt014.Tag = "query_a.qt014";
this.gv_qt014.UnboundDataType = typeof(bool);
- this.gv_qt014.Width = 50;
+ this.gv_qt014.Width = 62;
//
// gv_qtck
//
this.gv_qtck.AppearanceCell.Options.UseFont = true;
this.gv_qtck.Caption = "鐢宠鍗曞彿 ";
this.gv_qtck.FieldName = "qtck";
- this.gv_qtck.MinWidth = 25;
+ this.gv_qtck.MinWidth = 31;
this.gv_qtck.Name = "gv_qtck";
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
this.gv_qtck.VisibleIndex = 5;
- this.gv_qtck.Width = 100;
+ this.gv_qtck.Width = 125;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍗曟嵁绫诲瀷";
this.gridColumn3.FieldName = "qt019";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gv_qt020
//
this.gv_qt020.AppearanceCell.Options.UseFont = true;
this.gv_qt020.Caption = "搴撳瓨鏂瑰悜";
this.gv_qt020.FieldName = "qt020";
- this.gv_qt020.MinWidth = 25;
+ this.gv_qt020.MinWidth = 31;
this.gv_qt020.Name = "gv_qt020";
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
this.gv_qt020.VisibleIndex = 13;
- this.gv_qt020.Width = 94;
+ this.gv_qt020.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "璐т富绫诲瀷";
this.gridColumn4.FieldName = "qt025";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 15;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gv_qt005
//
this.gv_qt005.AppearanceCell.Options.UseFont = true;
this.gv_qt005.Caption = "鍒跺崟浜� ";
this.gv_qt005.FieldName = "qt005";
- this.gv_qt005.MinWidth = 25;
+ this.gv_qt005.MinWidth = 31;
this.gv_qt005.Name = "gv_qt005";
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
this.gv_qt005.VisibleIndex = 8;
- this.gv_qt005.Width = 94;
+ this.gv_qt005.Width = 117;
//
// gv_qt001
//
this.gv_qt001.AppearanceCell.Options.UseFont = true;
this.gv_qt001.Caption = "鍒跺崟鏃ユ湡 ";
this.gv_qt001.FieldName = "qt001";
- this.gv_qt001.MinWidth = 25;
+ this.gv_qt001.MinWidth = 31;
this.gv_qt001.Name = "gv_qt001";
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
this.gv_qt001.VisibleIndex = 9;
- this.gv_qt001.Width = 180;
+ this.gv_qt001.Width = 225;
//
// gv_qt010
//
this.gv_qt010.AppearanceCell.Options.UseFont = true;
this.gv_qt010.Caption = "鐢宠澶囨敞";
this.gv_qt010.FieldName = "qt010";
- this.gv_qt010.MinWidth = 25;
+ this.gv_qt010.MinWidth = 31;
this.gv_qt010.Name = "gv_qt010";
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
this.gv_qt010.VisibleIndex = 10;
- this.gv_qt010.Width = 94;
+ this.gv_qt010.Width = 117;
//
// gv_qt016
//
this.gv_qt016.AppearanceCell.Options.UseFont = true;
this.gv_qt016.Caption = "瀹℃牳浜� ";
this.gv_qt016.FieldName = "qt016";
- this.gv_qt016.MinWidth = 25;
+ this.gv_qt016.MinWidth = 31;
this.gv_qt016.Name = "gv_qt016";
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
this.gv_qt016.VisibleIndex = 11;
- this.gv_qt016.Width = 94;
+ this.gv_qt016.Width = 117;
//
// gv_qt002
//
this.gv_qt002.AppearanceCell.Options.UseFont = true;
this.gv_qt002.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_qt002.FieldName = "qt002";
- this.gv_qt002.MinWidth = 25;
+ this.gv_qt002.MinWidth = 31;
this.gv_qt002.Name = "gv_qt002";
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
this.gv_qt002.VisibleIndex = 12;
- this.gv_qt002.Width = 94;
+ this.gv_qt002.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "搴撳瓨缁勭粐";
this.gridColumn5.FieldName = "kcOrg";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 17;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "棰嗙敤缁勭粐";
this.gridColumn6.FieldName = "lyOrg";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 18;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "璐㈠姟瀹℃牳";
this.gridColumn13.FieldName = "isCwChk";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.qt029";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 4;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "鍞悗瀹℃牳";
this.gridColumn14.FieldName = "isShChk";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Tag = "query_a.qt026";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 2;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "閲囪喘瀹℃牳";
this.gridColumn15.FieldName = "isCgChk";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Tag = "query_a.qt032";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 3;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍑哄簱绫诲瀷";
this.gridColumn20.FieldName = "qtlx";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 14;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鐢宠鍗旼uid";
this.gridColumn21.FieldName = "guid";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "璐т富";
this.gridColumn22.FieldName = "hzOrg";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 16;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "瀹岀粨鏍囪瘑";
this.gridColumn23.FieldName = "txtColor";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 0;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "棰嗙敤瀹㈡埛";
this.gridColumn24.FieldName = "khName";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 7;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "棰嗙敤閮ㄩ棬";
this.gridColumn25.FieldName = "bmName";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 6;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -626,6 +634,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -638,8 +647,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 233;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 285;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -674,37 +683,40 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(561, 558, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 285);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_wwgys
//
this.txt_wwgys.IsReadly = false;
- this.txt_wwgys.Location = new System.Drawing.Point(385, 163);
+ this.txt_wwgys.Location = new System.Drawing.Point(476, 204);
this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwgys.Name = "txt_wwgys";
- this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
+ this.txt_wwgys.Size = new System.Drawing.Size(212, 28);
this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
- this.btnCopyXls.Location = new System.Drawing.Point(12, 194);
+ this.btnCopyXls.Location = new System.Drawing.Point(14, 242);
+ this.btnCopyXls.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCopyXls.Name = "btnCopyXls";
- this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
+ this.btnCopyXls.Size = new System.Drawing.Size(146, 34);
this.btnCopyXls.StyleController = this.layoutMx1;
this.btnCopyXls.TabIndex = 445;
this.btnCopyXls.Text = "蹇嵎褰曞叆";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 162);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 198);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 46);
+ this.lbGuid.Size = new System.Drawing.Size(342, 56);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -713,44 +725,48 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 70);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(14, 90);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(335, 72);
this.ucLookHuoZhu1.TabIndex = 318;
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 132);
+ this.txt_qt010.Location = new System.Drawing.Point(137, 166);
+ this.txt_qt010.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(212, 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(385, 101);
+ this.txt_qt009.Location = new System.Drawing.Point(476, 128);
+ this.txt_qt009.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(212, 28);
this.txt_qt009.TabIndex = 316;
//
// txt_qt013
//
this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(385, 70);
+ this.txt_qt013.Location = new System.Drawing.Point(476, 90);
+ this.txt_qt013.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt013.Name = "txt_qt013";
- this.txt_qt013.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt013.Size = new System.Drawing.Size(212, 28);
this.txt_qt013.TabIndex = 304;
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(114, 8);
+ this.txt_qtck.Location = new System.Drawing.Point(137, 14);
+ this.txt_qtck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(212, 28);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 211;
this.txt_qtck.Tag = "readonly";
@@ -758,7 +774,8 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)";
- this.txt_qt019.Location = new System.Drawing.Point(385, 8);
+ this.txt_qt019.Location = new System.Drawing.Point(476, 14);
+ this.txt_qt019.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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)});
@@ -769,14 +786,15 @@
"璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
"搴撳瓨璋冩暣(QTCKD05_SYS)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(212, 28);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 301;
//
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(385, 39);
+ this.txt_qt020.Location = new System.Drawing.Point(476, 52);
+ this.txt_qt020.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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)});
@@ -784,146 +802,161 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt020.Size = new System.Drawing.Size(212, 28);
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(114, 39);
+ this.txt_qt023.Location = new System.Drawing.Point(137, 52);
+ this.txt_qt023.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt023.Size = new System.Drawing.Size(212, 28);
this.txt_qt023.TabIndex = 307;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(927, 8);
+ this.txt_qt016.Location = new System.Drawing.Point(1154, 14);
+ this.txt_qt016.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt016.Size = new System.Drawing.Size(214, 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(927, 39);
+ this.txt_qt002.Location = new System.Drawing.Point(1154, 52);
+ this.txt_qt002.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(214, 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, 70);
+ this.txt_qt015.Location = new System.Drawing.Point(1031, 90);
+ this.txt_qt015.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(337, 27);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 310;
this.txt_qt015.Tag = "readonly";
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(927, 101);
+ this.txt_qt031.Location = new System.Drawing.Point(1154, 128);
+ this.txt_qt031.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt031.Name = "txt_qt031";
- this.txt_qt031.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt031.Size = new System.Drawing.Size(214, 28);
this.txt_qt031.StyleController = this.layoutMx1;
this.txt_qt031.TabIndex = 321;
this.txt_qt031.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(927, 132);
+ this.txt_qt030.Location = new System.Drawing.Point(1154, 166);
+ this.txt_qt030.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(214, 28);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 322;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(825, 163);
+ this.txt_qt029.Location = new System.Drawing.Point(1031, 204);
+ this.txt_qt029.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
- this.txt_qt029.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(337, 27);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 323;
this.txt_qt029.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(656, 101);
+ this.txt_qt028.Location = new System.Drawing.Point(815, 128);
+ this.txt_qt028.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(212, 28);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 324;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(656, 132);
+ this.txt_qt027.Location = new System.Drawing.Point(815, 166);
+ this.txt_qt027.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(212, 28);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 325;
this.txt_qt027.Tag = "readonly";
//
// txt_qt034
//
- this.txt_qt034.Location = new System.Drawing.Point(656, 8);
+ this.txt_qt034.Location = new System.Drawing.Point(815, 14);
+ this.txt_qt034.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(212, 28);
this.txt_qt034.StyleController = this.layoutMx1;
this.txt_qt034.TabIndex = 326;
this.txt_qt034.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(554, 163);
+ this.txt_qt026.Location = new System.Drawing.Point(692, 204);
+ this.txt_qt026.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑";
- this.txt_qt026.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(335, 27);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 327;
this.txt_qt026.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(656, 39);
+ this.txt_qt033.Location = new System.Drawing.Point(815, 52);
+ this.txt_qt033.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(212, 28);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 328;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(554, 70);
+ this.txt_qt032.Location = new System.Drawing.Point(692, 90);
+ this.txt_qt032.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(335, 27);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 329;
this.txt_qt032.Tag = "readonly";
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(114, 163);
+ this.txt_qt035.Location = new System.Drawing.Point(137, 204);
+ this.txt_qt035.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_qt035.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(212, 28);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 330;
//
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(385, 132);
+ this.txt_qtlx.Location = new System.Drawing.Point(476, 166);
+ this.txt_qtlx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -936,17 +969,19 @@
"5:鎶ュ簾鍑哄簱",
"6:鏍锋満鍑哄簱",
"7:鏃犳簮鍗曞澶栭��鏂�",
- "8:鐩樹簭"});
+ "8:鐩樹簭",
+ "9:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(212, 28);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 331;
//
// txt_lyRemark
//
- this.txt_lyRemark.Location = new System.Drawing.Point(385, 194);
+ this.txt_lyRemark.Location = new System.Drawing.Point(476, 242);
+ this.txt_lyRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lyRemark.Name = "txt_lyRemark";
- this.txt_lyRemark.Size = new System.Drawing.Size(436, 27);
+ this.txt_lyRemark.Size = new System.Drawing.Size(551, 34);
this.txt_lyRemark.StyleController = this.layoutMx1;
this.txt_lyRemark.TabIndex = 447;
this.txt_lyRemark.Tag = "readonly";
@@ -1030,58 +1065,58 @@
rowDefinition5,
rowDefinition6,
rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1105, 237);
+ this.Root.Size = new System.Drawing.Size(1382, 290);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt019;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(339, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_qt023;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qt016;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1017, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem6.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_qt002;
- this.layoutControlItem7.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1017, 38);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem7.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt015;
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1017, 76);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem8.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -1089,11 +1124,11 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.ucLookHuoZhu1;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 62);
+ this.layoutControlItem9.Size = new System.Drawing.Size(339, 76);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -1101,33 +1136,33 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_qt031;
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 93);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1017, 114);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 124);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1017, 152);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem16.Text = "璐㈠姟瀹℃牳鏃堕棿";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_qt029;
- this.layoutControlItem17.Location = new System.Drawing.Point(813, 155);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1017, 190);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1135,33 +1170,33 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 93);
+ this.layoutControlItem18.Location = new System.Drawing.Point(678, 114);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt027;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 124);
+ this.layoutControlItem19.Location = new System.Drawing.Point(678, 152);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt026;
- this.layoutControlItem21.Location = new System.Drawing.Point(542, 155);
+ this.layoutControlItem21.Location = new System.Drawing.Point(678, 190);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem21.Text = "鍞悗瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1169,32 +1204,32 @@
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt034;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(678, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_qt033;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem22.Location = new System.Drawing.Point(678, 38);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt032;
- this.layoutControlItem23.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem23.Location = new System.Drawing.Point(678, 76);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem23.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1202,53 +1237,124 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_qt010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 152);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_qt035;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 190);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_qtck;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.btnCopyXls;
- this.layoutControlItem25.Location = new System.Drawing.Point(0, 186);
- this.layoutControlItem25.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem25.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem25.Location = new System.Drawing.Point(0, 228);
+ this.layoutControlItem25.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem25.MinSize = new System.Drawing.Size(112, 38);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_qt020;
+ this.layoutControlItem3.Location = new System.Drawing.Point(339, 38);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_qt013;
+ this.layoutControlItem10.Location = new System.Drawing.Point(339, 76);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem10.Text = "瀹㈡埛";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_qt009;
+ this.layoutControlItem11.Location = new System.Drawing.Point(339, 114);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_qtlx;
+ this.layoutControlItem12.Location = new System.Drawing.Point(339, 152);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem12.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layItemWwgys
+ //
+ this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
+ this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
+ this.layItemWwgys.Control = this.txt_wwgys;
+ this.layItemWwgys.Location = new System.Drawing.Point(339, 190);
+ this.layItemWwgys.Name = "layItemWwgys";
+ this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 5;
+ this.layItemWwgys.Size = new System.Drawing.Size(339, 38);
+ this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
+ this.layItemWwgys.TextSize = new System.Drawing.Size(108, 22);
+ this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // txt_lyRemarklb
+ //
+ this.txt_lyRemarklb.Control = this.txt_lyRemark;
+ this.txt_lyRemarklb.Location = new System.Drawing.Point(339, 228);
+ this.txt_lyRemarklb.Name = "txt_lyRemarklb";
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
+ this.txt_lyRemarklb.Size = new System.Drawing.Size(678, 38);
+ this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
+ this.txt_lyRemarklb.TextSize = new System.Drawing.Size(108, 22);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 325);
+ this.tabMx.Size = new System.Drawing.Size(1408, 398);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1256,21 +1362,24 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 293);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 360);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1,
this.rptCk});
- this.gcMx1.Size = new System.Drawing.Size(1124, 293);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 360);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1293,6 +1402,7 @@
this.gridColumn16,
this.gridColumn17,
this.gridColumn18});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1305,20 +1415,20 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 62;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// gvMx1qtrkGuid
//
this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true;
this.gvMx1qtrkGuid.Caption = "qtGuid";
this.gvMx1qtrkGuid.FieldName = "qtGuid";
- this.gvMx1qtrkGuid.MinWidth = 50;
+ this.gvMx1qtrkGuid.MinWidth = 62;
this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid";
- this.gvMx1qtrkGuid.Width = 94;
+ this.gvMx1qtrkGuid.Width = 117;
//
// gridColumn1
//
@@ -1328,12 +1438,12 @@
this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn1.Caption = "閫夋嫨鐗╂枡";
this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "edit";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// repositoryItemSearchLookUpEdit1
//
@@ -1357,6 +1467,7 @@
this.gridColumn10,
this.gridColumn11,
this.gridColumn7});
+ this.gridView2.DetailHeight = 428;
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1366,27 +1477,29 @@
//
this.gridColumn8.Caption = "鐗╂枡ID";
this.gridColumn8.FieldName = "id";
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 20;
+ this.gridColumn8.Width = 25;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡缂栫爜";
this.gridColumn9.FieldName = "itemNo";
- this.gridColumn9.MinWidth = 100;
+ this.gridColumn9.MinWidth = 125;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 100;
+ this.gridColumn9.Width = 125;
//
// gridColumn2
//
this.gridColumn2.Caption = "鍗曚綅";
this.gridColumn2.FieldName = "dwName";
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 20;
+ this.gridColumn2.Width = 25;
//
// gridColumn19
//
@@ -1396,77 +1509,77 @@
this.gridColumn19.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn19.Caption = "Mes/Erp搴撳瓨";
this.gridColumn19.FieldName = "kcQty";
- this.gridColumn19.MinWidth = 150;
+ this.gridColumn19.MinWidth = 187;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 2;
- this.gridColumn19.Width = 150;
+ this.gridColumn19.Width = 187;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 120;
+ this.gridColumn10.MinWidth = 150;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 3;
- this.gridColumn10.Width = 120;
+ this.gridColumn10.Width = 150;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.MinWidth = 150;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 120;
+ this.gridColumn11.Width = 150;
//
// gridColumn7
//
this.gridColumn7.Caption = "浣跨敤缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 5;
- this.gridColumn7.Width = 50;
+ this.gridColumn7.Width = 62;
//
// gvMx1qd002
//
this.gvMx1qd002.AppearanceCell.Options.UseFont = true;
this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1qd002.FieldName = "qd002";
- this.gvMx1qd002.MinWidth = 25;
+ this.gvMx1qd002.MinWidth = 31;
this.gvMx1qd002.Name = "gvMx1qd002";
this.gvMx1qd002.Tag = "query_a.qd002";
this.gvMx1qd002.Visible = true;
this.gvMx1qd002.VisibleIndex = 1;
- this.gvMx1qd002.Width = 94;
+ this.gvMx1qd002.Width = 117;
//
// gvMx1qd003
//
this.gvMx1qd003.AppearanceCell.Options.UseFont = true;
this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1qd003.FieldName = "qd003";
- this.gvMx1qd003.MinWidth = 25;
+ this.gvMx1qd003.MinWidth = 31;
this.gvMx1qd003.Name = "gvMx1qd003";
this.gvMx1qd003.Tag = "query_a.qd003";
this.gvMx1qd003.Visible = true;
this.gvMx1qd003.VisibleIndex = 2;
- this.gvMx1qd003.Width = 94;
+ this.gvMx1qd003.Width = 117;
//
// gvMx1qd004
//
this.gvMx1qd004.AppearanceCell.Options.UseFont = true;
this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 ";
this.gvMx1qd004.FieldName = "qd004";
- this.gvMx1qd004.MinWidth = 25;
+ this.gvMx1qd004.MinWidth = 31;
this.gvMx1qd004.Name = "gvMx1qd004";
this.gvMx1qd004.Tag = "query_a.qd004";
this.gvMx1qd004.Visible = true;
this.gvMx1qd004.VisibleIndex = 3;
- this.gvMx1qd004.Width = 94;
+ this.gvMx1qd004.Width = 117;
//
// gvMx1qd007
//
@@ -1477,36 +1590,36 @@
this.gvMx1qd007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd007.Caption = "鐢宠鏁伴噺 ";
this.gvMx1qd007.FieldName = "qd007";
- this.gvMx1qd007.MinWidth = 25;
+ this.gvMx1qd007.MinWidth = 31;
this.gvMx1qd007.Name = "gvMx1qd007";
this.gvMx1qd007.Tag = "yz_quantity_0_edit";
this.gvMx1qd007.Visible = true;
this.gvMx1qd007.VisibleIndex = 4;
- this.gvMx1qd007.Width = 94;
+ this.gvMx1qd007.Width = 117;
//
// gvMx1qd008
//
this.gvMx1qd008.AppearanceCell.Options.UseFont = true;
this.gvMx1qd008.Caption = "宸叉壂鏁伴噺 ";
this.gvMx1qd008.FieldName = "qd008";
- this.gvMx1qd008.MinWidth = 25;
+ this.gvMx1qd008.MinWidth = 31;
this.gvMx1qd008.Name = "gvMx1qd008";
this.gvMx1qd008.Tag = "query_a.qd008";
this.gvMx1qd008.Visible = true;
this.gvMx1qd008.VisibleIndex = 5;
- this.gvMx1qd008.Width = 94;
+ this.gvMx1qd008.Width = 117;
//
// gvMx1qd009
//
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
this.gvMx1qd009.FieldName = "qd009dw";
- this.gvMx1qd009.MinWidth = 25;
+ this.gvMx1qd009.MinWidth = 31;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
this.gvMx1qd009.VisibleIndex = 6;
- this.gvMx1qd009.Width = 94;
+ this.gvMx1qd009.Width = 117;
//
// gvMx1qd010
//
@@ -1517,22 +1630,22 @@
this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd010.Caption = "澶囨敞 ";
this.gvMx1qd010.FieldName = "qd010";
- this.gvMx1qd010.MinWidth = 25;
+ this.gvMx1qd010.MinWidth = 31;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "edit";
this.gvMx1qd010.Visible = true;
this.gvMx1qd010.VisibleIndex = 7;
- this.gvMx1qd010.Width = 94;
+ this.gvMx1qd010.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 10;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -1549,9 +1662,9 @@
//
this.gridColumn12.Caption = "鐗╂枡ID";
this.gridColumn12.FieldName = "itemId";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn16
//
@@ -1562,11 +1675,11 @@
this.gridColumn16.Caption = "閫夋嫨浠撳簱";
this.gridColumn16.ColumnEdit = this.rptCk;
this.gridColumn16.FieldName = "depotName";
- this.gridColumn16.MinWidth = 80;
+ this.gridColumn16.MinWidth = 100;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 8;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// rptCk
//
@@ -1582,9 +1695,9 @@
//
this.gridColumn17.Caption = "浠撳簱ID";
this.gridColumn17.FieldName = "depotId";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn18
//
@@ -1594,101 +1707,33 @@
this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn18.Caption = "Mes/Erp搴撳瓨";
this.gridColumn18.FieldName = "kcQty";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 9;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(971, 27);
+ this.picCheckBox.Location = new System.Drawing.Point(1214, 33);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_qt020;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 31);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 62);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem10.Text = "瀹㈡埛";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_qt009;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 93);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_qtlx;
- this.layoutControlItem12.Location = new System.Drawing.Point(271, 124);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
- //
- // layItemWwgys
- //
- this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
- this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
- this.layItemWwgys.Control = this.txt_wwgys;
- this.layItemWwgys.Location = new System.Drawing.Point(271, 155);
- this.layItemWwgys.Name = "layItemWwgys";
- this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 5;
- this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
- this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
- this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
- this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- //
- // txt_lyRemarklb
- //
- this.txt_lyRemarklb.Control = this.txt_lyRemark;
- this.txt_lyRemarklb.Location = new System.Drawing.Point(271, 186);
- this.txt_lyRemarklb.Name = "txt_lyRemarklb";
- this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 1;
- this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
- this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
- this.txt_lyRemarklb.Size = new System.Drawing.Size(542, 31);
- this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
- this.txt_lyRemarklb.TextSize = new System.Drawing.Size(90, 18);
- //
// Frm_MesItemQt
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesItemQt";
this.Text = "鍏跺畠鍑哄簱鐢宠";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1750,6 +1795,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1760,12 +1811,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index b2d7ec3..fd192a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -1035,7 +1035,8 @@
"2:鎷嗗嵏鍏ュ簱",
"3:渚涘簲鍟嗚禒閫�",
"4:鏃犳簮鍗曞澶栭��鏉愭枡",
- "5:鐩樼泩"});
+ "5:鐩樼泩",
+ "6:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(287, 28);
this.txt_qtlx.StyleController = this.layoutMx1;
--
Gitblit v1.9.3