From 88f69448fd3fb65d437c0b258ea93a3055017abd Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 13:39:26 +0800
Subject: [PATCH] 退货申请
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 326 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 218 insertions(+), 108 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index aa1dbf3..9887491 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -47,8 +47,17 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
- this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fNote = new DevExpress.XtraEditors.LabelControl();
this.txt_fNote = new DevExpress.XtraEditors.TextEdit();
@@ -88,29 +97,29 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
this.lb_salesId = new DevExpress.XtraEditors.LabelControl();
this.txt_fSaleOrgId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fStockOrgId = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).BeginInit();
@@ -129,12 +138,11 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// gvMx1fseq
@@ -240,8 +248,8 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 282);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
+ this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
//
@@ -252,7 +260,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 282);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 389);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -303,36 +311,121 @@
//
// repositoryItemSearchLookUpEdit1View
//
+ this.repositoryItemSearchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn10,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn6});
this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "閿�鍞崟鍙�";
+ this.gridColumn10.FieldName = "billNo";
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 0;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 1;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞崟浣�";
+ this.gridColumn4.FieldName = "dwName";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 2;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "閿�鍞暟閲�";
+ this.gridColumn5.FieldName = "qty";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "渚涘簲缁勭粐";
+ this.gridColumn7.FieldName = "gyOrg";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 4;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "搴撳瓨缁勭粐";
+ this.gridColumn8.FieldName = "kcOrg";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 5;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍓╀綑鏈嚭鏁伴噺";
+ this.gridColumn9.FieldName = "syQty";
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "閿�鍞粍缁�";
+ this.gridColumn6.FieldName = "salesOrgName";
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 7;
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// lb_fApproverStaus
//
this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fApproverStaus.Appearance.Options.UseFont = true;
- this.lb_fApproverStaus.Location = new System.Drawing.Point(270, 116);
+ this.lb_fApproverStaus.Location = new System.Drawing.Point(815, 85);
this.lb_fApproverStaus.Name = "lb_fApproverStaus";
this.lb_fApproverStaus.Size = new System.Drawing.Size(68, 21);
this.lb_fApproverStaus.TabIndex = 247;
this.lb_fApproverStaus.Text = "瀹℃牳鐘舵��";
//
- // txt_fApproverStaus
- //
- this.txt_fApproverStaus.Location = new System.Drawing.Point(330, 116);
- this.txt_fApproverStaus.Name = "txt_fApproverStaus";
- this.txt_fApproverStaus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fApproverStaus.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverStaus.Size = new System.Drawing.Size(150, 28);
- this.txt_fApproverStaus.TabIndex = 247;
- //
// gv_fApproverStaus
//
this.gv_fApproverStaus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
- this.gv_fApproverStaus.Caption = "FApproverStaus ";
- this.gv_fApproverStaus.FieldName = "fApproverStaus";
+ this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑";
+ this.gv_fApproverStaus.FieldName = "chkStatus";
this.gv_fApproverStaus.MinWidth = 50;
this.gv_fApproverStaus.Name = "gv_fApproverStaus";
this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
@@ -345,7 +438,7 @@
//
this.lb_fNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fNote.Appearance.Options.UseFont = true;
- this.lb_fNote.Location = new System.Drawing.Point(20, 116);
+ this.lb_fNote.Location = new System.Drawing.Point(40, 118);
this.lb_fNote.Name = "lb_fNote";
this.lb_fNote.Size = new System.Drawing.Size(39, 21);
this.lb_fNote.TabIndex = 243;
@@ -353,11 +446,11 @@
//
// txt_fNote
//
- this.txt_fNote.Location = new System.Drawing.Point(80, 116);
+ this.txt_fNote.Location = new System.Drawing.Point(84, 114);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(150, 28);
+ this.txt_fNote.Size = new System.Drawing.Size(179, 28);
this.txt_fNote.TabIndex = 243;
//
// gv_fNote
@@ -378,7 +471,7 @@
//
this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fDate.Appearance.Options.UseFont = true;
- this.lb_fDate.Location = new System.Drawing.Point(770, 84);
+ this.lb_fDate.Location = new System.Drawing.Point(580, 117);
this.lb_fDate.Name = "lb_fDate";
this.lb_fDate.Size = new System.Drawing.Size(39, 21);
this.lb_fDate.TabIndex = 240;
@@ -386,12 +479,13 @@
//
// txt_fDate
//
- this.txt_fDate.Location = new System.Drawing.Point(830, 84);
+ this.txt_fDate.Location = new System.Drawing.Point(622, 113);
this.txt_fDate.Name = "txt_fDate";
this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_fDate.Size = new System.Drawing.Size(173, 28);
this.txt_fDate.TabIndex = 240;
+ this.txt_fDate.Tag = "readonly";
//
// gv_fDate
//
@@ -411,7 +505,7 @@
//
this.lb_fCustomerID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fCustomerID.Appearance.Options.UseFont = true;
- this.lb_fCustomerID.Location = new System.Drawing.Point(520, 84);
+ this.lb_fCustomerID.Location = new System.Drawing.Point(304, 115);
this.lb_fCustomerID.Name = "lb_fCustomerID";
this.lb_fCustomerID.Size = new System.Drawing.Size(39, 21);
this.lb_fCustomerID.TabIndex = 235;
@@ -435,7 +529,7 @@
//
this.lb_fSalesManID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fSalesManID.Appearance.Options.UseFont = true;
- this.lb_fSalesManID.Location = new System.Drawing.Point(270, 84);
+ this.lb_fSalesManID.Location = new System.Drawing.Point(287, 84);
this.lb_fSalesManID.Name = "lb_fSalesManID";
this.lb_fSalesManID.Size = new System.Drawing.Size(56, 21);
this.lb_fSalesManID.TabIndex = 231;
@@ -443,12 +537,13 @@
//
// txt_fSalesManID
//
- this.txt_fSalesManID.Location = new System.Drawing.Point(330, 84);
+ this.txt_fSalesManID.Location = new System.Drawing.Point(350, 80);
this.txt_fSalesManID.Name = "txt_fSalesManID";
this.txt_fSalesManID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fSalesManID.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManID.Size = new System.Drawing.Size(150, 28);
+ this.txt_fSalesManID.Size = new System.Drawing.Size(195, 28);
this.txt_fSalesManID.TabIndex = 231;
+ this.txt_fSalesManID.Tag = "readonly";
//
// gv_fSalesManID
//
@@ -468,7 +563,7 @@
//
this.lb_fApproveDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fApproveDate.Appearance.Options.UseFont = true;
- this.lb_fApproveDate.Location = new System.Drawing.Point(20, 84);
+ this.lb_fApproveDate.Location = new System.Drawing.Point(810, 50);
this.lb_fApproveDate.Name = "lb_fApproveDate";
this.lb_fApproveDate.Size = new System.Drawing.Size(73, 21);
this.lb_fApproveDate.TabIndex = 228;
@@ -476,12 +571,13 @@
//
// txt_fApproveDate
//
- this.txt_fApproveDate.Location = new System.Drawing.Point(80, 84);
+ this.txt_fApproveDate.Location = new System.Drawing.Point(886, 46);
this.txt_fApproveDate.Name = "txt_fApproveDate";
this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproveDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_fApproveDate.Size = new System.Drawing.Size(173, 28);
this.txt_fApproveDate.TabIndex = 228;
+ this.txt_fApproveDate.Tag = "readonly";
//
// gv_fApproveDate
//
@@ -501,7 +597,7 @@
//
this.lb_fCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fCreateDate.Appearance.Options.UseFont = true;
- this.lb_fCreateDate.Location = new System.Drawing.Point(770, 52);
+ this.lb_fCreateDate.Location = new System.Drawing.Point(546, 83);
this.lb_fCreateDate.Name = "lb_fCreateDate";
this.lb_fCreateDate.Size = new System.Drawing.Size(73, 21);
this.lb_fCreateDate.TabIndex = 226;
@@ -509,12 +605,13 @@
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(830, 52);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(622, 79);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(173, 28);
this.txt_fCreateDate.TabIndex = 226;
+ this.txt_fCreateDate.Tag = "readonly";
//
// gv_fCreateDate
//
@@ -534,7 +631,7 @@
//
this.lb_fApproverID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fApproverID.Appearance.Options.UseFont = true;
- this.lb_fApproverID.Location = new System.Drawing.Point(520, 52);
+ this.lb_fApproverID.Location = new System.Drawing.Point(832, 17);
this.lb_fApproverID.Name = "lb_fApproverID";
this.lb_fApproverID.Size = new System.Drawing.Size(51, 21);
this.lb_fApproverID.TabIndex = 222;
@@ -542,18 +639,19 @@
//
// txt_fApproverID
//
- this.txt_fApproverID.Location = new System.Drawing.Point(580, 52);
+ this.txt_fApproverID.Location = new System.Drawing.Point(886, 13);
this.txt_fApproverID.Name = "txt_fApproverID";
this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverID.Size = new System.Drawing.Size(150, 28);
+ this.txt_fApproverID.Size = new System.Drawing.Size(173, 28);
this.txt_fApproverID.TabIndex = 222;
+ this.txt_fApproverID.Tag = "readonly";
//
// gv_fApproverID
//
this.gv_fApproverID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
- this.gv_fApproverID.Caption = "FApproverID ";
+ this.gv_fApproverID.Caption = "瀹℃牳浜�";
this.gv_fApproverID.FieldName = "fApproverID";
this.gv_fApproverID.MinWidth = 50;
this.gv_fApproverID.Name = "gv_fApproverID";
@@ -567,7 +665,7 @@
//
this.lb_fCreatorId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fCreatorId.Appearance.Options.UseFont = true;
- this.lb_fCreatorId.Location = new System.Drawing.Point(270, 52);
+ this.lb_fCreatorId.Location = new System.Drawing.Point(563, 50);
this.lb_fCreatorId.Name = "lb_fCreatorId";
this.lb_fCreatorId.Size = new System.Drawing.Size(56, 21);
this.lb_fCreatorId.TabIndex = 219;
@@ -575,12 +673,13 @@
//
// txt_fCreatorId
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(330, 52);
+ this.txt_fCreatorId.Location = new System.Drawing.Point(622, 46);
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(150, 28);
+ this.txt_fCreatorId.Size = new System.Drawing.Size(173, 28);
this.txt_fCreatorId.TabIndex = 219;
+ this.txt_fCreatorId.Tag = "readonly";
//
// gv_fCreatorId
//
@@ -600,7 +699,7 @@
//
this.lb_fStockOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fStockOrgId.Appearance.Options.UseFont = true;
- this.lb_fStockOrgId.Location = new System.Drawing.Point(20, 52);
+ this.lb_fStockOrgId.Location = new System.Drawing.Point(6, 86);
this.lb_fStockOrgId.Name = "lb_fStockOrgId";
this.lb_fStockOrgId.Size = new System.Drawing.Size(73, 21);
this.lb_fStockOrgId.TabIndex = 217;
@@ -624,7 +723,7 @@
//
this.lb_fSaleOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fSaleOrgId.Appearance.Options.UseFont = true;
- this.lb_fSaleOrgId.Location = new System.Drawing.Point(770, 20);
+ this.lb_fSaleOrgId.Location = new System.Drawing.Point(270, 50);
this.lb_fSaleOrgId.Name = "lb_fSaleOrgId";
this.lb_fSaleOrgId.Size = new System.Drawing.Size(73, 21);
this.lb_fSaleOrgId.TabIndex = 216;
@@ -648,7 +747,7 @@
//
this.lb_fBillTypeID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fBillTypeID.Appearance.Options.UseFont = true;
- this.lb_fBillTypeID.Location = new System.Drawing.Point(520, 20);
+ this.lb_fBillTypeID.Location = new System.Drawing.Point(546, 17);
this.lb_fBillTypeID.Name = "lb_fBillTypeID";
this.lb_fBillTypeID.Size = new System.Drawing.Size(73, 21);
this.lb_fBillTypeID.TabIndex = 213;
@@ -672,7 +771,7 @@
//
this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billNo.Appearance.Options.UseFont = true;
- this.lb_billNo.Location = new System.Drawing.Point(270, 20);
+ this.lb_billNo.Location = new System.Drawing.Point(270, 17);
this.lb_billNo.Name = "lb_billNo";
this.lb_billNo.Size = new System.Drawing.Size(73, 21);
this.lb_billNo.TabIndex = 211;
@@ -680,12 +779,13 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(330, 20);
+ this.txt_billNo.Location = new System.Drawing.Point(350, 13);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 28);
this.txt_billNo.TabIndex = 211;
+ this.txt_billNo.Tag = "readonly";
//
// gv_billNo
//
@@ -705,20 +805,21 @@
//
this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(20, 20);
+ this.lb_id.Location = new System.Drawing.Point(5, 17);
this.lb_id.Name = "lb_id";
- this.lb_id.Size = new System.Drawing.Size(18, 21);
+ this.lb_id.Size = new System.Drawing.Size(74, 21);
this.lb_id.TabIndex = 210;
- this.lb_id.Text = "id ";
+ this.lb_id.Text = "涓婚敭GUID";
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(80, 20);
+ this.txt_id.Location = new System.Drawing.Point(84, 13);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(150, 28);
+ this.txt_id.Size = new System.Drawing.Size(179, 28);
this.txt_id.TabIndex = 210;
+ this.txt_id.Tag = "readonly";
//
// gv_id
//
@@ -779,13 +880,24 @@
this.gv_fCustomerID,
this.gv_fDate,
this.gv_fNote,
- this.gv_fApproverStaus});
+ this.gv_fApproverStaus,
+ this.gridColumn2});
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;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
+ this.gridColumn2.FieldName = "wjStatus";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 14;
+ this.gridColumn2.Width = 94;
//
// xtraTabControl1
//
@@ -831,10 +943,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 256);
+ this.tabMx.Location = new System.Drawing.Point(0, 149);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 314);
+ this.tabMx.Size = new System.Drawing.Size(1126, 421);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -842,16 +954,16 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_fApproverStaus);
+ this.panel1.Controls.Add(this.txt_fStockOrgId);
this.panel1.Controls.Add(this.txt_fCustomerID);
this.panel1.Controls.Add(this.txt_salesId);
this.panel1.Controls.Add(this.lb_salesId);
this.panel1.Controls.Add(this.txt_fSaleOrgId);
- this.panel1.Controls.Add(this.txt_fStockOrgId);
this.panel1.Controls.Add(this.txt_fBillTypeID);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fApproverStaus);
- this.panel1.Controls.Add(this.txt_fApproverStaus);
this.panel1.Controls.Add(this.lb_fNote);
this.panel1.Controls.Add(this.txt_fNote);
this.panel1.Controls.Add(this.lb_fDate);
@@ -878,31 +990,49 @@
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, 256);
+ this.panel1.Size = new System.Drawing.Size(1126, 149);
this.panel1.TabIndex = 1;
+ //
+ // txt_fApproverStaus
+ //
+ this.txt_fApproverStaus.Enabled = false;
+ this.txt_fApproverStaus.Location = new System.Drawing.Point(886, 85);
+ this.txt_fApproverStaus.Name = "txt_fApproverStaus";
+ this.txt_fApproverStaus.Properties.Caption = "";
+ this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
+ this.txt_fApproverStaus.TabIndex = 370;
+ //
+ // txt_fStockOrgId
+ //
+ this.txt_fStockOrgId.IsReadly = false;
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 81);
+ this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(179, 30);
+ this.txt_fStockOrgId.TabIndex = 369;
//
// txt_fCustomerID
//
- this.txt_fCustomerID.Location = new System.Drawing.Point(565, 86);
+ this.txt_fCustomerID.Location = new System.Drawing.Point(350, 111);
this.txt_fCustomerID.Name = "txt_fCustomerID";
this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerID.Size = new System.Drawing.Size(150, 28);
+ this.txt_fCustomerID.Size = new System.Drawing.Size(195, 28);
this.txt_fCustomerID.TabIndex = 368;
+ this.txt_fCustomerID.Tag = "readonly";
//
// txt_salesId
//
this.txt_salesId.IsReadly = false;
- this.txt_salesId.Location = new System.Drawing.Point(144, 190);
+ this.txt_salesId.Location = new System.Drawing.Point(84, 48);
this.txt_salesId.Name = "txt_salesId";
- this.txt_salesId.Size = new System.Drawing.Size(234, 29);
+ this.txt_salesId.Size = new System.Drawing.Size(179, 30);
this.txt_salesId.TabIndex = 367;
//
// lb_salesId
//
this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_salesId.Appearance.Options.UseFont = true;
- this.lb_salesId.Location = new System.Drawing.Point(39, 190);
+ this.lb_salesId.Location = new System.Drawing.Point(11, 53);
this.lb_salesId.Name = "lb_salesId";
this.lb_salesId.Size = new System.Drawing.Size(68, 21);
this.lb_salesId.TabIndex = 366;
@@ -910,38 +1040,30 @@
//
// txt_fSaleOrgId
//
- this.txt_fSaleOrgId.Location = new System.Drawing.Point(849, 13);
+ this.txt_fSaleOrgId.Location = new System.Drawing.Point(350, 46);
this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
this.txt_fSaleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fSaleOrgId.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
+ this.txt_fSaleOrgId.Size = new System.Drawing.Size(195, 28);
this.txt_fSaleOrgId.TabIndex = 365;
- //
- // txt_fStockOrgId
- //
- this.txt_fStockOrgId.Location = new System.Drawing.Point(90, 52);
- this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fStockOrgId.Properties.Appearance.Options.UseFont = true;
- this.txt_fStockOrgId.Size = new System.Drawing.Size(150, 28);
- this.txt_fStockOrgId.TabIndex = 364;
+ this.txt_fSaleOrgId.Tag = "readonly";
//
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(584, 17);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(622, 15);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(146, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(173, 24);
this.txt_fBillTypeID.TabIndex = 362;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(529, 126);
+ this.labelControl11.Location = new System.Drawing.Point(983, 104);
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);
@@ -951,7 +1073,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(580, 126);
+ this.lbGuid.Location = new System.Drawing.Point(1034, 104);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -967,27 +1089,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
// Frm_SalesDeliver
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -997,12 +1098,13 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_SalesDeliver";
+ this.Text = "鍙戣揣閫氱煡鐢宠";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).EndInit();
@@ -1022,12 +1124,11 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -1056,7 +1157,6 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_fApproverStaus;
- private DevExpress.XtraEditors.TextEdit txt_fApproverStaus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
private DevExpress.XtraEditors.LabelControl lb_fNote;
@@ -1109,7 +1209,6 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
- private DevExpress.XtraEditors.TextEdit txt_fStockOrgId;
private DevExpress.XtraEditors.LabelControl lb_salesId;
private UserControl.UcLookSales txt_salesId;
private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
@@ -1118,5 +1217,16 @@
private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private UserControl.UcLookOrg txt_fStockOrgId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
--
Gitblit v1.9.3