From 3c6cad1224e7cb985f03d15cc98a4a2074a5af49 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 22:25:33 +0800
Subject: [PATCH] 增加轮播看板
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 503 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 288 insertions(+), 215 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 4386cc3..1f86898 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,30 +30,30 @@
private void InitializeComponent()
{
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();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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 rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition25 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -86,6 +86,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_returnCustomer = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_salesDept = new Gs.DevApp.UserControl.UcLookDepartment();
@@ -99,16 +100,17 @@
this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
- this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_shUserName2 = new DevExpress.XtraEditors.TextEdit();
this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
- this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xgUserName1 = new DevExpress.XtraEditors.TextEdit();
this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fHasLinkSource = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_xsms = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -122,15 +124,19 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem100 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItem101 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -203,8 +209,6 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -230,16 +234,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -253,15 +258,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem100)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItem101)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -310,8 +319,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -323,6 +330,7 @@
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(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);
@@ -439,7 +447,7 @@
// gridColumn19
//
this.gridColumn19.Caption = "瀹岀粨鏍囪瘑";
- this.gridColumn19.FieldName = "wjStatus";
+ this.gridColumn19.FieldName = "txtColor";
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
@@ -466,7 +474,7 @@
this.gv_billType.OptionsColumn.AllowEdit = false;
this.gv_billType.Tag = "query_a.BILL_TYPE";
this.gv_billType.Visible = true;
- this.gv_billType.VisibleIndex = 17;
+ this.gv_billType.VisibleIndex = 14;
this.gv_billType.Width = 94;
//
// gv_billNo
@@ -492,7 +500,7 @@
this.gv_salesOrg.OptionsColumn.AllowEdit = false;
this.gv_salesOrg.Tag = "query_a.SALES_ORG";
this.gv_salesOrg.Visible = true;
- this.gv_salesOrg.VisibleIndex = 16;
+ this.gv_salesOrg.VisibleIndex = 13;
this.gv_salesOrg.Width = 94;
//
// gv_salesDept
@@ -505,7 +513,7 @@
this.gv_salesDept.OptionsColumn.AllowEdit = false;
this.gv_salesDept.Tag = "query_a.SALES_DEPT";
this.gv_salesDept.Visible = true;
- this.gv_salesDept.VisibleIndex = 6;
+ this.gv_salesDept.VisibleIndex = 5;
this.gv_salesDept.Width = 94;
//
// gv_salesPerson
@@ -529,20 +537,20 @@
this.gv_returnReason.OptionsColumn.AllowEdit = false;
this.gv_returnReason.Tag = "query_a.RETURN_REASON";
this.gv_returnReason.Visible = true;
- this.gv_returnReason.VisibleIndex = 7;
+ this.gv_returnReason.VisibleIndex = 6;
this.gv_returnReason.Width = 94;
//
// gv_createdBy
//
this.gv_createdBy.AppearanceCell.Options.UseFont = true;
this.gv_createdBy.Caption = "鍒涘缓浜� ";
- this.gv_createdBy.FieldName = "createdBy";
+ this.gv_createdBy.FieldName = "cjPeople";
this.gv_createdBy.MinWidth = 50;
this.gv_createdBy.Name = "gv_createdBy";
this.gv_createdBy.OptionsColumn.AllowEdit = false;
this.gv_createdBy.Tag = "query_a.CREATED_BY";
this.gv_createdBy.Visible = true;
- this.gv_createdBy.VisibleIndex = 8;
+ this.gv_createdBy.VisibleIndex = 7;
this.gv_createdBy.Width = 94;
//
// gv_createdDate
@@ -555,7 +563,7 @@
this.gv_createdDate.OptionsColumn.AllowEdit = false;
this.gv_createdDate.Tag = "query_a.CREATED_DATE";
this.gv_createdDate.Visible = true;
- this.gv_createdDate.VisibleIndex = 9;
+ this.gv_createdDate.VisibleIndex = 8;
this.gv_createdDate.Width = 94;
//
// gv_modifiedBy
@@ -567,8 +575,6 @@
this.gv_modifiedBy.Name = "gv_modifiedBy";
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
- this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 10;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -580,21 +586,19 @@
this.gv_modifiedDate.Name = "gv_modifiedDate";
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
- this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 11;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
//
this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
this.gv_approvedBy.Caption = "瀹℃牳浜� ";
- this.gv_approvedBy.FieldName = "approvedBy";
+ this.gv_approvedBy.FieldName = "shPeople";
this.gv_approvedBy.MinWidth = 50;
this.gv_approvedBy.Name = "gv_approvedBy";
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 12;
+ this.gv_approvedBy.VisibleIndex = 9;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -607,7 +611,7 @@
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 13;
+ this.gv_approvedDate.VisibleIndex = 10;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -629,8 +633,6 @@
this.gv_customerOrderNo.Name = "gv_customerOrderNo";
this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
- this.gv_customerOrderNo.Visible = true;
- this.gv_customerOrderNo.VisibleIndex = 5;
this.gv_customerOrderNo.Width = 94;
//
// gridColumn24
@@ -648,7 +650,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 14;
+ this.gridColumn25.VisibleIndex = 11;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -658,7 +660,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 15;
+ this.gridColumn26.VisibleIndex = 12;
this.gridColumn26.Width = 94;
//
// gridColumn2
@@ -668,7 +670,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 18;
+ this.gridColumn2.VisibleIndex = 15;
this.gridColumn2.Width = 94;
//
// pageBar1
@@ -708,11 +710,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1437, 570);
- this.splitMx1.SplitterPosition = 169;
+ this.splitMx1.SplitterPosition = 174;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.txt_returnCustomer);
this.layoutMx1.Controls.Add(this.txt_salesDept);
@@ -726,16 +729,17 @@
this.layoutMx1.Controls.Add(this.txt_billType);
this.layoutMx1.Controls.Add(this.txt_approvedDate);
this.layoutMx1.Controls.Add(this.txt_id);
- this.layoutMx1.Controls.Add(this.txt_approvedBy);
+ this.layoutMx1.Controls.Add(this.txt_shUserName2);
this.layoutMx1.Controls.Add(this.txt_modifiedDate);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_salerName);
- this.layoutMx1.Controls.Add(this.txt_modifiedBy);
+ this.layoutMx1.Controls.Add(this.txt_xgUserName1);
this.layoutMx1.Controls.Add(this.txt_saleDeptName);
this.layoutMx1.Controls.Add(this.txt_createdDate);
this.layoutMx1.Controls.Add(this.txt_returnReason);
this.layoutMx1.Controls.Add(this.txt_createdBy);
this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
+ this.layoutMx1.Controls.Add(this.txt_xsms);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19,
@@ -746,11 +750,21 @@
this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1437, 169);
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(1059, 140);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(2);
+ this.ucBtnPrintAll1.mxList = null;
+ this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+ this.ucBtnPrintAll1.rptType = null;
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(156, 21);
+ this.ucBtnPrintAll1.TabIndex = 546;
//
// btnSelect
//
@@ -766,6 +780,7 @@
//
this.txt_returnCustomer.IsReadly = false;
this.txt_returnCustomer.Location = new System.Drawing.Point(433, 44);
+ this.txt_returnCustomer.Margin = new System.Windows.Forms.Padding(4);
this.txt_returnCustomer.Name = "txt_returnCustomer";
this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
this.txt_returnCustomer.TabIndex = 539;
@@ -774,6 +789,7 @@
//
this.txt_salesDept.IsReadly = false;
this.txt_salesDept.Location = new System.Drawing.Point(1131, 108);
+ this.txt_salesDept.Margin = new System.Windows.Forms.Padding(4);
this.txt_salesDept.Name = "txt_salesDept";
this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
this.txt_salesDept.TabIndex = 538;
@@ -782,6 +798,7 @@
//
this.txt_inventoryOrg.IsReadly = false;
this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 108);
+ this.txt_inventoryOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
this.txt_inventoryOrg.TabIndex = 537;
@@ -790,6 +807,7 @@
//
this.txt_salesOrg.IsReadly = false;
this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
+ this.txt_salesOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_salesOrg.Name = "txt_salesOrg";
this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
this.txt_salesOrg.TabIndex = 535;
@@ -879,15 +897,15 @@
this.txt_id.TabIndex = 210;
this.txt_id.Tag = "readonly";
//
- // txt_approvedBy
+ // txt_shUserName2
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 12);
- this.txt_approvedBy.Name = "txt_approvedBy";
- this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(273, 24);
- this.txt_approvedBy.StyleController = this.layoutMx1;
- this.txt_approvedBy.TabIndex = 370;
- this.txt_approvedBy.Tag = "readonly";
+ this.txt_shUserName2.Location = new System.Drawing.Point(1131, 12);
+ this.txt_shUserName2.Name = "txt_shUserName2";
+ this.txt_shUserName2.Properties.Appearance.Options.UseFont = true;
+ this.txt_shUserName2.Size = new System.Drawing.Size(273, 24);
+ this.txt_shUserName2.StyleController = this.layoutMx1;
+ this.txt_shUserName2.TabIndex = 370;
+ this.txt_shUserName2.Tag = "readonly";
//
// txt_modifiedDate
//
@@ -919,15 +937,15 @@
this.txt_salerName.TabIndex = 267;
this.txt_salerName.Tag = "readonly";
//
- // txt_modifiedBy
+ // txt_xgUserName1
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 12);
- this.txt_modifiedBy.Name = "txt_modifiedBy";
- this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(273, 24);
- this.txt_modifiedBy.StyleController = this.layoutMx1;
- this.txt_modifiedBy.TabIndex = 327;
- this.txt_modifiedBy.Tag = "readonly";
+ this.txt_xgUserName1.Location = new System.Drawing.Point(782, 12);
+ this.txt_xgUserName1.Name = "txt_xgUserName1";
+ this.txt_xgUserName1.Properties.Appearance.Options.UseFont = true;
+ this.txt_xgUserName1.Size = new System.Drawing.Size(273, 24);
+ this.txt_xgUserName1.StyleController = this.layoutMx1;
+ this.txt_xgUserName1.TabIndex = 327;
+ this.txt_xgUserName1.Tag = "readonly";
//
// txt_saleDeptName
//
@@ -982,6 +1000,24 @@
this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
this.txt_fHasLinkSource.StyleController = this.layoutMx1;
this.txt_fHasLinkSource.TabIndex = 544;
+ //
+ // txt_xsms
+ //
+ this.txt_xsms.EditValue = "-璇烽�夋嫨-";
+ this.txt_xsms.Location = new System.Drawing.Point(782, 140);
+ this.txt_xsms.Name = "txt_xsms";
+ this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_xsms.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "1:ODM",
+ "2:OEM",
+ "3:OBM",
+ "4:渚涘簲鍟嗕拱鏂�"});
+ this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_xsms.Size = new System.Drawing.Size(273, 24);
+ this.txt_xsms.StyleController = this.layoutMx1;
+ this.txt_xsms.TabIndex = 545;
//
// layoutControlItem19
//
@@ -1060,9 +1096,7 @@
this.layoutControlItem17,
this.layoutControlItem20,
this.layItem1,
- this.layoutControlItem3,
this.layoutControlItem21,
- this.layoutControlItem9,
this.layoutControlItem7,
this.layoutControlItem10,
this.layItem2,
@@ -1070,38 +1104,42 @@
this.layItem4,
this.layItem100,
this.layoutControlItem13,
- this.layoutControlItem14});
+ this.layoutControlItem14,
+ this.layoutControlItem9,
+ this.layoutControlItem3,
+ this.layItem101,
+ this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition22.Height = 100D;
+ rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition23.Height = 100D;
+ rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition19,
+ rowDefinition20,
+ rowDefinition21,
+ rowDefinition22,
+ rowDefinition23});
this.Root.Size = new System.Drawing.Size(1416, 180);
this.Root.TextVisible = false;
//
@@ -1116,7 +1154,7 @@
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_approvedBy;
+ this.layoutControlItem15.Control = this.txt_shUserName2;
this.layoutControlItem15.Location = new System.Drawing.Point(1047, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1167,20 +1205,6 @@
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.btnSelect;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
- this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(349, 32);
- this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
// layoutControlItem21
//
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
@@ -1194,18 +1218,6 @@
this.layoutControlItem21.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(349, 64);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(349, 32);
- this.layoutControlItem9.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -1279,13 +1291,88 @@
this.layItem100.Text = "鏁版嵁鏉ユ簮";
this.layItem100.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_xgUserName1;
+ this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem13.Text = "淇敼浜哄憳";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_modifiedDate;
+ this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem14.Text = "淇敼鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_returnReason;
+ this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+ this.layoutControlItem9.Location = new System.Drawing.Point(349, 64);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.btnSelect;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
+ this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // layItem101
+ //
+ this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+ this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;
+ this.layItem101.Control = this.txt_xsms;
+ this.layItem101.Location = new System.Drawing.Point(698, 128);
+ this.layItem101.Name = "layItem101";
+ this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
+ this.layItem101.Size = new System.Drawing.Size(349, 32);
+ this.layItem101.Text = "閿�鍞ā寮�";
+ this.layItem101.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.ucBtnPrintAll1;
+ this.layoutControlItem2.Location = new System.Drawing.Point(1047, 128);
+ this.layoutControlItem2.MaxSize = new System.Drawing.Size(160, 25);
+ this.layoutControlItem2.MinSize = new System.Drawing.Size(81, 25);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem2.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem2.Text = "鎵撳嵃鎵�鏈夋槑缁�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem2.TextVisible = false;
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1437, 389);
+ this.tabMx.Size = new System.Drawing.Size(1437, 384);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1295,7 +1382,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1435, 357);
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1315,7 +1402,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1435, 357);
+ this.split99.Size = new System.Drawing.Size(1435, 352);
this.split99.SplitterPosition = 132;
this.split99.TabIndex = 4;
//
@@ -1382,17 +1469,17 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25.Width = 100D;
+ columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition26.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25,
+ columnDefinition26});
+ rowDefinition24.Height = 100D;
+ rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6});
+ rowDefinition24});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
this.layoutControlGroup2.TextVisible = false;
@@ -1424,7 +1511,7 @@
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(352, 37);
this.ucBtnPrint1.TabIndex = 230;
//
// radOut
@@ -1437,7 +1524,8 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.radOut.Size = new System.Drawing.Size(351, 37);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
@@ -1551,29 +1639,29 @@
this.layoutControlItem32});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition27.Width = 100D;
+ columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition28.Width = 100D;
+ columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition29.Width = 100D;
+ columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition30.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition27,
+ columnDefinition28,
+ columnDefinition29,
+ columnDefinition30});
+ rowDefinition25.Height = 100D;
+ rowDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition26.Height = 100D;
+ rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition27.Height = 100D;
+ rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
+ rowDefinition25,
+ rowDefinition26,
+ rowDefinition27});
this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1653,13 +1741,10 @@
//
this.layoutControlItem30.Control = this.radOut;
this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);
- this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
- this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);
- this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem30.Text = "鑷姩璁＄畻";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1668,14 +1753,11 @@
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);
- this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
- this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);
- this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1702,7 +1784,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1435, 213);
+ this.gcMx1.Size = new System.Drawing.Size(1435, 208);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1775,7 +1857,7 @@
this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
this.gvMx1materialSpecification.Visible = true;
- this.gvMx1materialSpecification.VisibleIndex = 8;
+ this.gvMx1materialSpecification.VisibleIndex = 9;
this.gvMx1materialSpecification.Width = 94;
//
// gridColumn20
@@ -1881,14 +1963,19 @@
//
// gvMx1isFree
//
+ this.gvMx1isFree.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
+ this.gvMx1isFree.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1isFree.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1isFree.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
this.gvMx1isFree.FieldName = "isFreeChk";
this.gvMx1isFree.MinWidth = 50;
this.gvMx1isFree.Name = "gvMx1isFree";
- this.gvMx1isFree.Tag = "query_a.IS_FREE";
+ this.gvMx1isFree.Tag = "edit";
+ this.gvMx1isFree.UnboundDataType = typeof(bool);
this.gvMx1isFree.Visible = true;
- this.gvMx1isFree.VisibleIndex = 9;
+ this.gvMx1isFree.VisibleIndex = 8;
this.gvMx1isFree.Width = 94;
//
// gvMx1returnType
@@ -1962,10 +2049,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1974,7 +2061,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1435, 357);
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -1983,7 +2070,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1435, 357);
+ this.gcMx2.Size = new System.Drawing.Size(1435, 352);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2160,27 +2247,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(349, 32);
- this.layoutControlItem13.Text = "淇敼浜哄憳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
- this.layoutControlItem14.Text = "淇敼鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_SalesReturnNotice
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2216,16 +2282,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -2239,15 +2306,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem100)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItem101)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2296,8 +2367,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -2334,9 +2403,9 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_approvedDate;
- private DevExpress.XtraEditors.TextEdit txt_approvedBy;
+ private DevExpress.XtraEditors.TextEdit txt_shUserName2;
private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
- private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
+ private DevExpress.XtraEditors.TextEdit txt_xgUserName1;
private DevExpress.XtraEditors.TextEdit txt_createdDate;
private DevExpress.XtraEditors.TextEdit txt_createdBy;
private DevExpress.XtraEditors.TextEdit txt_salerName;
@@ -2440,9 +2509,7 @@
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layItem2;
@@ -2453,5 +2520,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_xsms;
+ private DevExpress.XtraLayout.LayoutControlItem layItem101;
+ private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3