From 4832a219c8236646ec483790a781a021862b3c50 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 二月 2025 10:53:02 +0800
Subject: [PATCH] 销售通知申请
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 14
DevApp/Gs.DevApp/Gs.DevApp.csproj | 7
DevApp/Gs.DevApp/Properties/Resources.resx | 167 ++--
DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs | 295 ++++++---
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs | 1193 ++++++++++++++++++++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs | 10
DevApp/Gs.DevApp/Resources/properties_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/XtraForm1.resx | 3
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 5
10 files changed, 1,176 insertions(+), 528 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index c50c4a9..4a97a25 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -785,7 +785,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 112);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 191);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -794,7 +794,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 112);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 191);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2191,10 +2191,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 426);
+ this.tabMx.Location = new System.Drawing.Point(0, 347);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 144);
+ this.tabMx.Size = new System.Drawing.Size(1126, 223);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -2282,12 +2282,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 426);
+ this.panel1.Size = new System.Drawing.Size(1126, 347);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(61, 388);
+ this.labelControl11.Location = new System.Drawing.Point(1024, 52);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2297,7 +2297,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 388);
+ this.lbGuid.Location = new System.Drawing.Point(1075, 52);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
index f9fa77a..59b6838 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -28,397 +28,950 @@
/// </summary>
private void InitializeComponent()
{
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.components = new System.ComponentModel.Container();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_billTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_headDeliveryWay = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_headLocId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_custId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_saleDeptId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_salerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_changeReason = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_note = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_settleId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_approverId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_linkMan = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_chargeId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_linkPhone = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_creatorId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_modifierId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_modifyDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_approveDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_closerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_changeDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_cancellerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_receiveContact = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.splitContainerControl2 = new DevExpress.XtraEditors.SplitContainerControl();
- this.panLayHead = new System.Windows.Forms.Panel();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
- this.txt_isWc = new DevExpress.XtraEditors.CheckEdit();
- this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
- this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
- this.lb_shState = new DevExpress.XtraEditors.LabelControl();
- this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_shDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_shBy = new DevExpress.XtraEditors.TextEdit();
- this.panel3 = new System.Windows.Forms.Panel();
- this.panel4 = new System.Windows.Forms.Panel();
- this.panel5 = new System.Windows.Forms.Panel();
- this.panel6 = new System.Windows.Forms.Panel();
- this.label1 = new System.Windows.Forms.Label();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.panel1 = new System.Windows.Forms.Panel();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
+ this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
+ this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ this.dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
+ this.dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ this.splitContainerControl1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
this.splitContainerControl1.SuspendLayout();
- this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).BeginInit();
- this.splitContainerControl2.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).BeginInit();
- this.splitContainerControl2.Panel2.SuspendLayout();
- this.splitContainerControl2.SuspendLayout();
- this.panLayHead.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
- this.panel3.SuspendLayout();
- this.panel4.SuspendLayout();
- this.panel5.SuspendLayout();
- this.panel6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
+ this.dockPanel1.SuspendLayout();
+ this.dockPanel2.SuspendLayout();
this.SuspendLayout();
//
- // xtraTabControl1
+ // tabControl1
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1057, 660);
- this.xtraTabControl1.TabIndex = 0;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 0);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1057, 660);
+ this.tabControl1.TabIndex = 0;
//
- // xtraTabPage1
+ // tabPage1
//
- this.xtraTabPage1.Controls.Add(this.splitContainerControl1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1055, 628);
- this.xtraTabPage1.Text = "xtraTabPage1";
+ this.tabPage1.Controls.Add(this.gcMain);
+ this.tabPage1.Location = new System.Drawing.Point(4, 27);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(1049, 629);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "tabPage1";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(3, 3);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1043, 623);
+ this.gcMain.TabIndex = 5;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_id,
+ this.gv_erpId,
+ this.gv_billNo,
+ this.gv_billTypeId,
+ this.gv_documentStatus,
+ this.gv_fDate,
+ this.gv_businessType,
+ this.gv_headDeliveryWay,
+ this.gv_headLocId,
+ this.gv_custId,
+ this.gv_closeStatus,
+ this.gv_saleDeptId,
+ this.gv_salerId,
+ this.gv_changeReason,
+ this.gv_note,
+ this.gv_settleId,
+ this.gv_approverId,
+ this.gv_linkMan,
+ this.gv_chargeId,
+ this.gv_linkPhone,
+ this.gv_creatorId,
+ this.gv_createDate,
+ this.gv_modifierId,
+ this.gv_modifyDate,
+ this.gv_approveDate,
+ this.gv_closerId,
+ this.gv_closeDate,
+ this.gv_changeDate,
+ this.gv_cancelStatus,
+ this.gv_cancellerId,
+ this.gv_versionNo,
+ this.gv_changerId,
+ this.gv_entryNote,
+ this.gv_fbilltype,
+ this.gv_saleOrgId,
+ this.gv_receiveId,
+ this.gv_receiveContact});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_id
+ //
+ this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_id.AppearanceCell.Options.UseFont = true;
+ this.gv_id.Caption = "id ";
+ this.gv_id.FieldName = "id";
+ this.gv_id.MinWidth = 50;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.Tag = "query_a.id";
+ this.gv_id.Visible = true;
+ this.gv_id.VisibleIndex = 0;
+ this.gv_id.Width = 94;
+ //
+ // gv_erpId
+ //
+ this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_erpId.AppearanceCell.Options.UseFont = true;
+ this.gv_erpId.Caption = "erp_id ";
+ this.gv_erpId.FieldName = "erpId";
+ this.gv_erpId.MinWidth = 50;
+ this.gv_erpId.Name = "gv_erpId";
+ this.gv_erpId.OptionsColumn.AllowEdit = false;
+ this.gv_erpId.Tag = "query_a.erp_id";
+ this.gv_erpId.Visible = true;
+ this.gv_erpId.VisibleIndex = 1;
+ this.gv_erpId.Width = 94;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
+ this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.Tag = "query_a.bill_no";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.Width = 94;
+ //
+ // gv_billTypeId
+ //
+ this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
+ this.gv_billTypeId.Caption = "鍗曟嵁绫诲瀷 ";
+ this.gv_billTypeId.FieldName = "billTypeId";
+ this.gv_billTypeId.MinWidth = 50;
+ this.gv_billTypeId.Name = "gv_billTypeId";
+ this.gv_billTypeId.OptionsColumn.AllowEdit = false;
+ this.gv_billTypeId.Tag = "query_a.bill_type_id";
+ this.gv_billTypeId.Visible = true;
+ this.gv_billTypeId.VisibleIndex = 3;
+ this.gv_billTypeId.Width = 94;
+ //
+ // gv_documentStatus
+ //
+ this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_documentStatus.Caption = "鍗曟嵁鐘舵�� ";
+ this.gv_documentStatus.FieldName = "documentStatus";
+ this.gv_documentStatus.MinWidth = 50;
+ this.gv_documentStatus.Name = "gv_documentStatus";
+ this.gv_documentStatus.OptionsColumn.AllowEdit = false;
+ this.gv_documentStatus.Tag = "query_a.document_status";
+ this.gv_documentStatus.Visible = true;
+ this.gv_documentStatus.VisibleIndex = 4;
+ this.gv_documentStatus.Width = 94;
+ //
+ // gv_fDate
+ //
+ this.gv_fDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fDate.Caption = "鏃ユ湡 ";
+ this.gv_fDate.FieldName = "fDate";
+ this.gv_fDate.MinWidth = 50;
+ this.gv_fDate.Name = "gv_fDate";
+ this.gv_fDate.OptionsColumn.AllowEdit = false;
+ this.gv_fDate.Tag = "query_a.f_date";
+ this.gv_fDate.Visible = true;
+ this.gv_fDate.VisibleIndex = 5;
+ this.gv_fDate.Width = 94;
+ //
+ // gv_businessType
+ //
+ this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_businessType.AppearanceCell.Options.UseFont = true;
+ this.gv_businessType.Caption = "涓氬姟绫诲瀷 ";
+ this.gv_businessType.FieldName = "businessType";
+ this.gv_businessType.MinWidth = 50;
+ this.gv_businessType.Name = "gv_businessType";
+ this.gv_businessType.OptionsColumn.AllowEdit = false;
+ this.gv_businessType.Tag = "query_a.business_type";
+ this.gv_businessType.Visible = true;
+ this.gv_businessType.VisibleIndex = 6;
+ this.gv_businessType.Width = 94;
+ //
+ // gv_headDeliveryWay
+ //
+ this.gv_headDeliveryWay.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_headDeliveryWay.AppearanceCell.Options.UseFont = true;
+ this.gv_headDeliveryWay.Caption = "浜よ揣鏂瑰紡 ";
+ this.gv_headDeliveryWay.FieldName = "headDeliveryWay";
+ this.gv_headDeliveryWay.MinWidth = 50;
+ this.gv_headDeliveryWay.Name = "gv_headDeliveryWay";
+ this.gv_headDeliveryWay.OptionsColumn.AllowEdit = false;
+ this.gv_headDeliveryWay.Tag = "query_a.head_delivery_way";
+ this.gv_headDeliveryWay.Visible = true;
+ this.gv_headDeliveryWay.VisibleIndex = 7;
+ this.gv_headDeliveryWay.Width = 94;
+ //
+ // gv_headLocId
+ //
+ this.gv_headLocId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_headLocId.AppearanceCell.Options.UseFont = true;
+ this.gv_headLocId.Caption = "浜よ揣鍦扮偣 ";
+ this.gv_headLocId.FieldName = "headLocId";
+ this.gv_headLocId.MinWidth = 50;
+ this.gv_headLocId.Name = "gv_headLocId";
+ this.gv_headLocId.OptionsColumn.AllowEdit = false;
+ this.gv_headLocId.Tag = "query_a.head_loc_id";
+ this.gv_headLocId.Visible = true;
+ this.gv_headLocId.VisibleIndex = 8;
+ this.gv_headLocId.Width = 94;
+ //
+ // gv_custId
+ //
+ this.gv_custId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_custId.AppearanceCell.Options.UseFont = true;
+ this.gv_custId.Caption = "瀹㈡埛 ";
+ this.gv_custId.FieldName = "custId";
+ this.gv_custId.MinWidth = 50;
+ this.gv_custId.Name = "gv_custId";
+ this.gv_custId.OptionsColumn.AllowEdit = false;
+ this.gv_custId.Tag = "query_a.cust_id";
+ this.gv_custId.Visible = true;
+ this.gv_custId.VisibleIndex = 9;
+ this.gv_custId.Width = 94;
+ //
+ // gv_closeStatus
+ //
+ this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_closeStatus.Caption = "鍏抽棴鐘舵�� ";
+ this.gv_closeStatus.FieldName = "closeStatus";
+ this.gv_closeStatus.MinWidth = 50;
+ this.gv_closeStatus.Name = "gv_closeStatus";
+ this.gv_closeStatus.OptionsColumn.AllowEdit = false;
+ this.gv_closeStatus.Tag = "query_a.close_status";
+ this.gv_closeStatus.Visible = true;
+ this.gv_closeStatus.VisibleIndex = 10;
+ this.gv_closeStatus.Width = 94;
+ //
+ // gv_saleDeptId
+ //
+ this.gv_saleDeptId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_saleDeptId.AppearanceCell.Options.UseFont = true;
+ this.gv_saleDeptId.Caption = "閿�鍞儴闂� ";
+ this.gv_saleDeptId.FieldName = "saleDeptId";
+ this.gv_saleDeptId.MinWidth = 50;
+ this.gv_saleDeptId.Name = "gv_saleDeptId";
+ this.gv_saleDeptId.OptionsColumn.AllowEdit = false;
+ this.gv_saleDeptId.Tag = "query_a.sale_dept_id";
+ this.gv_saleDeptId.Visible = true;
+ this.gv_saleDeptId.VisibleIndex = 11;
+ this.gv_saleDeptId.Width = 94;
+ //
+ // gv_salerId
+ //
+ this.gv_salerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_salerId.AppearanceCell.Options.UseFont = true;
+ this.gv_salerId.Caption = "閿�鍞憳 ";
+ this.gv_salerId.FieldName = "salerId";
+ this.gv_salerId.MinWidth = 50;
+ this.gv_salerId.Name = "gv_salerId";
+ this.gv_salerId.OptionsColumn.AllowEdit = false;
+ this.gv_salerId.Tag = "query_a.saler_id";
+ this.gv_salerId.Visible = true;
+ this.gv_salerId.VisibleIndex = 12;
+ this.gv_salerId.Width = 94;
+ //
+ // gv_changeReason
+ //
+ this.gv_changeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_changeReason.AppearanceCell.Options.UseFont = true;
+ this.gv_changeReason.Caption = "鍙樻洿鍘熷洜 ";
+ this.gv_changeReason.FieldName = "changeReason";
+ this.gv_changeReason.MinWidth = 50;
+ this.gv_changeReason.Name = "gv_changeReason";
+ this.gv_changeReason.OptionsColumn.AllowEdit = false;
+ this.gv_changeReason.Tag = "query_a.change_reason";
+ this.gv_changeReason.Visible = true;
+ this.gv_changeReason.VisibleIndex = 13;
+ this.gv_changeReason.Width = 94;
+ //
+ // gv_note
+ //
+ this.gv_note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_note.AppearanceCell.Options.UseFont = true;
+ this.gv_note.Caption = "澶囨敞 ";
+ this.gv_note.FieldName = "note";
+ this.gv_note.MinWidth = 50;
+ this.gv_note.Name = "gv_note";
+ this.gv_note.OptionsColumn.AllowEdit = false;
+ this.gv_note.Tag = "query_a.note";
+ this.gv_note.Visible = true;
+ this.gv_note.VisibleIndex = 14;
+ this.gv_note.Width = 94;
+ //
+ // gv_settleId
+ //
+ this.gv_settleId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_settleId.AppearanceCell.Options.UseFont = true;
+ this.gv_settleId.Caption = "缁撶畻鏂� ";
+ this.gv_settleId.FieldName = "settleId";
+ this.gv_settleId.MinWidth = 50;
+ this.gv_settleId.Name = "gv_settleId";
+ this.gv_settleId.OptionsColumn.AllowEdit = false;
+ this.gv_settleId.Tag = "query_a.settle_id";
+ this.gv_settleId.Visible = true;
+ this.gv_settleId.VisibleIndex = 15;
+ this.gv_settleId.Width = 94;
+ //
+ // gv_approverId
+ //
+ this.gv_approverId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_approverId.AppearanceCell.Options.UseFont = true;
+ this.gv_approverId.Caption = "瀹℃牳浜� ";
+ this.gv_approverId.FieldName = "approverId";
+ this.gv_approverId.MinWidth = 50;
+ this.gv_approverId.Name = "gv_approverId";
+ this.gv_approverId.OptionsColumn.AllowEdit = false;
+ this.gv_approverId.Tag = "query_a.approver_id";
+ this.gv_approverId.Visible = true;
+ this.gv_approverId.VisibleIndex = 16;
+ this.gv_approverId.Width = 94;
+ //
+ // gv_linkMan
+ //
+ this.gv_linkMan.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_linkMan.AppearanceCell.Options.UseFont = true;
+ this.gv_linkMan.Caption = "鏀惰揣浜哄鍚� ";
+ this.gv_linkMan.FieldName = "linkMan";
+ this.gv_linkMan.MinWidth = 50;
+ this.gv_linkMan.Name = "gv_linkMan";
+ this.gv_linkMan.OptionsColumn.AllowEdit = false;
+ this.gv_linkMan.Tag = "query_a.link_man";
+ this.gv_linkMan.Visible = true;
+ this.gv_linkMan.VisibleIndex = 17;
+ this.gv_linkMan.Width = 94;
+ //
+ // gv_chargeId
+ //
+ this.gv_chargeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_chargeId.AppearanceCell.Options.UseFont = true;
+ this.gv_chargeId.Caption = "浠樻鏂� ";
+ this.gv_chargeId.FieldName = "chargeId";
+ this.gv_chargeId.MinWidth = 50;
+ this.gv_chargeId.Name = "gv_chargeId";
+ this.gv_chargeId.OptionsColumn.AllowEdit = false;
+ this.gv_chargeId.Tag = "query_a.charge_id";
+ this.gv_chargeId.Visible = true;
+ this.gv_chargeId.VisibleIndex = 18;
+ this.gv_chargeId.Width = 94;
+ //
+ // gv_linkPhone
+ //
+ this.gv_linkPhone.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_linkPhone.AppearanceCell.Options.UseFont = true;
+ this.gv_linkPhone.Caption = "鑱旂郴鐢佃瘽 ";
+ this.gv_linkPhone.FieldName = "linkPhone";
+ this.gv_linkPhone.MinWidth = 50;
+ this.gv_linkPhone.Name = "gv_linkPhone";
+ this.gv_linkPhone.OptionsColumn.AllowEdit = false;
+ this.gv_linkPhone.Tag = "query_a.link_phone";
+ this.gv_linkPhone.Visible = true;
+ this.gv_linkPhone.VisibleIndex = 19;
+ this.gv_linkPhone.Width = 94;
+ //
+ // gv_creatorId
+ //
+ this.gv_creatorId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_creatorId.AppearanceCell.Options.UseFont = true;
+ this.gv_creatorId.Caption = "鍒涘缓浜� ";
+ this.gv_creatorId.FieldName = "creatorId";
+ this.gv_creatorId.MinWidth = 50;
+ this.gv_creatorId.Name = "gv_creatorId";
+ this.gv_creatorId.OptionsColumn.AllowEdit = false;
+ this.gv_creatorId.Tag = "query_a.creator_id";
+ this.gv_creatorId.Visible = true;
+ this.gv_creatorId.VisibleIndex = 20;
+ this.gv_creatorId.Width = 94;
+ //
+ // 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 = 50;
+ 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 = 21;
+ this.gv_createDate.Width = 94;
+ //
+ // gv_modifierId
+ //
+ this.gv_modifierId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_modifierId.AppearanceCell.Options.UseFont = true;
+ this.gv_modifierId.Caption = "鏈�鍚庝慨鏀逛汉 ";
+ this.gv_modifierId.FieldName = "modifierId";
+ this.gv_modifierId.MinWidth = 50;
+ this.gv_modifierId.Name = "gv_modifierId";
+ this.gv_modifierId.OptionsColumn.AllowEdit = false;
+ this.gv_modifierId.Tag = "query_a.modifier_id";
+ this.gv_modifierId.Visible = true;
+ this.gv_modifierId.VisibleIndex = 22;
+ this.gv_modifierId.Width = 94;
+ //
+ // gv_modifyDate
+ //
+ this.gv_modifyDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_modifyDate.AppearanceCell.Options.UseFont = true;
+ this.gv_modifyDate.Caption = "鏈�鍚庝慨鏀规棩鏈� ";
+ this.gv_modifyDate.FieldName = "modifyDate";
+ this.gv_modifyDate.MinWidth = 50;
+ this.gv_modifyDate.Name = "gv_modifyDate";
+ this.gv_modifyDate.OptionsColumn.AllowEdit = false;
+ this.gv_modifyDate.Tag = "query_a.modify_date";
+ this.gv_modifyDate.Visible = true;
+ this.gv_modifyDate.VisibleIndex = 23;
+ this.gv_modifyDate.Width = 94;
+ //
+ // gv_approveDate
+ //
+ this.gv_approveDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_approveDate.AppearanceCell.Options.UseFont = true;
+ this.gv_approveDate.Caption = "瀹℃牳鏃ユ湡 ";
+ this.gv_approveDate.FieldName = "approveDate";
+ this.gv_approveDate.MinWidth = 50;
+ this.gv_approveDate.Name = "gv_approveDate";
+ this.gv_approveDate.OptionsColumn.AllowEdit = false;
+ this.gv_approveDate.Tag = "query_a.approve_date";
+ this.gv_approveDate.Visible = true;
+ this.gv_approveDate.VisibleIndex = 24;
+ this.gv_approveDate.Width = 94;
+ //
+ // gv_closerId
+ //
+ this.gv_closerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_closerId.AppearanceCell.Options.UseFont = true;
+ this.gv_closerId.Caption = "鍏抽棴浜� ";
+ this.gv_closerId.FieldName = "closerId";
+ this.gv_closerId.MinWidth = 50;
+ this.gv_closerId.Name = "gv_closerId";
+ this.gv_closerId.OptionsColumn.AllowEdit = false;
+ this.gv_closerId.Tag = "query_a.closer_id";
+ this.gv_closerId.Visible = true;
+ this.gv_closerId.VisibleIndex = 25;
+ this.gv_closerId.Width = 94;
+ //
+ // gv_closeDate
+ //
+ this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_closeDate.AppearanceCell.Options.UseFont = true;
+ this.gv_closeDate.Caption = "鍏抽棴鏃ユ湡 ";
+ this.gv_closeDate.FieldName = "closeDate";
+ this.gv_closeDate.MinWidth = 50;
+ this.gv_closeDate.Name = "gv_closeDate";
+ this.gv_closeDate.OptionsColumn.AllowEdit = false;
+ this.gv_closeDate.Tag = "query_a.close_date";
+ this.gv_closeDate.Visible = true;
+ this.gv_closeDate.VisibleIndex = 26;
+ this.gv_closeDate.Width = 94;
+ //
+ // gv_changeDate
+ //
+ this.gv_changeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_changeDate.AppearanceCell.Options.UseFont = true;
+ this.gv_changeDate.Caption = "鍙樻洿鏃ユ湡 ";
+ this.gv_changeDate.FieldName = "changeDate";
+ this.gv_changeDate.MinWidth = 50;
+ this.gv_changeDate.Name = "gv_changeDate";
+ this.gv_changeDate.OptionsColumn.AllowEdit = false;
+ this.gv_changeDate.Tag = "query_a.change_date";
+ this.gv_changeDate.Visible = true;
+ this.gv_changeDate.VisibleIndex = 27;
+ this.gv_changeDate.Width = 94;
+ //
+ // gv_cancelStatus
+ //
+ this.gv_cancelStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_cancelStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_cancelStatus.Caption = "浣滃簾鐘舵�� ";
+ this.gv_cancelStatus.FieldName = "cancelStatus";
+ this.gv_cancelStatus.MinWidth = 50;
+ this.gv_cancelStatus.Name = "gv_cancelStatus";
+ this.gv_cancelStatus.OptionsColumn.AllowEdit = false;
+ this.gv_cancelStatus.Tag = "query_a.cancel_status";
+ this.gv_cancelStatus.Visible = true;
+ this.gv_cancelStatus.VisibleIndex = 28;
+ this.gv_cancelStatus.Width = 94;
+ //
+ // gv_cancellerId
+ //
+ this.gv_cancellerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_cancellerId.AppearanceCell.Options.UseFont = true;
+ this.gv_cancellerId.Caption = "浣滃簾浜� ";
+ this.gv_cancellerId.FieldName = "cancellerId";
+ this.gv_cancellerId.MinWidth = 50;
+ this.gv_cancellerId.Name = "gv_cancellerId";
+ this.gv_cancellerId.OptionsColumn.AllowEdit = false;
+ this.gv_cancellerId.Tag = "query_a.canceller_id";
+ this.gv_cancellerId.Visible = true;
+ this.gv_cancellerId.VisibleIndex = 29;
+ this.gv_cancellerId.Width = 94;
+ //
+ // gv_versionNo
+ //
+ this.gv_versionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_versionNo.AppearanceCell.Options.UseFont = true;
+ this.gv_versionNo.Caption = "鐗堟湰鍙� ";
+ this.gv_versionNo.FieldName = "versionNo";
+ this.gv_versionNo.MinWidth = 50;
+ this.gv_versionNo.Name = "gv_versionNo";
+ this.gv_versionNo.OptionsColumn.AllowEdit = false;
+ this.gv_versionNo.Tag = "query_a.version_no";
+ this.gv_versionNo.Visible = true;
+ this.gv_versionNo.VisibleIndex = 30;
+ this.gv_versionNo.Width = 94;
+ //
+ // gv_changerId
+ //
+ this.gv_changerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_changerId.AppearanceCell.Options.UseFont = true;
+ this.gv_changerId.Caption = "鍙樻洿浜� ";
+ this.gv_changerId.FieldName = "changerId";
+ this.gv_changerId.MinWidth = 50;
+ this.gv_changerId.Name = "gv_changerId";
+ this.gv_changerId.OptionsColumn.AllowEdit = false;
+ this.gv_changerId.Tag = "query_a.changer_id";
+ this.gv_changerId.Visible = true;
+ this.gv_changerId.VisibleIndex = 31;
+ this.gv_changerId.Width = 94;
+ //
+ // gv_entryNote
+ //
+ this.gv_entryNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_entryNote.AppearanceCell.Options.UseFont = true;
+ this.gv_entryNote.Caption = "澶囨敞 ";
+ this.gv_entryNote.FieldName = "entryNote";
+ this.gv_entryNote.MinWidth = 50;
+ this.gv_entryNote.Name = "gv_entryNote";
+ this.gv_entryNote.OptionsColumn.AllowEdit = false;
+ this.gv_entryNote.Tag = "query_a.entry_note";
+ this.gv_entryNote.Visible = true;
+ this.gv_entryNote.VisibleIndex = 32;
+ this.gv_entryNote.Width = 94;
+ //
+ // gv_fbilltype
+ //
+ this.gv_fbilltype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fbilltype.AppearanceCell.Options.UseFont = true;
+ this.gv_fbilltype.Caption = "fbilltype ";
+ this.gv_fbilltype.FieldName = "fbilltype";
+ this.gv_fbilltype.MinWidth = 50;
+ this.gv_fbilltype.Name = "gv_fbilltype";
+ this.gv_fbilltype.OptionsColumn.AllowEdit = false;
+ this.gv_fbilltype.Tag = "query_a.fbilltype";
+ this.gv_fbilltype.Visible = true;
+ this.gv_fbilltype.VisibleIndex = 33;
+ this.gv_fbilltype.Width = 94;
+ //
+ // gv_saleOrgId
+ //
+ this.gv_saleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_saleOrgId.AppearanceCell.Options.UseFont = true;
+ this.gv_saleOrgId.Caption = "閿�鍞粍缁嘔D ";
+ this.gv_saleOrgId.FieldName = "saleOrgId";
+ this.gv_saleOrgId.MinWidth = 50;
+ this.gv_saleOrgId.Name = "gv_saleOrgId";
+ this.gv_saleOrgId.OptionsColumn.AllowEdit = false;
+ this.gv_saleOrgId.Tag = "query_a.SALE_ORG_ID";
+ this.gv_saleOrgId.Visible = true;
+ this.gv_saleOrgId.VisibleIndex = 34;
+ this.gv_saleOrgId.Width = 94;
+ //
+ // gv_receiveId
+ //
+ this.gv_receiveId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_receiveId.AppearanceCell.Options.UseFont = true;
+ this.gv_receiveId.Caption = "鏀惰揣鏂� ";
+ this.gv_receiveId.FieldName = "receiveId";
+ this.gv_receiveId.MinWidth = 50;
+ this.gv_receiveId.Name = "gv_receiveId";
+ this.gv_receiveId.OptionsColumn.AllowEdit = false;
+ this.gv_receiveId.Tag = "query_a.RECEIVE_ID";
+ this.gv_receiveId.Visible = true;
+ this.gv_receiveId.VisibleIndex = 35;
+ this.gv_receiveId.Width = 94;
+ //
+ // gv_receiveContact
+ //
+ this.gv_receiveContact.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_receiveContact.AppearanceCell.Options.UseFont = true;
+ this.gv_receiveContact.Caption = "鏀惰揣鏂硅仈绯讳汉 ";
+ this.gv_receiveContact.FieldName = "receiveContact";
+ this.gv_receiveContact.MinWidth = 50;
+ this.gv_receiveContact.Name = "gv_receiveContact";
+ this.gv_receiveContact.OptionsColumn.AllowEdit = false;
+ this.gv_receiveContact.Tag = "query_a.RECEIVE_CONTACT";
+ this.gv_receiveContact.Visible = true;
+ this.gv_receiveContact.VisibleIndex = 36;
+ this.gv_receiveContact.Width = 94;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.splitContainerControl1);
+ this.tabPage2.Location = new System.Drawing.Point(4, 27);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(1049, 629);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "tabPage2";
+ this.tabPage2.UseVisualStyleBackColor = true;
//
// splitContainerControl1
//
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Location = new System.Drawing.Point(3, 3);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
//
+ this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
+ this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
+ this.splitContainerControl1.Panel1.Controls.Add(this.labelControl2);
+ this.splitContainerControl1.Panel1.Controls.Add(this.panelControl2);
+ this.splitContainerControl1.Panel1.Controls.Add(this.panelControl1);
this.splitContainerControl1.Panel1.Text = "Panel1";
//
// splitContainerControl1.Panel2
//
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1055, 628);
- this.splitContainerControl1.SplitterPosition = 255;
- this.splitContainerControl1.TabIndex = 0;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1043, 623);
+ this.splitContainerControl1.SplitterPosition = 189;
+ this.splitContainerControl1.TabIndex = 1;
//
- // xtraTabPage2
+ // labelControl2
//
- this.xtraTabPage2.Controls.Add(this.splitContainerControl2);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1055, 628);
- this.xtraTabPage2.Text = "xtraTabPage2";
+ this.labelControl2.Location = new System.Drawing.Point(567, 42);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(81, 18);
+ this.labelControl2.TabIndex = 0;
+ this.labelControl2.Text = "labelControl2";
//
- // splitContainerControl2
+ // panelControl2
//
- this.splitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainerControl2.Horizontal = false;
- this.splitContainerControl2.Location = new System.Drawing.Point(0, 0);
- this.splitContainerControl2.Name = "splitContainerControl2";
+ this.panelControl2.Controls.Add(this.labelControl3);
+ this.panelControl2.Controls.Add(this.textEdit2);
+ this.panelControl2.Location = new System.Drawing.Point(189, 76);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(237, 39);
+ this.panelControl2.TabIndex = 1;
//
- // splitContainerControl2.Panel1
+ // labelControl3
//
- this.splitContainerControl2.Panel1.Controls.Add(this.panLayHead);
- this.splitContainerControl2.Panel1.Text = "Panel1";
- //
- // splitContainerControl2.Panel2
- //
- this.splitContainerControl2.Panel2.Controls.Add(this.label1);
- this.splitContainerControl2.Panel2.Controls.Add(this.panel6);
- this.splitContainerControl2.Panel2.Controls.Add(this.panel4);
- this.splitContainerControl2.Panel2.Controls.Add(this.panel5);
- this.splitContainerControl2.Panel2.Controls.Add(this.panel3);
- this.splitContainerControl2.Panel2.Text = "Panel2";
- this.splitContainerControl2.Size = new System.Drawing.Size(1055, 628);
- this.splitContainerControl2.SplitterPosition = 255;
- this.splitContainerControl2.TabIndex = 1;
- //
- // panLayHead
- //
- this.panLayHead.AutoScroll = true;
- this.panLayHead.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.panLayHead.Controls.Add(this.panel1);
- this.panLayHead.Controls.Add(this.panelControl1);
- this.panLayHead.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panLayHead.Location = new System.Drawing.Point(0, 0);
- this.panLayHead.Name = "panLayHead";
- this.panLayHead.Size = new System.Drawing.Size(1055, 255);
- this.panLayHead.TabIndex = 400;
- //
- // labelControl7
- //
- this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(3, 16);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(68, 21);
- this.labelControl7.TabIndex = 397;
- this.labelControl7.Text = "鐢宠鏃堕棿";
- //
- // textEdit1
- //
- this.textEdit1.Enabled = false;
- this.textEdit1.Location = new System.Drawing.Point(75, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.textEdit1.Properties.Appearance.Options.UseFont = true;
- this.textEdit1.Size = new System.Drawing.Size(166, 28);
- this.textEdit1.TabIndex = 398;
- //
- // labelControl8
- //
- this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl8.Appearance.Options.UseFont = true;
- this.labelControl8.Location = new System.Drawing.Point(5, 32);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(51, 21);
- this.labelControl8.TabIndex = 395;
- this.labelControl8.Text = "鐢宠浜�";
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(4, 5);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(73, 21);
+ this.labelControl3.TabIndex = 217;
+ this.labelControl3.Text = "鍗曟嵁绫诲瀷 ";
//
// textEdit2
//
- this.textEdit2.Enabled = false;
- this.textEdit2.Location = new System.Drawing.Point(60, 28);
+ this.textEdit2.Location = new System.Drawing.Point(78, 5);
this.textEdit2.Name = "textEdit2";
this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.textEdit2.Properties.Appearance.Options.UseFont = true;
- this.textEdit2.Size = new System.Drawing.Size(166, 28);
- this.textEdit2.TabIndex = 396;
- //
- // txt_isWc
- //
- this.txt_isWc.Enabled = false;
- this.txt_isWc.Location = new System.Drawing.Point(188, 38);
- this.txt_isWc.Name = "txt_isWc";
- this.txt_isWc.Properties.Caption = "";
- this.txt_isWc.Size = new System.Drawing.Size(39, 24);
- this.txt_isWc.TabIndex = 394;
- //
- // txt_shState
- //
- this.txt_shState.Enabled = false;
- this.txt_shState.Location = new System.Drawing.Point(74, 38);
- this.txt_shState.Name = "txt_shState";
- this.txt_shState.Properties.Caption = "";
- this.txt_shState.Size = new System.Drawing.Size(29, 24);
- this.txt_shState.TabIndex = 393;
- //
- // lb_isWc
- //
- this.lb_isWc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isWc.Appearance.Options.UseFont = true;
- this.lb_isWc.Location = new System.Drawing.Point(112, 40);
- this.lb_isWc.Name = "lb_isWc";
- this.lb_isWc.Size = new System.Drawing.Size(73, 21);
- this.lb_isWc.TabIndex = 392;
- this.lb_isWc.Text = "瀹岀粨鏍囪瘑 ";
- //
- // lb_shState
- //
- this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_shState.Appearance.Options.UseFont = true;
- this.lb_shState.Location = new System.Drawing.Point(2, 40);
- this.lb_shState.Name = "lb_shState";
- this.lb_shState.Size = new System.Drawing.Size(68, 21);
- this.lb_shState.TabIndex = 391;
- this.lb_shState.Text = "瀹℃牳鐘舵��";
- //
- // lb_shDate
- //
- this.lb_shDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_shDate.Appearance.Options.UseFont = true;
- this.lb_shDate.Location = new System.Drawing.Point(3, 20);
- this.lb_shDate.Name = "lb_shDate";
- this.lb_shDate.Size = new System.Drawing.Size(68, 21);
- this.lb_shDate.TabIndex = 389;
- this.lb_shDate.Text = "瀹℃牳鏃堕棿";
- //
- // txt_shDate
- //
- this.txt_shDate.Enabled = false;
- this.txt_shDate.Location = new System.Drawing.Point(75, 16);
- this.txt_shDate.Name = "txt_shDate";
- this.txt_shDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_shDate.Properties.Appearance.Options.UseFont = true;
- this.txt_shDate.Size = new System.Drawing.Size(166, 28);
- this.txt_shDate.TabIndex = 390;
- //
- // lb_shBy
- //
- this.lb_shBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_shBy.Appearance.Options.UseFont = true;
- this.lb_shBy.Location = new System.Drawing.Point(3, 15);
- this.lb_shBy.Name = "lb_shBy";
- this.lb_shBy.Size = new System.Drawing.Size(51, 21);
- this.lb_shBy.TabIndex = 387;
- this.lb_shBy.Text = "瀹℃牳浜�";
- //
- // txt_shBy
- //
- this.txt_shBy.Enabled = false;
- this.txt_shBy.Location = new System.Drawing.Point(58, 11);
- this.txt_shBy.Name = "txt_shBy";
- this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_shBy.Properties.Appearance.Options.UseFont = true;
- this.txt_shBy.Size = new System.Drawing.Size(166, 28);
- this.txt_shBy.TabIndex = 388;
- //
- // panel3
- //
- this.panel3.Controls.Add(this.labelControl7);
- this.panel3.Controls.Add(this.textEdit1);
- this.panel3.Location = new System.Drawing.Point(118, 45);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(256, 53);
- this.panel3.TabIndex = 400;
- //
- // panel4
- //
- this.panel4.Controls.Add(this.lb_shBy);
- this.panel4.Controls.Add(this.txt_shBy);
- this.panel4.Location = new System.Drawing.Point(748, 118);
- this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(237, 46);
- this.panel4.TabIndex = 401;
- //
- // panel5
- //
- this.panel5.Controls.Add(this.lb_shDate);
- this.panel5.Controls.Add(this.txt_shDate);
- this.panel5.Location = new System.Drawing.Point(453, 99);
- this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(267, 58);
- this.panel5.TabIndex = 402;
- //
- // panel6
- //
- this.panel6.Controls.Add(this.lb_isWc);
- this.panel6.Controls.Add(this.txt_shState);
- this.panel6.Controls.Add(this.lb_shState);
- this.panel6.Controls.Add(this.txt_isWc);
- this.panel6.Location = new System.Drawing.Point(116, 132);
- this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(240, 70);
- this.panel6.TabIndex = 403;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(383, 160);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(44, 18);
- this.label1.TabIndex = 404;
- this.label1.Text = "label1";
+ this.textEdit2.Size = new System.Drawing.Size(155, 28);
+ this.textEdit2.TabIndex = 218;
//
// panelControl1
//
- this.panelControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
- this.panelControl1.Appearance.BorderColor = System.Drawing.Color.Red;
- this.panelControl1.Appearance.Options.UseBackColor = true;
- this.panelControl1.Appearance.Options.UseBorderColor = true;
- this.panelControl1.Controls.Add(this.textEdit2);
- this.panelControl1.Controls.Add(this.labelControl8);
- this.panelControl1.Location = new System.Drawing.Point(384, 50);
+ this.panelControl1.Controls.Add(this.labelControl1);
+ this.panelControl1.Controls.Add(this.textEdit1);
+ this.panelControl1.Location = new System.Drawing.Point(189, 31);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(283, 186);
- this.panelControl1.TabIndex = 400;
+ this.panelControl1.Size = new System.Drawing.Size(237, 39);
+ this.panelControl1.TabIndex = 0;
//
- // panel1
+ // labelControl1
//
- this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel1.Location = new System.Drawing.Point(83, 62);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(200, 100);
- this.panel1.TabIndex = 401;
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(4, 8);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(68, 21);
+ this.labelControl1.TabIndex = 214;
+ this.labelControl1.Text = "鍗曟嵁缂栧彿";
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(78, 5);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.textEdit1.Properties.Appearance.Options.UseFont = true;
+ this.textEdit1.Size = new System.Drawing.Size(155, 28);
+ this.textEdit1.TabIndex = 215;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Location = new System.Drawing.Point(4, 27);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage3.Size = new System.Drawing.Size(1049, 629);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "tabPage3";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // dockManager1
+ //
+ this.dockManager1.Form = this;
+ this.dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
+ this.dockPanel1});
+ this.dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
+ this.dockPanel2});
+ this.dockManager1.TopZIndexControls.AddRange(new string[] {
+ "DevExpress.XtraBars.BarDockControl",
+ "DevExpress.XtraBars.StandaloneBarDockControl",
+ "System.Windows.Forms.MenuStrip",
+ "System.Windows.Forms.StatusStrip",
+ "System.Windows.Forms.StatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonStatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonControl",
+ "DevExpress.XtraBars.Navigation.OfficeNavigationBar",
+ "DevExpress.XtraBars.Navigation.TileNavPane",
+ "DevExpress.XtraBars.TabFormControl",
+ "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
+ "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
+ //
+ // dockPanel1
+ //
+ this.dockPanel1.Appearance.BorderColor = System.Drawing.Color.Black;
+ this.dockPanel1.Appearance.Options.UseBorderColor = true;
+ this.dockPanel1.Controls.Add(this.dockPanel1_Container);
+ this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
+ this.dockPanel1.FloatLocation = new System.Drawing.Point(1668, 111);
+ this.dockPanel1.FloatSize = new System.Drawing.Size(200, 327);
+ this.dockPanel1.ID = new System.Guid("726e2754-293f-4051-82ef-5a55b66fff3b");
+ this.dockPanel1.Location = new System.Drawing.Point(-32768, -32768);
+ this.dockPanel1.Name = "dockPanel1";
+ this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
+ this.dockPanel1.SavedIndex = 0;
+ this.dockPanel1.Size = new System.Drawing.Size(200, 327);
+ this.dockPanel1.Text = "dockPanel1";
+ this.dockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ //
+ // dockPanel1_Container
+ //
+ this.dockPanel1_Container.Location = new System.Drawing.Point(5, 32);
+ this.dockPanel1_Container.Name = "dockPanel1_Container";
+ this.dockPanel1_Container.Size = new System.Drawing.Size(190, 291);
+ this.dockPanel1_Container.TabIndex = 0;
+ //
+ // dockPanel2
+ //
+ this.dockPanel2.Controls.Add(this.dockPanel2_Container);
+ this.dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
+ this.dockPanel2.FloatLocation = new System.Drawing.Point(576, 403);
+ this.dockPanel2.ID = new System.Guid("40a1e9c8-dcf0-4757-93cc-fd8ff633d140");
+ this.dockPanel2.Location = new System.Drawing.Point(0, 0);
+ this.dockPanel2.Name = "dockPanel2";
+ this.dockPanel2.OriginalSize = new System.Drawing.Size(200, 200);
+ this.dockPanel2.Size = new System.Drawing.Size(200, 200);
+ this.dockPanel2.Text = "dockPanel2";
+ //
+ // dockPanel2_Container
+ //
+ this.dockPanel2_Container.Location = new System.Drawing.Point(5, 32);
+ this.dockPanel2_Container.Name = "dockPanel2_Container";
+ this.dockPanel2_Container.Size = new System.Drawing.Size(190, 164);
+ this.dockPanel2_Container.TabIndex = 0;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1057, 660);
- this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.tabControl1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.tabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ this.splitContainerControl1.Panel1.ResumeLayout(false);
+ this.splitContainerControl1.Panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
this.splitContainerControl1.ResumeLayout(false);
- this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).EndInit();
- this.splitContainerControl2.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).EndInit();
- this.splitContainerControl2.Panel2.ResumeLayout(false);
- this.splitContainerControl2.Panel2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).EndInit();
- this.splitContainerControl2.ResumeLayout(false);
- this.panLayHead.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ this.panelControl2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
- this.panel3.ResumeLayout(false);
- this.panel3.PerformLayout();
- this.panel4.ResumeLayout(false);
- this.panel4.PerformLayout();
- this.panel5.ResumeLayout(false);
- this.panel5.PerformLayout();
- this.panel6.ResumeLayout(false);
- this.panel6.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.panelControl1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
+ this.dockPanel1.ResumeLayout(false);
+ this.dockPanel2.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.TabPage tabPage3;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billTypeId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_headDeliveryWay;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_headLocId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_custId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_saleDeptId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_salerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_changeReason;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_note;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_settleId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_approverId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_linkMan;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_chargeId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_linkPhone;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_creatorId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_modifierId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_modifyDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_approveDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_closerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrgId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_receiveId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_receiveContact;
private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
- private DevExpress.XtraEditors.SplitContainerControl splitContainerControl2;
- private DevExpress.XtraEditors.LabelControl labelControl7;
- private DevExpress.XtraEditors.TextEdit textEdit1;
- private DevExpress.XtraEditors.LabelControl labelControl8;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.TextEdit textEdit2;
- private DevExpress.XtraEditors.CheckEdit txt_isWc;
- private DevExpress.XtraEditors.CheckEdit txt_shState;
- private DevExpress.XtraEditors.LabelControl lb_isWc;
- private DevExpress.XtraEditors.LabelControl lb_shState;
- private DevExpress.XtraEditors.LabelControl lb_shDate;
- private DevExpress.XtraEditors.TextEdit txt_shDate;
- private DevExpress.XtraEditors.LabelControl lb_shBy;
- private DevExpress.XtraEditors.TextEdit txt_shBy;
- private System.Windows.Forms.Panel panLayHead;
- private System.Windows.Forms.Panel panel5;
- private System.Windows.Forms.Panel panel4;
- private System.Windows.Forms.Panel panel3;
- private System.Windows.Forms.Panel panel6;
- private System.Windows.Forms.Label label1;
private DevExpress.XtraEditors.PanelControl panelControl1;
- private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraBars.Docking.DockManager dockManager1;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanel2;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel2_Container;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
index 0ecbda3..ddd3a07 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -1,4 +1,6 @@
锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Model;
+using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -13,11 +15,17 @@
{
public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
{
+ private Gs.DevApp.ToolBox.DragResizeHelp _drapHelp;
public XtraForm1()
{
InitializeComponent();
- Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, panLayHead, label1);
+ // this.xtraTabControl1.CustomHeaderButtonClick += new DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventHandler(this.xtraTabControl1_CustomHeaderButtonClick);
+ _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1, labelControl2);
+ }
+ private void xtraTabControl1_CustomHeaderButtonClick(object sender, DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventArgs e)
+ {
+ _drapHelp.Show();
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
index 1af7de1..8eb0253 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1a0822f..42cd4e9 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -382,6 +382,12 @@
<Compile Include="DevFrm\Sales\Frm_SalesOrder.Designer.cs">
<DependentUpon>Frm_SalesOrder.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesOrder111.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesOrder111.Designer.cs">
+ <DependentUpon>Frm_SalesOrder111.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Warehouse\Frm_MesDbck.cs">
<SubType>Form</SubType>
</Compile>
@@ -1518,6 +1524,7 @@
<None Include="Resources\alignverticalleft.svg" />
<None Include="Resources\lookup&reference_16x162.png" />
<None Include="Resources\checkbox2_16x162.png" />
+ <None Include="Resources\properties_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 7f284de..753cf27 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1353,6 +1353,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap properties_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("properties_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap publicfix_16x16 {
get {
object obj = ResourceManager.GetObject("publicfix_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 6ba502d..408b6cc 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -121,10 +121,8 @@
<data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
@@ -137,8 +135,8 @@
<data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+ <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -147,16 +145,6 @@
</data>
<data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -224,6 +212,9 @@
<data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -253,9 +244,6 @@
<value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
@@ -295,13 +283,11 @@
<value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -311,21 +297,11 @@
<data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -333,10 +309,8 @@
<data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -370,8 +344,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fill_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fill_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -446,6 +422,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -490,11 +471,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -526,8 +502,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -554,6 +530,9 @@
</data>
<data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="checkbox2_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
@@ -602,6 +581,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -642,11 +626,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -658,8 +637,16 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -731,8 +718,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
@@ -741,6 +730,11 @@
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -754,8 +748,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -779,8 +775,10 @@
<value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -792,22 +790,27 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
+ <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -836,13 +839,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -863,13 +866,15 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
+ <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lookup&reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -877,25 +882,23 @@
<data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="properties_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\properties_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/properties_16x16.png b/DevApp/Gs.DevApp/Resources/properties_16x16.png
new file mode 100644
index 0000000..f598bcf
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/properties_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
index 0206e17..3e9f1f1 100644
--- a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
+++ b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraCharts;
-using System;
+锘縰sing System;
using System.Drawing;
using System.Windows.Forms;
@@ -8,18 +7,21 @@
public class DragResizeHelp
{
#region Field
- private static bool isDragging = false;
+ private bool isDragging = false;
private const int Band = 5;
- private const int MinWidth = 10;
- private const int MinHeight = 10;
- private static EnumMousePointPosition m_MousePointPosition;
- private static Point p, p1;
- private static Label sbMsg;
- private static Control dragBox1;
- private static string dragCurrent_Name = "";
- private static DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
- #endregion
+ private const int MinWidth = 50;
+ private const int MinHeight = 30;
+ private EnumMousePointPosition m_MousePointPosition;
+ private Point p, p1;
+ private DevExpress.XtraEditors.LabelControl sbMsg;
+ private Control dragBox1;//瀹瑰櫒1
+ private string dragCurrent_Name = "";//褰撳墠瀹瑰櫒鐨勫悕绉�
+ private DevExpress.XtraBars.Docking.DockManager dockManager1;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
+ private System.ComponentModel.IContainer components = null;
+ #endregion
#region Inner Object
private enum EnumMousePointPosition
{
@@ -35,88 +37,113 @@
MouseDrag = 9 // '榧犳爣鎷栧姩
}
#endregion
-
- #region Constructor
- public DragResizeHelp()
+ public DragResizeHelp(DevExpress.XtraEditors.XtraForm frm, Control regBox, DevExpress.XtraEditors.LabelControl regMsg)
{
- // Nothing to do.
- }
- #endregion
- private static void InitializeComponent(DevExpress.XtraEditors.XtraForm frm)
- {
- DevExpress.XtraBars.Docking.DockManager dockManager1;
- DevExpress.XtraBars.Docking.DockPanel dragBox2_Container;
- dockManager1 = new DevExpress.XtraBars.Docking.DockManager();
- dragBox2_Container = new DevExpress.XtraBars.Docking.DockPanel();
- dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- ((System.ComponentModel.ISupportInitialize)(dockManager1)).BeginInit();
+ this.components = new System.ComponentModel.Container();
+ dragBox1 = regBox;
+ sbMsg = regMsg;
+ this.components = new System.ComponentModel.Container();
+ this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
+ dockManager1.BeginUpdate();
+ this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
+ this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
+ this.dockPanel1.SuspendLayout();
+ frm.SuspendLayout();
//
// dockManager1
//
- dockManager1.Form = frm;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
- dragBox2_Container});
+ this.dockManager1.Form = frm;
+ this.dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
+ this.dockPanel1});
+ this.dockManager1.TopZIndexControls.AddRange(new string[] {
+ "DevExpress.XtraBars.BarDockControl",
+ "DevExpress.XtraBars.StandaloneBarDockControl",
+ "System.Windows.Forms.MenuStrip",
+ "System.Windows.Forms.StatusStrip",
+ "System.Windows.Forms.StatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonStatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonControl",
+ "DevExpress.XtraBars.Navigation.OfficeNavigationBar",
+ "DevExpress.XtraBars.Navigation.TileNavPane",
+ "DevExpress.XtraBars.TabFormControl",
+ "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
+ "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
//
// dockPanel1
//
- dragBox2_Container.Controls.Add(dockPanel1_Container);
- dragBox2_Container.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
- dragBox2_Container.FloatLocation = new System.Drawing.Point(691, 455);
- dragBox2_Container.ID = new System.Guid("319a7cf1-f26d-4049-8a96-8f9fbbd13cd2");
- dragBox2_Container.Location = new System.Drawing.Point(0, 0);
- dragBox2_Container.Name = "dockPanel1";
- dragBox2_Container.OriginalSize = new System.Drawing.Size(200, 200);
- dragBox2_Container.Size = new System.Drawing.Size(200, 200);
- dragBox2_Container.Text = "dockPanel1";
- dragBox2_Container.Options.AllowDockBottom = false;
- dragBox2_Container.Options.AllowDockFill = false;
- dragBox2_Container.Options.AllowDockLeft = false;
- dragBox2_Container.Options.AllowDockRight = false;
- dragBox2_Container.Options.AllowDockTop = false;
- dragBox2_Container.Options.ShowMaximizeButton = false;
- dragBox2_Container.Options.ShowMaximizeButton = false;
+ this.dockPanel1.Controls.Add(this.dockPanel1_Container);
+ this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
+ this.dockPanel1.FloatLocation = new System.Drawing.Point(1617, 547);
+ this.dockPanel1.FloatSize = new System.Drawing.Size(306, 459);
+ this.dockPanel1.ID = new System.Guid("7148938b-5fd8-4833-9a9f-445a728a11cf");
+ this.dockPanel1.Location = new System.Drawing.Point(0, 0);
+ this.dockPanel1.Name = "dockPanel1";
+ this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
+ this.dockPanel1.Size = new System.Drawing.Size(306, 459);
+ this.dockPanel1.Text = "dockPanel1";
+ dockPanel1.Options.AllowDockBottom = false;
+ dockPanel1.Options.AllowDockFill = false;
+ dockPanel1.Options.AllowDockLeft = false;
+ dockPanel1.Options.AllowDockRight = false;
+ dockPanel1.Options.AllowDockTop = false;
+ dockPanel1.Options.ShowMaximizeButton = false;
+ dockPanel1.Options.ShowMaximizeButton = false;
//
// dockPanel1_Container
//
- dockPanel1_Container.Location = new System.Drawing.Point(5, 32);
- dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new System.Drawing.Size(190, 164);
- dockPanel1_Container.TabIndex = 0;
+ this.dockPanel1_Container.Location = new System.Drawing.Point(5, 32);
+ this.dockPanel1_Container.Name = "dockPanel1_Container";
+ this.dockPanel1_Container.Size = new System.Drawing.Size(296, 423);
+ this.dockPanel1_Container.TabIndex = 0;
+ this.dockPanel1_Container.BorderStyle = System.Windows.Forms.BorderStyle.None;
//
- // XtraForm3
+ // XtraForm1
//
- ((System.ComponentModel.ISupportInitialize)(dockManager1)).EndInit();
- dragBox2_Container.ResumeLayout(false);
+ frm.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ frm.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ frm.ClientSize = new System.Drawing.Size(1057, 660);
+
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
+ this.dockPanel1.ResumeLayout(false);
frm.ResumeLayout(false);
- dragBox2_Container.Show();
+ dockManager1.EndUpdate();
+
+ this.dockPanel1.Hide();
+
+ dockPanel1.ClosedPanel += (s, e) =>
+ {
+ foreach (Control control in dragBox1.Controls)
+ {
+ if (control != null)
+ {
+
+ control.MouseDown -= new MouseEventHandler(control_MouseDown);
+ control.MouseLeave -= new EventHandler(control_MouseLeave);
+ control.MouseMove -= new MouseEventHandler(control_MouseMove);
+ control.MouseUp -= Control_MouseUp;
+ control.Resize -= myPanel_Resize;
+ }
+ }
+ };
}
- #region Public Method
- public static void RegisterControl(DevExpress.XtraEditors.XtraForm frm, Control box1, Label lbMsg)
+ public void Show()
{
- InitializeComponent(frm);
- foreach (Control control in box1.Controls)
+ foreach (Control control in dragBox1.Controls)
{
if (control != null)
{
- sbMsg = lbMsg;
- dragBox1 = box1;
- dragCurrent_Name = box1.Name;
+ dragCurrent_Name = dragBox1.Name;
control.MouseDown += new MouseEventHandler(control_MouseDown);
control.MouseLeave += new EventHandler(control_MouseLeave);
control.MouseMove += new MouseEventHandler(control_MouseMove);
control.MouseUp += Control_MouseUp;
-
control.Resize += myPanel_Resize;
}
}
+ dockPanel1.Show();
}
-
- private static void Control_MouseUp(object sender, MouseEventArgs e)
- {
- (sender as Control).Refresh();
- }
-
- public static void UnRegisterControl(Control control)
+ public void Hide(Control control)
{
if (control != null)
{
@@ -124,9 +151,43 @@
control.MouseLeave -= new EventHandler(control_MouseLeave);
control.MouseMove -= new MouseEventHandler(control_MouseMove);
}
+ dockPanel1.Hide();
}
- #endregion
- private static void control_MouseDown(object sender, MouseEventArgs e)
+ #region Public Method
+ private void Control_MouseUp(object sender, MouseEventArgs e)
+ {
+ Control lCtrl = (sender as Control);
+ (sender as Control).Refresh();
+ dragCurrent_Name = (sender as Control).Parent.Name;
+ if (dragBox1.Name == dragCurrent_Name)
+ {
+ if (IsOutsideBounds(lCtrl, dragBox1))
+ {
+ dragBox1.Controls.Remove(lCtrl);
+ dockPanel1_Container.Controls.Add(lCtrl);
+ lCtrl.Left = 0;
+ lCtrl.Top = 10;
+ // isDragging = false;
+ dragCurrent_Name = dockPanel1_Container.Name;
+ }
+ reloadLoaction(null);
+ }
+ else if (dockPanel1_Container.Name == dragCurrent_Name)
+ {
+ if (IsOutsideBounds(lCtrl, dockPanel1_Container))
+ {
+ dockPanel1_Container.Controls.Remove(lCtrl);
+ dragBox1.Controls.Add(lCtrl);
+ lCtrl.Left = 0;
+ lCtrl.Top = 10;
+ // isDragging = false;
+ dragCurrent_Name = dragBox1.Name;
+ }
+ reloadLoaction(lCtrl);
+ }
+
+ }
+ private void control_MouseDown(object sender, MouseEventArgs e)
{
p.X = e.X;
p.Y = e.Y;
@@ -134,11 +195,8 @@
p1.Y = e.Y;
isDragging = true;
dragCurrent_Name = (sender as Control).Parent.Name;
-
-
}
-
- private static void myPanel_Resize(object sender, EventArgs e)
+ private void myPanel_Resize(object sender, EventArgs e)
{
Control panel = sender as Control;
if (panel != null && panel.Controls.Count > 0)
@@ -149,19 +207,17 @@
childControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
int newY = (panel.ClientSize.Height - childControl.Height) / 2;
childControl.Location = new Point(childControl.Location.X, newY);
-
-
}
-
}
+ reloadMsg(panel);
}
- private static void control_MouseLeave(object sender, EventArgs e)
+ private void control_MouseLeave(object sender, EventArgs e)
{
m_MousePointPosition = EnumMousePointPosition.MouseSizeNone;
Control control = sender as Control;
control.Cursor = Cursors.Arrow;
}
- private static void control_MouseMove(object sender, MouseEventArgs e)
+ private void control_MouseMove(object sender, MouseEventArgs e)
{
if (!isDragging) { return; }
Control lCtrl = (sender as Control);
@@ -185,7 +241,7 @@
p1.Y = e.Y; //'璁板綍鍏夋爣鎷栧姩鐨勫綋鍓嶇偣
break;
case EnumMousePointPosition.MouseSizeRight:
- lCtrl.Width = lCtrl.Width + e.X - p1.X; //
+ lCtrl.Width = lCtrl.Width + e.X - p1.X;
lCtrl.Height = lCtrl.Height + e.Y - p1.Y;
p1.X = e.X;
p1.Y = e.Y; //'璁板綍鍏夋爣鎷栧姩鐨勫綋鍓嶇偣
@@ -270,41 +326,13 @@
int width = control.Width;
int height = control.Height;
Point[] ps = { new Point(0, 0),new Point(width - 1, 0),
- new Point(width - 1, height - 1),new Point(0, height - 1),new Point(0, 0) };
+ new Point(width - 1, height - 1),new Point(0, height - 1),new Point(0, 0) };
g.DrawLines(new Pen(Color.LightCoral), ps);
-
-
}
-
-
- if (dragBox1.Name == dragCurrent_Name)
- {
- if (IsOutsideBounds(lCtrl, dragBox1))
- {
- dragBox1.Controls.Remove(lCtrl);
- dockPanel1_Container.Controls.Add(lCtrl);
- lCtrl.Left = 0;
- lCtrl.Top = 10;
- isDragging = false;
- dragCurrent_Name = dockPanel1_Container.Name;
- }
- }
- else if (dockPanel1_Container.Name == dragCurrent_Name)
- {
- if (IsOutsideBounds(lCtrl, dockPanel1_Container))
- {
- dockPanel1_Container.Controls.Remove(lCtrl);
- dragBox1.Controls.Add(lCtrl);
- lCtrl.Left = 0;
- lCtrl.Top = 10;
- isDragging = false;
- dragCurrent_Name = dragBox1.Name;
- }
- }
- sbMsg.Text = lCtrl.Location.ToString() + "瀹瑰櫒锛�" + dragCurrent_Name;
-
+ // reloadLoaction();
+ reloadMsg(lCtrl);
}
- private static EnumMousePointPosition MousePointPosition(Size size, System.Windows.Forms.MouseEventArgs e)
+ private EnumMousePointPosition MousePointPosition(Size size, System.Windows.Forms.MouseEventArgs e)
{
if ((e.X >= -1 * Band) | (e.X <= size.Width) | (e.Y >= -1 * Band) | (e.Y <= size.Height))
{
@@ -371,8 +399,7 @@
return EnumMousePointPosition.MouseSizeNone;
}
}
-
- public static bool IsOutsideBounds(Control childControl, Control parentControl)
+ public bool IsOutsideBounds(Control childControl, Control parentControl)
{
if (parentControl == null) return true;
if (parentControl == null) return true;
@@ -403,5 +430,45 @@
// 濡傛灉瀛愭帶浠剁殑鎵�鏈夎竟鐣岄兘鍦ㄧ埗鎺т欢鐨勮竟鐣屽唴锛屽垯杩斿洖false
return false;
}
+ #endregion
+
+ private void reloadLoaction(Control cocccc)
+ {
+ int _top = 0;
+ if (dockPanel1_Container.Name == dragCurrent_Name)
+ {
+ foreach (Control col in dockPanel1_Container.Controls)
+ {
+ col.Left = 0;
+ col.Top = _top;
+ _top += (col.Height + 2);
+ }
+ return;
+ }
+ if (cocccc == null) return;
+ int x = 15;
+ int y = 15;
+ foreach (Control btn in dragBox1.Controls)
+ {
+ if (cocccc.Name == btn.Name)
+ continue;
+ //btn.Left = x;
+ //btn.Top = y;
+ x += btn.Width + 15;
+ if (btn.Width > dragBox1.Width - x)
+ {
+ x = 15;
+ y += btn.Height + 15;
+ }
+ }
+ cocccc.Left = x;
+ cocccc.Top = y;
+ return;
+ }
+
+ private void reloadMsg(Control cocccc) {
+
+ sbMsg.Text = "鍧愭爣:" + cocccc.Location.ToString() + ",澶у皬锛�" + cocccc.Size.ToString();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index ceaafaf..54f32a5 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -14,7 +14,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
@@ -27,7 +26,6 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using OracleInternal.Sharding;
using UserControls.Data;
using static System.Windows.Forms.Control;
@@ -1589,7 +1587,7 @@
btnChkIco.Tag = "鏈鏍�";
}
btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
- btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
+ btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20,25); // 璺濈椤堕儴10鍍忕礌
}
}
}
@@ -1808,7 +1806,6 @@
//}
}
};
-
}
private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
{
--
Gitblit v1.9.3