From 4b1b24b7b57a4fe4a1b24a65b821b17c3267ea4c Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 14:33:11 +0800
Subject: [PATCH] 采购到货拒收功能
---
DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs | 444 ++++++++++++++++++++++++++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 42 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 27 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 12
DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx | 120 +++++++
DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs | 139 ++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 53 +++
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 152 ++++----
9 files changed, 901 insertions(+), 97 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 3300fe3..c6aac63 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,5 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.Entity;
@@ -35,6 +36,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnRefuseClick += ToolBarMenu1_btnRefuseClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -149,6 +151,8 @@
MessageBox.Show(ex.Message);
}
};
+
+
frm.ShowDialog();
};
}
@@ -214,7 +218,13 @@
lbGuid, txt_billNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+ private void ToolBarMenu1_btnRefuseClick(object sender, EventArgs e)
+ {
+ string _billNo = txt_billNo.Text.Trim();
+ var frm = new SelectCgDhMx(_billNo);
+ frm.ShowDialog();
+ }
+
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
_toolCk("EditModelSubmit");
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index b89a3cf..036363a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1340,6 +1340,12 @@
<Compile Include="UserControl\CopyXls.Designer.cs">
<DependentUpon>CopyXls.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectCgDhMx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCgDhMx.Designer.cs">
+ <DependentUpon>SelectCgDhMx.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\SelectCk.cs">
<SubType>Form</SubType>
</Compile>
@@ -2301,6 +2307,9 @@
<EmbeddedResource Include="UserControl\CopyXls.resx">
<DependentUpon>CopyXls.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCgDhMx.resx">
+ <DependentUpon>SelectCgDhMx.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCk.resx">
<DependentUpon>SelectCk.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs
new file mode 100644
index 0000000..55dab5c
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs
@@ -0,0 +1,444 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectCgDhMx
+ {
+
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.xtraTabControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1336, 531);
+ this.panelControl2.TabIndex = 4;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(2, 2);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1332, 527);
+ this.xtraTabControl1.TabIndex = 7;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.panelControl1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1330, 501);
+ this.xtraTabPage1.Text = "鍒拌揣鍗曟槑缁�";
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1330, 467);
+ this.gcMain.TabIndex = 2;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1,
+ this.gridView3,
+ this.gridView4});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 39;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gv_billNo,
+ this.gv_guid,
+ this.gv_ebelnK3id,
+ this.gridColumn3,
+ this.gv_supplierItemCode,
+ this.gv_supplierItemName,
+ this.gridColumn6,
+ this.gridColumn9,
+ this.gridColumn7,
+ this.gv_purchaseUnit,
+ this.gv_remarks,
+ this.gridColumn5,
+ this.gridColumn10,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gridColumn1});
+ this.gridView1.DetailHeight = 272;
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 43;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 52;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowFooter = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.MinWidth = 22;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 82;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "閲囪喘鍗曞彿";
+ this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gv_billNo.MinWidth = 10;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.OptionsColumn.ReadOnly = true;
+ this.gv_billNo.Tag = "query_a.BILL_NO";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.VisibleIndex = 1;
+ this.gv_billNo.Width = 90;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 43;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 82;
+ //
+ // gv_ebelnK3id
+ //
+ this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+ this.gv_ebelnK3id.Caption = "ERP琛孖D鍙�";
+ this.gv_ebelnK3id.FieldName = "erpMxId";
+ this.gv_ebelnK3id.MinWidth = 87;
+ this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+ this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+ this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
+ this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+ this.gv_ebelnK3id.Width = 87;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+ this.gridColumn3.FieldName = "purchaseDate";
+ this.gridColumn3.MinWidth = 10;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.Width = 60;
+ //
+ // gv_supplierItemCode
+ //
+ this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gv_supplierItemCode.FieldName = "wlbm";
+ this.gv_supplierItemCode.MinWidth = 10;
+ this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+ this.gv_supplierItemCode.Visible = true;
+ this.gv_supplierItemCode.VisibleIndex = 3;
+ this.gv_supplierItemCode.Width = 117;
+ //
+ // gv_supplierItemName
+ //
+ this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_supplierItemName.FieldName = "wlmc";
+ this.gv_supplierItemName.MinWidth = 10;
+ this.gv_supplierItemName.Name = "gv_supplierItemName";
+ this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+ this.gv_supplierItemName.Visible = true;
+ this.gv_supplierItemName.VisibleIndex = 4;
+ this.gv_supplierItemName.Width = 83;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "閲囪喘鏁伴噺";
+ this.gridColumn6.FieldName = "purchaseQty";
+ this.gridColumn6.MinWidth = 10;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 70;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "宸叉敹鏁伴噺";
+ this.gridColumn9.FieldName = "yssl";
+ this.gridColumn9.MinWidth = 10;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 62;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn7.Caption = "鏈敹鏁伴噺";
+ this.gridColumn7.FieldName = "wssl";
+ this.gridColumn7.MinWidth = 10;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 57;
+ //
+ // gv_purchaseUnit
+ //
+ this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+ this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
+ this.gv_purchaseUnit.FieldName = "fname";
+ this.gv_purchaseUnit.MinWidth = 10;
+ this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+ this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+ this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
+ this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+ this.gv_purchaseUnit.Visible = true;
+ this.gv_purchaseUnit.VisibleIndex = 8;
+ this.gv_purchaseUnit.Width = 84;
+ //
+ // gv_remarks
+ //
+ this.gv_remarks.AppearanceCell.Options.UseFont = true;
+ this.gv_remarks.Caption = "澶囨敞";
+ this.gv_remarks.FieldName = "remarks";
+ this.gv_remarks.MinWidth = 10;
+ this.gv_remarks.Name = "gv_remarks";
+ this.gv_remarks.OptionsColumn.AllowEdit = false;
+ this.gv_remarks.OptionsColumn.ReadOnly = true;
+ this.gv_remarks.Tag = "query_a.REMARKS";
+ this.gv_remarks.Visible = true;
+ this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.Width = 52;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "wlgg";
+ this.gridColumn5.MinWidth = 10;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.Width = 104;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "渚涘簲鍟�";
+ this.gridColumn10.FieldName = "gysName";
+ this.gridColumn10.MinWidth = 10;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.Width = 154;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn2.FieldName = "fSubsidiary";
+ this.gridColumn2.MinWidth = 10;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 11;
+ this.gridColumn2.Width = 123;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞鍗�";
+ this.gridColumn4.FieldName = "xxdd";
+ this.gridColumn4.MinWidth = 10;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 10;
+ this.gridColumn4.Width = 91;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn1.FieldName = "documentTypeTxt";
+ this.gridColumn1.MinWidth = 10;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 14;
+ this.gridColumn1.Width = 54;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 467);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1330, 34);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnIn.Location = new System.Drawing.Point(1245, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(83, 30);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾";
+ //
+ // gridView3
+ //
+ this.gridView3.GridControl = this.gcMain;
+ this.gridView3.Name = "gridView3";
+ //
+ // gridView4
+ //
+ this.gridView4.GridControl = this.gcMain;
+ this.gridView4.Name = "gridView4";
+ //
+ // SelectCgDhMx
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1336, 531);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCgDhMx";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈楠岀殑鍗曟嵁";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs
new file mode 100644
index 0000000..280bb87
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs
@@ -0,0 +1,139 @@
+锘縰sing CefSharp;
+using DevExpress.Data;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectCgDhMx : XtraForm
+ {
+ private readonly string _webServiceName = "MesInvItemArnManager/";
+ private string suppId = "";
+ private string receiveOrgId = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_billNo">鍒拌揣鍗曞彿</param>
+
+ public SelectCgDhMx(string _billNo)
+ {
+ InitializeComponent();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1, _billNo);
+ btnIn.Click += (s, e) =>
+ {
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ var selectedGuids = new List<string>(); // 瀛樺偍鍕鹃�夌殑guid闆嗗悎
+ DataTable dt = this.gcMain.DataSource as DataTable;
+
+ if (dt != null)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["guid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ selectedGuids.Add(_guid); // 鏀堕泦鍕鹃�夌殑guid
+ }
+ }
+ }
+
+ // 鍏抽敭锛氳皟鐢⊿electMxBtn鎺ュ彛锛屼紶鍏ュ嬀閫夌殑guid闆嗗悎
+ CallSelectMxBtnApi(selectedGuids);
+
+ // 鍥炰紶鏁版嵁骞跺叧闂〃鍗曪紙淇濇寔鍘熸湁閫昏緫锛�
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = selectedGuids });
+ Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage,string billNo)
+ {
+
+ var _obj = new
+ {
+ currentPage = curPage,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ // inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶�
+ // inReceiveOrgId = this.receiveOrgId,//缁勭粐
+ inBusType = "",
+ inReceiveOrgId = "",
+ inSupId = billNo//渚涘簲鍟�
+
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",_webServiceName + "SelectMxForm", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 璋冪敤SelectMxBtn鎺ュ彛锛屼紶閫掑嬀閫夌殑guid闆嗗悎
+ /// </summary>
+ /// <param name="selectedGuids">鍕鹃�夌殑璁板綍guid鍒楄〃</param>
+ private void CallSelectMxBtnApi(List<string> selectedGuids)
+ {
+ if (selectedGuids == null || selectedGuids.Count == 0)
+ {
+ MsgHelper.Warning("璇峰厛鍕鹃�夐渶瑕佸鐞嗙殑鏄庣粏");
+ return;
+ }
+ // 鏋勫缓鎺ュ彛璇锋眰鍙傛暟锛堜笌SelectMxForm鎺ュ彛鏍煎紡淇濇寔涓�鑷达級
+ var requestParams = new{ guidList = selectedGuids};
+ try
+ {
+ // 搴忓垪鍖栧弬鏁颁负JSON
+ string jsonParams = JsonConvert.SerializeObject(requestParams);
+
+ // 璋冪敤鍚庣SelectMxBtn鎺ュ彛锛堜笌SelectMxForm鍚屾牱浣跨敤HttpPost锛�
+ string apiUrl = _webServiceName + "SelectMxBtn"; // 鎺ュ彛鍦板潃
+ string response = UtilityHelper.HttpPost("", apiUrl, jsonParams);
+ var _rtn = UtilityHelper.ReturnToDynamic(response);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index cc1a5ef..c4ce141 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -95,19 +95,17 @@
this.panelControl2.Controls.Add(this.panelControl3);
this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelControl2.Location = new System.Drawing.Point(0, 0);
- this.panelControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(1410, 834);
+ this.panelControl2.Size = new System.Drawing.Size(987, 531);
this.panelControl2.TabIndex = 4;
//
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(2, 48);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(2, 31);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1406, 784);
+ this.xtraTabControl1.Size = new System.Drawing.Size(983, 498);
this.xtraTabControl1.TabIndex = 7;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -117,20 +115,17 @@
//
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.panelControl1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1404, 746);
+ this.xtraTabPage1.Size = new System.Drawing.Size(981, 472);
this.xtraTabPage1.Text = "鏅�氬埌璐у崟";
//
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
- this.gcMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1404, 693);
+ this.gcMain.Size = new System.Drawing.Size(981, 438);
this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -140,7 +135,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 61;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_billNo,
@@ -159,12 +154,12 @@
this.gridColumn2,
this.gridColumn4,
this.gridColumn1});
- this.gridView1.DetailHeight = 428;
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 43;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 75;
+ this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 52;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
@@ -174,11 +169,11 @@
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.colChkInt.MinWidth = 31;
+ this.colChkInt.MinWidth = 22;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 117;
+ this.colChkInt.Width = 82;
//
// gv_billNo
//
@@ -186,103 +181,103 @@
this.gv_billNo.Caption = "閲囪喘鍗曞彿";
this.gv_billNo.FieldName = "billNo";
this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_billNo.MinWidth = 12;
+ this.gv_billNo.MinWidth = 8;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 1;
- this.gv_billNo.Width = 12;
+ this.gv_billNo.Width = 8;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 62;
+ this.gv_guid.MinWidth = 43;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.OptionsColumn.ReadOnly = true;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 117;
+ this.gv_guid.Width = 82;
//
// gv_ebelnK3id
//
this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
this.gv_ebelnK3id.Caption = "ERP琛孖D鍙�";
this.gv_ebelnK3id.FieldName = "erpMxId";
- this.gv_ebelnK3id.MinWidth = 125;
+ this.gv_ebelnK3id.MinWidth = 87;
this.gv_ebelnK3id.Name = "gv_ebelnK3id";
this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gv_ebelnK3id.Width = 125;
+ this.gv_ebelnK3id.Width = 87;
//
// gridColumn3
//
this.gridColumn3.Caption = "閲囪喘鏃堕棿";
this.gridColumn3.FieldName = "purchaseDate";
- this.gridColumn3.MinWidth = 12;
+ this.gridColumn3.MinWidth = 8;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 12;
+ this.gridColumn3.Width = 8;
//
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "wlbm";
- this.gv_supplierItemCode.MinWidth = 12;
+ this.gv_supplierItemCode.MinWidth = 8;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
this.gv_supplierItemCode.VisibleIndex = 3;
- this.gv_supplierItemCode.Width = 12;
+ this.gv_supplierItemCode.Width = 8;
//
// gv_supplierItemName
//
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "wlmc";
- this.gv_supplierItemName.MinWidth = 12;
+ this.gv_supplierItemName.MinWidth = 8;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
this.gv_supplierItemName.VisibleIndex = 4;
- this.gv_supplierItemName.Width = 12;
+ this.gv_supplierItemName.Width = 8;
//
// gridColumn6
//
this.gridColumn6.Caption = "閲囪喘鏁伴噺";
this.gridColumn6.FieldName = "purchaseQty";
- this.gridColumn6.MinWidth = 12;
+ this.gridColumn6.MinWidth = 8;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 14;
+ this.gridColumn6.Width = 10;
//
// gridColumn9
//
this.gridColumn9.Caption = "宸叉敹鏁伴噺";
this.gridColumn9.FieldName = "yssl";
- this.gridColumn9.MinWidth = 12;
+ this.gridColumn9.MinWidth = 8;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 62;
+ this.gridColumn9.Width = 43;
//
// gridColumn7
//
@@ -292,103 +287,102 @@
this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn7.Caption = "鏈敹鏁伴噺";
this.gridColumn7.FieldName = "wssl";
- this.gridColumn7.MinWidth = 12;
+ this.gridColumn7.MinWidth = 8;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
- this.gridColumn7.Width = 12;
+ this.gridColumn7.Width = 8;
//
// gv_purchaseUnit
//
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
this.gv_purchaseUnit.FieldName = "fname";
- this.gv_purchaseUnit.MinWidth = 12;
+ this.gv_purchaseUnit.MinWidth = 8;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
this.gv_purchaseUnit.VisibleIndex = 8;
- this.gv_purchaseUnit.Width = 62;
+ this.gv_purchaseUnit.Width = 43;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 12;
+ this.gv_remarks.MinWidth = 8;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
this.gv_remarks.VisibleIndex = 9;
- this.gv_remarks.Width = 12;
+ this.gv_remarks.Width = 8;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "wlgg";
- this.gridColumn5.MinWidth = 12;
+ this.gridColumn5.MinWidth = 8;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 14;
+ this.gridColumn5.Width = 10;
//
// gridColumn10
//
this.gridColumn10.Caption = "渚涘簲鍟�";
this.gridColumn10.FieldName = "gysName";
- this.gridColumn10.MinWidth = 12;
+ this.gridColumn10.MinWidth = 8;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 11;
- this.gridColumn10.Width = 156;
+ this.gridColumn10.Width = 109;
//
// gridColumn2
//
this.gridColumn2.Caption = "鏀舵枡缁勭粐";
this.gridColumn2.FieldName = "fSubsidiary";
- this.gridColumn2.MinWidth = 12;
+ this.gridColumn2.MinWidth = 8;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 12;
+ this.gridColumn2.Width = 8;
//
// gridColumn4
//
this.gridColumn4.Caption = "閿�鍞鍗�";
this.gridColumn4.FieldName = "xxdd";
- this.gridColumn4.MinWidth = 12;
+ this.gridColumn4.MinWidth = 8;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 13;
- this.gridColumn4.Width = 150;
+ this.gridColumn4.Width = 105;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
this.gridColumn1.FieldName = "documentTypeTxt";
- this.gridColumn1.MinWidth = 12;
+ this.gridColumn1.MinWidth = 8;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 31;
+ this.gridColumn1.Width = 22;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 693);
- this.panelControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panelControl1.Location = new System.Drawing.Point(0, 438);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1404, 53);
+ this.panelControl1.Size = new System.Drawing.Size(981, 34);
this.panelControl1.TabIndex = 5;
//
// btnIn
@@ -397,32 +391,28 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(1284, 2);
- this.btnIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnIn.Location = new System.Drawing.Point(896, 2);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(118, 49);
+ this.btnIn.Size = new System.Drawing.Size(83, 30);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.gridControl2);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1404, 746);
+ this.xtraTabPage2.Size = new System.Drawing.Size(981, 472);
this.xtraTabPage2.Text = "SRM鍒拌揣鍗�";
//
// gridControl2
//
this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gridControl2.Location = new System.Drawing.Point(0, 0);
this.gridControl2.MainView = this.gridView2;
- this.gridControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gridControl2.Name = "gridControl2";
this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptSrm});
- this.gridControl2.Size = new System.Drawing.Size(1404, 746);
+ this.gridControl2.Size = new System.Drawing.Size(981, 472);
this.gridControl2.TabIndex = 4;
this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@@ -437,7 +427,7 @@
this.gv_userName,
this.gv_Btn,
this.gridColumn11});
- this.gridView2.DetailHeight = 428;
+ this.gridView2.DetailHeight = 272;
this.gridView2.GridControl = this.gridControl2;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsFind.ShowSearchNavButtons = false;
@@ -449,59 +439,59 @@
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "鏀舵枡缁勭粐";
this.gv_operationTime.FieldName = "orgName";
- this.gv_operationTime.MinWidth = 12;
+ this.gv_operationTime.MinWidth = 8;
this.gv_operationTime.Name = "gv_operationTime";
this.gv_operationTime.OptionsColumn.AllowEdit = false;
this.gv_operationTime.Tag = "query_OPERATION_TIME";
this.gv_operationTime.Visible = true;
this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 375;
+ this.gv_operationTime.Width = 262;
//
// gv_operationTable
//
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "閫佽揣渚涘簲鍟�";
this.gv_operationTable.FieldName = "suppName";
- this.gv_operationTable.MinWidth = 12;
+ this.gv_operationTable.MinWidth = 8;
this.gv_operationTable.Name = "gv_operationTable";
this.gv_operationTable.OptionsColumn.AllowEdit = false;
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Visible = true;
this.gv_operationTable.VisibleIndex = 1;
- this.gv_operationTable.Width = 125;
+ this.gv_operationTable.Width = 87;
//
// gridColumn8
//
this.gridColumn8.Caption = "鍗曟嵁绫诲瀷";
this.gridColumn8.FieldName = "documentTypeTxt";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 3;
- this.gridColumn8.Width = 117;
+ this.gridColumn8.Width = 82;
//
// gv_userName
//
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "閫佽揣鍗曞彿";
this.gv_userName.FieldName = "deliveryNo";
- this.gv_userName.MinWidth = 12;
+ this.gv_userName.MinWidth = 8;
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
this.gv_userName.Visible = true;
this.gv_userName.VisibleIndex = 2;
- this.gv_userName.Width = 312;
+ this.gv_userName.Width = 218;
//
// gv_Btn
//
this.gv_Btn.Caption = "閫夋嫨";
this.gv_Btn.ColumnEdit = this.rptSrm;
- this.gv_Btn.MinWidth = 31;
+ this.gv_Btn.MinWidth = 22;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
this.gv_Btn.VisibleIndex = 5;
- this.gv_Btn.Width = 117;
+ this.gv_Btn.Width = 82;
//
// rptSrm
//
@@ -518,11 +508,11 @@
//
this.gridColumn11.Caption = "寤虹珛鏃堕棿";
this.gridColumn11.FieldName = "createDate";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 82;
//
// panelControl3
//
@@ -530,41 +520,37 @@
this.panelControl3.Controls.Add(this.radioGroup1);
this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
this.panelControl3.Location = new System.Drawing.Point(2, 2);
- this.panelControl3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panelControl3.Name = "panelControl3";
- this.panelControl3.Size = new System.Drawing.Size(1406, 46);
+ this.panelControl3.Size = new System.Drawing.Size(983, 29);
this.panelControl3.TabIndex = 6;
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(68, 13);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(48, 8);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(154, 22);
+ this.label1.Size = new System.Drawing.Size(103, 14);
this.label1.TabIndex = 1;
this.label1.Text = "閫夋嫨閲囪喘鍗曠被鍨嬶細";
//
// radioGroup1
//
this.radioGroup1.EditValue = ((short)(0));
- this.radioGroup1.Location = new System.Drawing.Point(236, 5);
- this.radioGroup1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.radioGroup1.Location = new System.Drawing.Point(165, 3);
this.radioGroup1.Name = "radioGroup1";
this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(0)), "閲囪喘"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "濮斿")});
- this.radioGroup1.Size = new System.Drawing.Size(246, 42);
+ this.radioGroup1.Size = new System.Drawing.Size(172, 27);
this.radioGroup1.TabIndex = 0;
//
// SelectCgMx
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(987, 531);
this.Controls.Add(this.panelControl2);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SelectCgMx";
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index dbba1ce..5ff9a65 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -76,6 +76,7 @@
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnTBPrint = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnRefuse = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -139,9 +140,10 @@
this.btnLianBan,
this.btnGx,
this.btnBaoGao,
- this.btnTBPrint});
+ this.btnTBPrint,
+ this.btnRefuse});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 76;
+ this.barManager1.MaxItemId = 77;
//
// bar2
//
@@ -196,7 +198,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnTBPrint)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnTBPrint),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnRefuse)});
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -620,48 +623,62 @@
this.btnTBPrint.Name = "btnTBPrint";
this.btnTBPrint.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnRefuse
+ //
+ this.btnRefuse.Caption = "鎷掔";
+ this.btnRefuse.Id = 76;
+ this.btnRefuse.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnRefuse.ImageOptions.Image")));
+ this.btnRefuse.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnRefuse.ImageOptions.LargeImage")));
+ this.btnRefuse.Name = "btnRefuse";
+ this.btnRefuse.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 213);
+ this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlTop.Size = new System.Drawing.Size(1350, 114);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 226);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 176);
this.barDockControlBottom.Manager = this.barManager1;
- this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 213);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 13);
+ this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 62);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 213);
+ this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 13);
+ this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 62);
//
// UcToolBarMenu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 226);
+ this.Size = new System.Drawing.Size(1350, 176);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -718,5 +735,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnGx;
private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
private DevExpress.XtraBars.BarLargeButtonItem btnTBPrint;
+ private DevExpress.XtraBars.BarLargeButtonItem btnRefuse;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 32981d0..12a6e95 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -66,6 +66,7 @@
btnGx.ItemClick += BtnGx_ItemClick;
btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
btnTBPrint.ItemClick += BtnTBPrint_ItemClick;
+ btnRefuse.ItemClick += BtnRefuse_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -252,6 +253,24 @@
UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
frm.ShowDialog();
}
+
+ //鎷掔
+ private void BtnRefuse_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnRefuseClick != null) btnRefuseClick(this, e);
+ else
+ return;
+
+ /* if (string.IsNullOrEmpty(guidKey))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
+ frm.ShowDialog();*/
+
+ }
+
private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -514,6 +533,7 @@
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
lst.Add(btnTBPrint.Name);
+ lst.Add(btnRefuse.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -568,6 +588,8 @@
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
lst.Add(btnTBPrint.Name);
+ lst.Add(btnRefuse.Name);
+
_enabledBtn(lst);
}
}
@@ -971,7 +993,10 @@
/// </summary>
public event EventHandler btnLogClick;
-
+ /// <summary>
+ /// 鎷掔
+ /// </summary>
+ public event EventHandler btnRefuseClick;
/// <summary>
/// 閲囪喘瀹℃牳
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index b01a577..4751ce3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -527,6 +527,59 @@
IbIgvBMhsY3btPuajr/ofExu8lLbQwAAAABJRU5ErkJggg==
</value>
</data>
+ <data name="btnRefuse.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAEdyaWQ7Rml4ZWRXaWR0aDvWXAxK
+ AAACCUlEQVQ4T6XNS08TURgG4JN4W3mJYNEBUm0bqGlJgI1/xIVFdy4UMRoFCypOOxQErS1tEbAUNZC0
+ BZ12eqFQDAb1J1ivK1moGBExkUtYvX5nWrRJJzHGkzz5zrznzTcMwH/RDP+FZpi2NmK24ZioWOpZ3FzH
+ pqyN4iOTlZ5KuyUBFzaYJbnWirSlQUyZ68WI4ShCwhFJq1sScGN6I4sazZJSUweZ/jxeZZKGK6o0u5ph
+ WF/LZINFHKs04aFgRKS6Rgzp9JpdzXBSbxYfCAYMlFdK/jJBCpZXY1x3WNTqlgRcoEyAb/8hybvvIPPu
+ rWDuPTrJvfsAPZV2+dlGdhTZ+Re7imxnTt/0c1fgCbguPzcLiTh9WTj7afZn4SCidwaiZwY3PNPo9GTQ
+ eSeDjr7ECyZRces4vFkocwt5TxcQoxmf+wC5yLXbU4U2aEEajG9cWd3E95+buO7O4L7yTjXKxd+qQvH3
+ GJXpTtp7U1j6saGy9yTB+Mart9IqvrGjL6WW2nuTsNO030ziCteTQFtBa7eCVpeCy644mJ2KX1fWyYZa
+ HJ54oxqaJNHXGJx4hSEyGMm71BXD4vIaPpOLzhhYW3cCX+hjcXld3TgQyf0RzcEfziEQfvnbBYeMT9/W
+ 8HFple6PwWxn7s6fOh/ClpMtI6qmliCazpHmEdiagwX3YDubnyfI8dP+Z78A9LmPpjWj5zAAAAAASUVO
+ RK5CYII=
+</value>
+ </data>
+ <data name="btnRefuse.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ taDZ75K/Ac6hxSfLJAohAAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>79</value>
</metadata>
--
Gitblit v1.9.3