From 550cb6847bf4c8586bd5430b10ac9d25e8469f5a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 758 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 391 insertions(+), 367 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index f1439f0..8418035 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -30,15 +30,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();
+ this.components = new System.ComponentModel.Container();
+ 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();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -61,6 +62,7 @@
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = 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();
@@ -79,27 +81,27 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -127,7 +129,9 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -160,27 +164,27 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -196,13 +200,15 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
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;
@@ -210,10 +216,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,
@@ -222,15 +229,18 @@
// 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
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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
@@ -242,18 +252,20 @@
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
- this.split1.Size = new System.Drawing.Size(1126, 570);
- this.split1.SplitterPosition = 263;
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ 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.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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, 224);
+ 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});
@@ -262,9 +274,8 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
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_status,
this.gv_itemOutNo,
@@ -281,9 +292,11 @@
this.gv_remark,
this.gv_reason,
this.gridColumn1,
- this.gridColumn6});
+ this.gridColumn6,
+ 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;
@@ -291,237 +304,232 @@
//
// gv_status
//
- this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MinWidth = 25;
+ this.gv_status.MinWidth = 31;
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 = 0;
- this.gv_status.Width = 25;
+ this.gv_status.Width = 31;
//
// gv_itemOutNo
//
- this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
this.gv_itemOutNo.FieldName = "itemOutNo";
- this.gv_itemOutNo.MinWidth = 25;
+ this.gv_itemOutNo.MinWidth = 31;
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 = 1;
- this.gv_itemOutNo.Width = 150;
+ this.gv_itemOutNo.Width = 187;
//
// gv_workNo
//
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "鐢宠鍗曞彿";
this.gv_workNo.FieldName = "taskNo";
- this.gv_workNo.MinWidth = 25;
+ this.gv_workNo.MinWidth = 31;
this.gv_workNo.Name = "gv_workNo";
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
this.gv_workNo.VisibleIndex = 2;
- this.gv_workNo.Width = 100;
+ this.gv_workNo.Width = 125;
//
// gv_pbillNo
//
- this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
this.gv_pbillNo.Caption = "閿�鍞崟鍙�";
this.gv_pbillNo.FieldName = "workNo";
- this.gv_pbillNo.MinWidth = 25;
+ this.gv_pbillNo.MinWidth = 31;
this.gv_pbillNo.Name = "gv_pbillNo";
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
this.gv_pbillNo.VisibleIndex = 3;
- this.gv_pbillNo.Width = 94;
+ this.gv_pbillNo.Width = 117;
//
// gv_outDate
//
- this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_outDate.AppearanceCell.Options.UseFont = true;
this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 25;
+ this.gv_outDate.MinWidth = 31;
this.gv_outDate.Name = "gv_outDate";
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 4;
- this.gv_outDate.Width = 120;
+ this.gv_outDate.VisibleIndex = 5;
+ this.gv_outDate.Width = 150;
//
// gv_outType
//
- this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_outType.AppearanceCell.Options.UseFont = true;
this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
this.gv_outType.FieldName = "outType";
- this.gv_outType.MinWidth = 25;
+ this.gv_outType.MinWidth = 31;
this.gv_outType.Name = "gv_outType";
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 5;
- this.gv_outType.Width = 94;
+ this.gv_outType.VisibleIndex = 14;
+ this.gv_outType.Width = 117;
//
// gv_checkUser
//
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.MinWidth = 31;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 25;
+ this.gv_checkDate.MinWidth = 31;
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 = 7;
- this.gv_checkDate.Width = 120;
+ this.gv_checkDate.Width = 150;
//
// gv_receiver
//
- this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_receiver.AppearanceCell.Options.UseFont = true;
- this.gv_receiver.Caption = "鍑哄簱缂栧彿";
+ this.gv_receiver.Caption = "浠撳簱缂栧彿";
this.gv_receiver.FieldName = "ckNo";
- this.gv_receiver.MinWidth = 25;
+ this.gv_receiver.MinWidth = 31;
this.gv_receiver.Name = "gv_receiver";
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
this.gv_receiver.VisibleIndex = 8;
- this.gv_receiver.Width = 94;
+ this.gv_receiver.Width = 117;
//
// gv_outPart
//
- this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "鍑哄簱鍚嶇О";
+ this.gv_outPart.Caption = "浠撳簱鍚嶇О";
this.gv_outPart.FieldName = "ckName";
- this.gv_outPart.MinWidth = 25;
+ this.gv_outPart.MinWidth = 31;
this.gv_outPart.Name = "gv_outPart";
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
this.gv_outPart.VisibleIndex = 9;
- this.gv_outPart.Width = 94;
+ this.gv_outPart.Width = 117;
//
// gv_createBy
//
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 25;
+ this.gv_createBy.MinWidth = 31;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 10;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.Width = 117;
//
// gv_createDate
//
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.MinWidth = 31;
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 = 11;
- this.gv_createDate.Width = 94;
+ this.gv_createDate.Width = 117;
//
// gv_remark
//
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 25;
+ this.gv_remark.FieldName = "sqRemark";
+ this.gv_remark.MinWidth = 31;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 12;
- this.gv_remark.Width = 94;
+ this.gv_remark.Width = 117;
//
// gv_reason
//
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "瀹㈡埛鍚嶇О";
this.gv_reason.FieldName = "cusName";
- this.gv_reason.MinWidth = 25;
+ this.gv_reason.MinWidth = 31;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.reason";
this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 13;
- this.gv_reason.Width = 94;
+ this.gv_reason.VisibleIndex = 4;
+ this.gv_reason.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "瀹㈡埛缂栧彿";
this.gridColumn1.FieldName = "cusNo";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 13;
+ this.gridColumn1.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "閿�鍞粍缁�";
this.gridColumn6.FieldName = "xxzz";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 15;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婚敭Guid";
+ this.gridColumn7.FieldName = "guid";
+ this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.Name = "gridColumn7";
+ 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, 224);
- 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
@@ -529,6 +537,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
@@ -540,8 +549,9 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 161;
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 209;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -560,184 +570,200 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_checkUser);
- this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem17});
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(764, 426, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 161);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 209);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 140);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 188);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 28);
+ this.lbGuid.Size = new System.Drawing.Size(342, 39);
this.lbGuid.TabIndex = 591;
this.lbGuid.Text = "lbGuid";
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(636, 108);
+ this.txt_ckName.Location = new System.Drawing.Point(790, 125);
+ this.txt_ckName.Margin = new System.Windows.Forms.Padding(4);
this.txt_ckName.Name = "txt_ckName";
- this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(200, 28);
+ this.txt_ckName.Size = new System.Drawing.Size(259, 28);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 587;
//
// txt_cusNo
//
- this.txt_cusNo.Location = new System.Drawing.Point(360, 76);
+ this.txt_cusNo.Location = new System.Drawing.Point(443, 87);
+ this.txt_cusNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_cusNo.Name = "txt_cusNo";
- this.txt_cusNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_cusNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cusNo.Size = new System.Drawing.Size(200, 28);
+ this.txt_cusNo.Size = new System.Drawing.Size(259, 28);
this.txt_cusNo.StyleController = this.layoutMx1;
this.txt_cusNo.TabIndex = 589;
//
// txt_xxNo
//
- this.txt_xxNo.Location = new System.Drawing.Point(84, 108);
+ this.txt_xxNo.Location = new System.Drawing.Point(96, 125);
+ this.txt_xxNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_xxNo.Name = "txt_xxNo";
- this.txt_xxNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_xxNo.Properties.Appearance.Options.UseFont = true;
- this.txt_xxNo.Size = new System.Drawing.Size(200, 28);
+ this.txt_xxNo.Size = new System.Drawing.Size(259, 28);
this.txt_xxNo.StyleController = this.layoutMx1;
this.txt_xxNo.TabIndex = 585;
//
// txt_ckNo
//
- this.txt_ckNo.Location = new System.Drawing.Point(360, 108);
+ this.txt_ckNo.Location = new System.Drawing.Point(790, 87);
+ this.txt_ckNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_ckNo.Name = "txt_ckNo";
- this.txt_ckNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ckNo.Properties.Appearance.Options.UseFont = true;
- this.txt_ckNo.Size = new System.Drawing.Size(200, 28);
+ this.txt_ckNo.Size = new System.Drawing.Size(259, 28);
this.txt_ckNo.StyleController = this.layoutMx1;
this.txt_ckNo.TabIndex = 583;
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_itemOutNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemOutNo.Name = "txt_itemOutNo";
- this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(200, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(259, 28);
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 213;
//
// txt_xxzz
//
- this.txt_xxzz.Location = new System.Drawing.Point(360, 12);
+ this.txt_xxzz.Location = new System.Drawing.Point(443, 12);
+ this.txt_xxzz.Margin = new System.Windows.Forms.Padding(4);
this.txt_xxzz.Name = "txt_xxzz";
- this.txt_xxzz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_xxzz.Properties.Appearance.Options.UseFont = true;
- this.txt_xxzz.Size = new System.Drawing.Size(200, 28);
+ this.txt_xxzz.Size = new System.Drawing.Size(259, 28);
this.txt_xxzz.StyleController = this.layoutMx1;
this.txt_xxzz.TabIndex = 573;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(636, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(790, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(200, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(912, 12);
+ this.txt_abtNo.Location = new System.Drawing.Point(443, 125);
+ this.txt_abtNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_abtNo.Name = "txt_abtNo";
- this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(202, 28);
+ this.txt_abtNo.Size = new System.Drawing.Size(259, 28);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 387;
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(84, 44);
+ this.txt_outType.Location = new System.Drawing.Point(96, 49);
+ this.txt_outType.Margin = new System.Windows.Forms.Padding(4);
this.txt_outType.Name = "txt_outType";
- this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
- this.txt_outType.Size = new System.Drawing.Size(200, 28);
+ this.txt_outType.Size = new System.Drawing.Size(259, 28);
this.txt_outType.StyleController = this.layoutMx1;
this.txt_outType.TabIndex = 577;
//
// txt_cusName
//
- this.txt_cusName.Location = new System.Drawing.Point(360, 44);
+ this.txt_cusName.Location = new System.Drawing.Point(443, 49);
+ this.txt_cusName.Margin = new System.Windows.Forms.Padding(4);
this.txt_cusName.Name = "txt_cusName";
- this.txt_cusName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_cusName.Properties.Appearance.Options.UseFont = true;
- this.txt_cusName.Size = new System.Drawing.Size(200, 28);
+ this.txt_cusName.Size = new System.Drawing.Size(259, 28);
this.txt_cusName.StyleController = this.layoutMx1;
this.txt_cusName.TabIndex = 450;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(912, 76);
+ this.txt_checkDate.Location = new System.Drawing.Point(1137, 49);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(202, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(636, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(790, 49);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(200, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(259, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 44);
+ this.txt_checkUser.Location = new System.Drawing.Point(1137, 12);
+ this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(202, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(259, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
//
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(636, 76);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 243;
- //
// txt_kcOrg
//
- this.txt_kcOrg.Location = new System.Drawing.Point(84, 76);
+ this.txt_kcOrg.Location = new System.Drawing.Point(96, 87);
+ this.txt_kcOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_kcOrg.Name = "txt_kcOrg";
- this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_kcOrg.Size = new System.Drawing.Size(200, 28);
+ this.txt_kcOrg.Size = new System.Drawing.Size(259, 28);
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 216;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(840, 108);
+ this.txt_status.Location = new System.Drawing.Point(1053, 87);
+ 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(274, 24);
+ this.txt_status.Size = new System.Drawing.Size(343, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 590;
+ //
+ // txt_sqRemark
+ //
+ this.txt_sqRemark.Location = new System.Drawing.Point(96, 163);
+ this.txt_sqRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Size = new System.Drawing.Size(606, 28);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 592;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(828, 142);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
//
// Root
//
@@ -747,52 +773,51 @@
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem14,
+ this.layoutControlItem18,
this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem17});
+ this.layoutControlItem14,
+ this.layoutControlItem4,
+ this.layoutControlItem8,
+ this.layoutControlItem12,
+ this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.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[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition26.Height = 100D;
- rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition27.Height = 100D;
- rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition28.Height = 100D;
- rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition29.Height = 100D;
- rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition30.Height = 100D;
- rowDefinition30.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;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition26,
- rowDefinition27,
- rowDefinition28,
- rowDefinition29,
- rowDefinition30});
- this.Root.Size = new System.Drawing.Size(1126, 180);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1408, 209);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -800,189 +825,178 @@
this.layoutControlItem1.Control = this.txt_itemOutNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 37);
this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_xxzz;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 37);
this.layoutControlItem2.Text = "閿�鍞粍缁�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(694, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem3.Text = "鍒涘缓浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_abtNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem3.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_outType;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem5.Text = "鍑哄簱绫诲埆";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_cusName;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);
+ this.layoutControlItem6.Location = new System.Drawing.Point(347, 37);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem6.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);
+ this.layoutControlItem7.Location = new System.Drawing.Point(694, 37);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_checkUser;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 32);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem8.Text = "瀹℃牳浜�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_kcOrg;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 75);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(347, 38);
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_cusNo;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 64);
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 75);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem10.Text = "瀹㈡埛缂栧彿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem11.Text = "澶囨敞淇℃伅";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_checkDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_xxNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 113);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem13.Text = "閿�鍞崟鍙�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem14
+ // layoutControlItem18
//
- this.layoutControlItem14.Control = this.txt_ckNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 96);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.Control = this.txt_sqRemark;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 151);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(694, 38);
+ this.layoutControlItem18.Text = "澶囨敞鍘熷洜";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_ckName;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 96);
+ this.layoutControlItem15.Location = new System.Drawing.Point(694, 113);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_ckNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(694, 75);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_abtNo;
+ this.layoutControlItem4.Location = new System.Drawing.Point(347, 113);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem4.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_checkDate;
+ this.layoutControlItem12.Location = new System.Drawing.Point(1041, 37);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_status;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 96);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1041, 75);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(828, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem17.Text = "lbGuid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
//
// 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.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 397);
+ this.tabMx.Size = new System.Drawing.Size(1408, 474);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -991,23 +1005,27 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 436);
this.tabMxPage1.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, 365);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 436);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1workNo,
@@ -1020,6 +1038,7 @@
this.gvMx1remark,
this.gridColumn4,
this.gridColumn5});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1028,159 +1047,154 @@
//
// gvMx1guid
//
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
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;
//
// gvMx1workNo
//
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "鐢宠鍗曞彿";
this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 50;
+ this.gvMx1workNo.MinWidth = 62;
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.work_no";
this.gvMx1workNo.Visible = true;
this.gvMx1workNo.VisibleIndex = 0;
- this.gvMx1workNo.Width = 94;
+ this.gvMx1workNo.Width = 117;
//
// gvMx1itemNo
//
- this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1itemNo.FieldName = "itemNo";
- this.gvMx1itemNo.MinWidth = 50;
+ this.gvMx1itemNo.MinWidth = 62;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.item_no";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 1;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1itemNo.Width = 117;
//
// gvMx1itemId
//
- this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID ";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
+ this.gvMx1itemId.MinWidth = 62;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.item_id";
this.gvMx1itemId.Visible = true;
this.gvMx1itemId.VisibleIndex = 2;
- this.gvMx1itemId.Width = 94;
+ this.gvMx1itemId.Width = 117;
//
// gvMx1createBy
//
- this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
this.gvMx1createBy.FieldName = "itemName";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.MinWidth = 62;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.create_by";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 3;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 117;
//
// gvMx1createDate
//
- this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
this.gvMx1createDate.FieldName = "itemModel";
- this.gvMx1createDate.MinWidth = 50;
+ this.gvMx1createDate.MinWidth = 62;
this.gvMx1createDate.Name = "gvMx1createDate";
this.gvMx1createDate.Tag = "query_a.create_date";
this.gvMx1createDate.Visible = true;
this.gvMx1createDate.VisibleIndex = 4;
- this.gvMx1createDate.Width = 94;
+ this.gvMx1createDate.Width = 117;
//
// gvMx1quantity
//
- this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantitySq";
- 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 = 5;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gvMx1tlQty
//
- this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
this.gvMx1tlQty.FieldName = "tlQty";
- this.gvMx1tlQty.MinWidth = 50;
+ this.gvMx1tlQty.MinWidth = 62;
this.gvMx1tlQty.Name = "gvMx1tlQty";
this.gvMx1tlQty.Tag = "query_a.tl_qty";
this.gvMx1tlQty.Visible = true;
this.gvMx1tlQty.VisibleIndex = 6;
- this.gvMx1tlQty.Width = 94;
+ this.gvMx1tlQty.Width = 117;
//
// gvMx1remark
//
- this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
- this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 50;
+ this.gvMx1remark.FieldName = "sqRemark";
+ this.gvMx1remark.MinWidth = 62;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 7;
- this.gvMx1remark.Width = 94;
+ this.gvMx1remark.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鑰�";
this.gridColumn4.FieldName = "createBy";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 8;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鏃堕棿";
this.gridColumn5.FieldName = "createDate";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 9;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage2.Size = new System.Drawing.Size(1406, 436);
this.tabMxPage2.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, 365);
+ this.gcMx2.Size = new System.Drawing.Size(1406, 436);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2itemBarcode,
this.gvMx2itemNo,
@@ -1190,7 +1204,9 @@
this.gvMx2depotSectionCode,
this.gridColumn2,
this.gridColumn3,
- this.gvMx2remark});
+ this.gvMx2remark,
+ this.gridColumn8});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1199,121 +1215,125 @@
//
// gvMx2itemBarcode
//
- this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.MinWidth = 62;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 0;
- this.gvMx2itemBarcode.Width = 94;
+ this.gvMx2itemBarcode.Width = 117;
//
// gvMx2itemNo
//
- this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
+ this.gvMx2itemNo.MinWidth = 62;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 1;
- this.gvMx2itemNo.Width = 94;
+ this.gvMx2itemNo.Width = 117;
//
// gvMx2lotNo
//
- this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
this.gvMx2lotNo.FieldName = "itemName";
- this.gvMx2lotNo.MinWidth = 50;
+ this.gvMx2lotNo.MinWidth = 62;
this.gvMx2lotNo.Name = "gvMx2lotNo";
this.gvMx2lotNo.Tag = "query_a.LOT_NO";
this.gvMx2lotNo.Visible = true;
this.gvMx2lotNo.VisibleIndex = 2;
- this.gvMx2lotNo.Width = 94;
+ this.gvMx2lotNo.Width = 117;
//
// gvMx2quantity
//
- this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 50;
+ this.gvMx2quantity.MinWidth = 62;
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;
//
// gvMx2depotCode
//
- this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
this.gvMx2depotCode.FieldName = "depotCode";
- this.gvMx2depotCode.MinWidth = 50;
+ this.gvMx2depotCode.MinWidth = 62;
this.gvMx2depotCode.Name = "gvMx2depotCode";
this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx2depotCode.Visible = true;
this.gvMx2depotCode.VisibleIndex = 4;
- this.gvMx2depotCode.Width = 94;
+ this.gvMx2depotCode.Width = 117;
//
// gvMx2depotSectionCode
//
- this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
- this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
+ this.gvMx2depotSectionCode.Caption = "搴撲綅缂栫爜";
this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx2depotSectionCode.MinWidth = 50;
+ this.gvMx2depotSectionCode.MinWidth = 62;
this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx2depotSectionCode.Visible = true;
this.gvMx2depotSectionCode.VisibleIndex = 5;
- this.gvMx2depotSectionCode.Width = 94;
+ this.gvMx2depotSectionCode.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 6;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "寤虹珛鏃堕棿";
this.gridColumn3.FieldName = "createDate";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 7;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx2remark
//
- this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx2remark.AppearanceCell.Options.UseFont = true;
this.gvMx2remark.Caption = "澶囨敞 ";
this.gvMx2remark.FieldName = "remark";
- this.gvMx2remark.MinWidth = 50;
+ this.gvMx2remark.MinWidth = 62;
this.gvMx2remark.Name = "gvMx2remark";
this.gvMx2remark.Tag = "query_a.REMARK";
this.gvMx2remark.Visible = true;
this.gvMx2remark.VisibleIndex = 8;
- this.gvMx2remark.Width = 94;
+ this.gvMx2remark.Width = 117;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍚庣洊鐮�";
+ this.gridColumn8.FieldName = "hgBarcode";
+ this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.Width = 94;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(996, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1245, 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 = 9;
this.picCheckBox.TabStop = false;
@@ -1321,12 +1341,13 @@
//
// Frm_SalesDeliverDj
//
- 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_SalesDeliverDj";
this.Text = "閿�鍞嚭搴�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1361,27 +1382,27 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1430,7 +1451,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.TextEdit txt_cusNo;
private DevExpress.XtraEditors.TextEdit txt_ckName;
private DevExpress.XtraEditors.TextEdit txt_xxNo;
@@ -1439,22 +1459,15 @@
private DevExpress.XtraEditors.TextEdit txt_cusName;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_kcOrg;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1484,5 +1497,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
--
Gitblit v1.9.3