From 4ef4bb19a581d32e413e8d1465a18930d85cd431 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 08 十一月 2025 16:47:53 +0800
Subject: [PATCH] ID转姓名:仓库验退、生产退料申请、生产退料单、受托入库申请、受托入库单、委外加工单、委外加工出库申请
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | 470 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 268 insertions(+), 202 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
index a98c3ff..04876ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -29,13 +29,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -55,12 +55,13 @@
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
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_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -70,7 +71,7 @@
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -90,6 +91,7 @@
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -114,7 +116,6 @@
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -134,7 +135,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
@@ -144,7 +145,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -181,9 +182,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);
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;
@@ -191,10 +193,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);
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,
@@ -203,8 +206,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(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
@@ -213,6 +217,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);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -225,17 +230,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 = 3;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(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});
@@ -245,7 +252,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.gridColumn13,
this.gv_status,
@@ -259,9 +266,11 @@
this.gv_checkDate,
this.gv_reason,
this.gv_fmrmode,
- this.gridColumn19});
+ this.gridColumn19,
+ this.gridColumn7});
+ 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;
@@ -271,164 +280,185 @@
//
this.gridColumn13.Caption = "閫�鏂欑粍缁�";
this.gridColumn13.FieldName = "receivingOrg";
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "org.fnamber";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 250;
+ this.gridColumn13.VisibleIndex = 6;
+ this.gridColumn13.Width = 312;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.MaxWidth = 62;
+ this.gv_status.MinWidth = 62;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 1;
- this.gv_status.Width = 50;
+ this.gv_status.VisibleIndex = 0;
+ this.gv_status.Width = 62;
//
// gv_fType
//
this.gv_fType.AppearanceCell.Options.UseFont = true;
this.gv_fType.Caption = "濮斿鏍囪瘑";
this.gv_fType.FieldName = "isOut";
- this.gv_fType.MaxWidth = 50;
- this.gv_fType.MinWidth = 50;
+ this.gv_fType.MaxWidth = 62;
+ this.gv_fType.MinWidth = 62;
this.gv_fType.Name = "gv_fType";
this.gv_fType.OptionsColumn.AllowEdit = false;
this.gv_fType.Tag = "query_a.f_type";
this.gv_fType.Visible = true;
- this.gv_fType.VisibleIndex = 2;
- this.gv_fType.Width = 50;
+ this.gv_fType.VisibleIndex = 1;
+ this.gv_fType.Width = 62;
//
// gv_itemOutNo
//
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "楠岄��鍗曞彿 ";
this.gv_itemOutNo.FieldName = "itemCgytNo";
+ this.gv_itemOutNo.MinWidth = 25;
this.gv_itemOutNo.Name = "gv_itemOutNo";
this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
this.gv_itemOutNo.Tag = "query_a.item_out_no";
this.gv_itemOutNo.Visible = true;
- this.gv_itemOutNo.VisibleIndex = 3;
- this.gv_itemOutNo.Width = 100;
+ this.gv_itemOutNo.VisibleIndex = 2;
+ this.gv_itemOutNo.Width = 125;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
this.gv_suppNo.FieldName = "suppNo2";
+ this.gv_suppNo.MinWidth = 25;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 4;
- this.gv_suppNo.Width = 94;
+ this.gv_suppNo.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn1.FieldName = "suppName";
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍒涘缓浜�";
- this.gridColumn3.FieldName = "createBy";
+ this.gridColumn3.FieldName = "createByName";
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.Width = 117;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 7;
- this.gv_createDate.Width = 180;
+ this.gv_createDate.VisibleIndex = 8;
+ this.gv_createDate.Width = 225;
//
// gridColumn4
//
this.gridColumn4.Caption = "瀹℃牳浜�";
- this.gridColumn4.FieldName = "checkUser";
+ this.gridColumn4.FieldName = "checkUserName";
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 9;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.VisibleIndex = 10;
+ this.gv_checkDate.Width = 225;
//
// gv_reason
//
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 = 10;
- this.gv_reason.Width = 94;
+ this.gv_reason.VisibleIndex = 12;
+ this.gv_reason.Width = 117;
//
// gv_fmrmode
//
this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
this.gv_fmrmode.FieldName = "fmrmode";
+ this.gv_fmrmode.MinWidth = 25;
this.gv_fmrmode.Name = "gv_fmrmode";
this.gv_fmrmode.OptionsColumn.AllowEdit = false;
this.gv_fmrmode.Tag = "query_a.fmrmode";
this.gv_fmrmode.Visible = true;
this.gv_fmrmode.VisibleIndex = 11;
- this.gv_fmrmode.Width = 94;
+ this.gv_fmrmode.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "涓婚敭GUID";
this.gridColumn19.FieldName = "guid";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鍒拌揣鍗曞彿";
+ this.gridColumn7.FieldName = "taskNo";
+ this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.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);
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
@@ -436,6 +466,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);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -448,14 +479,14 @@
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 = 103;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 126;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_suppName);
this.layoutMx1.Controls.Add(this.txt_reason);
@@ -465,58 +496,64 @@
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_guid);
- this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.lb_guid,
this.layoutControlItem12});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(792, 394, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 103);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 126);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 527;
this.lbGuid.Text = "lbGuid";
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(897, 40);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 513;
+ this.txt_checkUserName.Location = new System.Drawing.Point(1137, 47);
+ this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 513;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(897, 68);
+ this.txt_checkDate.Location = new System.Drawing.Point(1137, 82);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 252;
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(84, 40);
+ this.txt_suppName.Location = new System.Drawing.Point(96, 47);
+ this.txt_suppName.Margin = new System.Windows.Forms.Padding(4);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Properties.Appearance.Options.UseFont = true;
- this.txt_suppName.Size = new System.Drawing.Size(195, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(259, 28);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 523;
//
// txt_reason
//
- this.txt_reason.Location = new System.Drawing.Point(84, 68);
+ this.txt_reason.Location = new System.Drawing.Point(96, 82);
+ this.txt_reason.Margin = new System.Windows.Forms.Padding(4);
this.txt_reason.Name = "txt_reason";
this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -526,81 +563,89 @@
"浣滀笟涓嶈壇",
"渚涘簲鍟嗙墿鍝佸彿閿欒",
"閲囪喘鏂欏彿鍙樻洿"});
- this.txt_reason.Size = new System.Drawing.Size(195, 24);
+ this.txt_reason.Size = new System.Drawing.Size(259, 28);
this.txt_reason.StyleController = this.layoutMx1;
this.txt_reason.TabIndex = 518;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(355, 40);
+ this.txt_fmrmode.Location = new System.Drawing.Point(443, 47);
+ this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(4);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fmrmode.Properties.Items.AddRange(new object[] {
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵ｆ"});
- this.txt_fmrmode.Size = new System.Drawing.Size(195, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(259, 28);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 519;
//
// txt_itemCgytNo
//
- this.txt_itemCgytNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemCgytNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_itemCgytNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemCgytNo.Name = "txt_itemCgytNo";
this.txt_itemCgytNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemCgytNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemCgytNo.Size = new System.Drawing.Size(259, 28);
this.txt_itemCgytNo.StyleController = this.layoutMx1;
this.txt_itemCgytNo.TabIndex = 210;
//
// txt_isOut
//
- this.txt_isOut.Location = new System.Drawing.Point(283, 12);
+ this.txt_isOut.Location = new System.Drawing.Point(359, 12);
+ this.txt_isOut.Margin = new System.Windows.Forms.Padding(4);
this.txt_isOut.Name = "txt_isOut";
this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_isOut.Size = new System.Drawing.Size(267, 24);
+ this.txt_isOut.Size = new System.Drawing.Size(343, 27);
this.txt_isOut.StyleController = this.layoutMx1;
this.txt_isOut.TabIndex = 525;
this.txt_isOut.Tag = "readOnly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(355, 68);
+ this.txt_remark.Location = new System.Drawing.Point(443, 82);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(466, 24);
+ this.txt_remark.Size = new System.Drawing.Size(606, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 12);
+ this.txt_status.Location = new System.Drawing.Point(1053, 12);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(4);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.Size = new System.Drawing.Size(343, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 526;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(626, 108);
+ this.txt_guid.Location = new System.Drawing.Point(782, 132);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(195, 24);
+ this.txt_guid.Size = new System.Drawing.Size(244, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 528;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(195, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 530;
+ this.txt_createByName.Location = new System.Drawing.Point(790, 12);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Size = new System.Drawing.Size(259, 28);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 530;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(626, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(790, 47);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(195, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(259, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 531;
//
@@ -613,7 +658,7 @@
this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
this.lb_guid.Size = new System.Drawing.Size(271, 32);
this.lb_guid.Text = "涓婚敭Guid";
- this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
+ this.lb_guid.TextSize = new System.Drawing.Size(75, 22);
//
// layoutControlItem12
//
@@ -645,156 +690,157 @@
this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 104);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1408, 126);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 35);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem2.Text = "渚涘簲鍟�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_itemCgytNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem1.Text = "楠岄��鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fmrmode;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem3.Location = new System.Drawing.Point(347, 35);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem3.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_isOut;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem7.Text = "濮斿鏍囪瘑";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_checkUser;
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem9.Control = this.txt_checkUserName;
+ this.layoutControlItem9.Location = new System.Drawing.Point(1041, 35);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem9.Text = "瀹℃牳浜�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1041, 70);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 36);
this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
// lab_createBy
//
- this.lab_createBy.Control = this.txt_createBy;
- this.lab_createBy.Location = new System.Drawing.Point(542, 0);
+ this.lab_createBy.Control = this.txt_createByName;
+ this.lab_createBy.Location = new System.Drawing.Point(694, 0);
this.lab_createBy.Name = "lab_createBy";
this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_createBy.Size = new System.Drawing.Size(271, 28);
+ this.lab_createBy.Size = new System.Drawing.Size(347, 35);
this.lab_createBy.Text = "鍒涘缓浜�";
- this.lab_createBy.TextSize = new System.Drawing.Size(60, 18);
+ this.lab_createBy.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_createDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(694, 35);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_reason;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 70);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 36);
this.layoutControlItem5.Text = "楠岄��鍘熷洜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_remark;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(347, 70);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(694, 36);
this.layoutControlItem8.Text = "楠岄��澶囨敞";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 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);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1126, 455);
+ this.tabMx.Size = new System.Drawing.Size(1408, 557);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -803,17 +849,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 423);
+ this.tabMxPage2.Size = new System.Drawing.Size(1406, 519);
this.tabMxPage2.Text = "閫�璐х墿鏂欐槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 423);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 519);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -832,52 +881,67 @@
this.gvMx2itemOutId,
this.gridColumn14,
this.gridColumn15});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍗曚綅";
+ this.gridColumn2.FieldName = "kcUnit";
+ this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 117;
+ //
// gridColumn12
//
this.gridColumn12.Caption = "鏄庣粏涓婚敭";
this.gridColumn12.FieldName = "guid";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.OptionsColumn.ReadOnly = true;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
+ this.gvMx2itemNo.MinWidth = 25;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
this.gvMx2itemNo.Tag = "query_a.item_no";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 0;
- this.gvMx2itemNo.Width = 94;
+ this.gvMx2itemNo.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "itemName";
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn6.FieldName = "itemModel";
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 2;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gvMx2quantity
//
@@ -888,68 +952,74 @@
this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
this.gvMx2quantity.Caption = "鏁伴噺 ";
this.gvMx2quantity.FieldName = "quantity";
+ this.gvMx2quantity.MinWidth = 25;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.quantity";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
+ this.gvMx2quantity.Width = 117;
//
// gvMx2remark
//
this.gvMx2remark.AppearanceCell.Options.UseFont = true;
this.gvMx2remark.Caption = "澶囨敞";
this.gvMx2remark.FieldName = "remark";
+ this.gvMx2remark.MinWidth = 25;
this.gvMx2remark.Name = "gvMx2remark";
this.gvMx2remark.OptionsColumn.ReadOnly = true;
this.gvMx2remark.Tag = "query_a.remark";
this.gvMx2remark.Visible = true;
this.gvMx2remark.VisibleIndex = 5;
- this.gvMx2remark.Width = 94;
+ this.gvMx2remark.Width = 117;
//
// gvMx2itemOutId
//
this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
this.gvMx2itemOutId.Caption = "涓昏〃涓婚敭";
this.gvMx2itemOutId.FieldName = "itemOutId";
+ this.gvMx2itemOutId.MinWidth = 25;
this.gvMx2itemOutId.Name = "gvMx2itemOutId";
this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
this.gvMx2itemOutId.Tag = "query_a.item_out_id";
- this.gvMx2itemOutId.Width = 94;
+ this.gvMx2itemOutId.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "鍒涘缓浜�";
- this.gridColumn14.FieldName = "createBy";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.FieldName = "createByName";
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 6;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃堕棿";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 7;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 423);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1406, 519);
this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 423);
+ this.gcMx2.Size = new System.Drawing.Size(1406, 519);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -967,6 +1037,7 @@
this.gridColumn10,
this.gridColumn16,
this.gridColumn17});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -978,99 +1049,103 @@
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;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 25;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 1;
- this.gvMx1itemBarcode.Width = 94;
+ this.gvMx1itemBarcode.Width = 117;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx1itemNo.FieldName = "itemNo";
+ this.gvMx1itemNo.MinWidth = 25;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 0;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1itemNo.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡鍚嶇О";
this.gridColumn8.FieldName = "itemName";
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 2;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn9.FieldName = "itemModel";
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 3;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "鍗曚綅";
this.gridColumn10.FieldName = "kcUnit";
- this.gridColumn10.MinWidth = 50;
+ this.gridColumn10.MinWidth = 62;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 5;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "鍒涘缓浜�";
- this.gridColumn16.FieldName = "createBy";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.FieldName = "createByName";
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 6;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍒涘缓鏃堕棿";
this.gridColumn17.FieldName = "createDate";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 7;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// picCheckBox
//
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(968, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1210, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(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 = 11;
this.picCheckBox.TabStop = false;
@@ -1084,25 +1159,15 @@
this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
//
- // gridColumn2
- //
- this.gridColumn2.Caption = "鍗曚綅";
- this.gridColumn2.FieldName = "kcUnit";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 94;
- //
// Frm_MesYanTui
//
- 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);
this.Name = "Frm_MesYanTui";
this.Text = "浠撳簱楠岄��";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1124,7 +1189,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
@@ -1134,7 +1199,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -1191,7 +1256,7 @@
private DevExpress.XtraEditors.TextEdit txt_suppName;
private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_itemCgytNo;
@@ -1234,7 +1299,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraLayout.LayoutControlItem lab_createBy;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
@@ -1243,5 +1308,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3