From d03323ba9592a0b83ac210faa148f0032155fa83 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 18 六月 2025 09:31:10 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 112 +++++++++++++--------
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 42 +++----
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs | 61 +++++++++---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 53 +++-------
4 files changed, 148 insertions(+), 120 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 48c4bf3..876b1ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -50,11 +50,6 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -233,8 +228,6 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -395,7 +388,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
@@ -2308,8 +2300,6 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.rptChongDa});
this.gcMx2.Size = new System.Drawing.Size(1648, 386);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2334,8 +2324,7 @@
this.gvMx2createDate,
this.gridColumn30,
this.gridColumn31,
- this.gridColumn32,
- this.gvBtnAlawys});
+ this.gridColumn32});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2487,27 +2476,6 @@
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 11;
this.gridColumn32.Width = 94;
- //
- // gvBtnAlawys
- //
- this.gvBtnAlawys.Caption = "閲嶆墦";
- this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
- this.gvBtnAlawys.MinWidth = 25;
- this.gvBtnAlawys.Name = "gvBtnAlawys";
- this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 12;
- this.gvBtnAlawys.Width = 94;
- //
- // rptChongDa
- //
- this.rptChongDa.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.rptChongDa.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.rptChongDa.Name = "rptChongDa";
- this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// xtraTabPage3
//
@@ -2748,6 +2716,7 @@
this.gridColumn33.FieldName = "guid";
this.gridColumn33.MinWidth = 50;
this.gridColumn33.Name = "gridColumn33";
+ this.gridColumn33.OptionsColumn.ReadOnly = true;
this.gridColumn33.Tag = "query_a.guid";
this.gridColumn33.Width = 94;
//
@@ -2758,6 +2727,7 @@
this.gridColumn38.FieldName = "daa001";
this.gridColumn38.MinWidth = 50;
this.gridColumn38.Name = "gridColumn38";
+ this.gridColumn38.OptionsColumn.ReadOnly = true;
this.gridColumn38.Tag = "query_a.UNIT";
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 0;
@@ -2770,6 +2740,7 @@
this.gridColumn36.FieldName = "barCode";
this.gridColumn36.MinWidth = 50;
this.gridColumn36.Name = "gridColumn36";
+ this.gridColumn36.OptionsColumn.ReadOnly = true;
this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 1;
@@ -2782,6 +2753,7 @@
this.gridColumn37.FieldName = "quantity";
this.gridColumn37.MinWidth = 50;
this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.OptionsColumn.ReadOnly = true;
this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gridColumn37.Tag = "query_a.QUANTITY";
@@ -2796,6 +2768,7 @@
this.gridColumn42.FieldName = "createBy";
this.gridColumn42.MinWidth = 50;
this.gridColumn42.Name = "gridColumn42";
+ this.gridColumn42.OptionsColumn.ReadOnly = true;
this.gridColumn42.Tag = "query_a.CREATE_BY";
this.gridColumn42.Visible = true;
this.gridColumn42.VisibleIndex = 3;
@@ -2808,6 +2781,7 @@
this.gridColumn43.FieldName = "createDate";
this.gridColumn43.MinWidth = 50;
this.gridColumn43.Name = "gridColumn43";
+ this.gridColumn43.OptionsColumn.ReadOnly = true;
this.gridColumn43.Tag = "query_a.CREATE_DATE";
this.gridColumn43.Visible = true;
this.gridColumn43.VisibleIndex = 4;
@@ -2819,6 +2793,7 @@
this.gridColumn34.FieldName = "lineId";
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.OptionsColumn.ReadOnly = true;
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 5;
this.gridColumn34.Width = 94;
@@ -2829,6 +2804,7 @@
this.gridColumn35.FieldName = "xtName";
this.gridColumn35.MinWidth = 25;
this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 6;
this.gridColumn35.Width = 94;
@@ -3076,6 +3052,7 @@
this.gridColumn39.FieldName = "guid";
this.gridColumn39.MinWidth = 50;
this.gridColumn39.Name = "gridColumn39";
+ this.gridColumn39.OptionsColumn.ReadOnly = true;
this.gridColumn39.Tag = "query_a.guid";
this.gridColumn39.Width = 94;
//
@@ -3086,6 +3063,7 @@
this.gridColumn40.FieldName = "daa001";
this.gridColumn40.MinWidth = 50;
this.gridColumn40.Name = "gridColumn40";
+ this.gridColumn40.OptionsColumn.ReadOnly = true;
this.gridColumn40.Tag = "query_a.UNIT";
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 0;
@@ -3098,6 +3076,7 @@
this.gridColumn41.FieldName = "itemBarcode";
this.gridColumn41.MinWidth = 50;
this.gridColumn41.Name = "gridColumn41";
+ this.gridColumn41.OptionsColumn.ReadOnly = true;
this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
this.gridColumn41.Visible = true;
this.gridColumn41.VisibleIndex = 1;
@@ -3110,6 +3089,7 @@
this.gridColumn44.FieldName = "quantity";
this.gridColumn44.MinWidth = 50;
this.gridColumn44.Name = "gridColumn44";
+ this.gridColumn44.OptionsColumn.ReadOnly = true;
this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gridColumn44.Tag = "query_a.QUANTITY";
@@ -3124,6 +3104,7 @@
this.gridColumn45.FieldName = "createBy";
this.gridColumn45.MinWidth = 50;
this.gridColumn45.Name = "gridColumn45";
+ this.gridColumn45.OptionsColumn.ReadOnly = true;
this.gridColumn45.Tag = "query_a.CREATE_BY";
this.gridColumn45.Visible = true;
this.gridColumn45.VisibleIndex = 3;
@@ -3136,6 +3117,7 @@
this.gridColumn46.FieldName = "createDate";
this.gridColumn46.MinWidth = 50;
this.gridColumn46.Name = "gridColumn46";
+ this.gridColumn46.OptionsColumn.ReadOnly = true;
this.gridColumn46.Tag = "query_a.CREATE_DATE";
this.gridColumn46.Visible = true;
this.gridColumn46.VisibleIndex = 4;
@@ -3147,6 +3129,7 @@
this.gridColumn47.FieldName = "aboutTbBarcode";
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.OptionsColumn.ReadOnly = true;
this.gridColumn47.Visible = true;
this.gridColumn47.VisibleIndex = 5;
this.gridColumn47.Width = 94;
@@ -3157,6 +3140,7 @@
this.gridColumn48.FieldName = "aboutTracBarcode";
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.OptionsColumn.ReadOnly = true;
this.gridColumn48.Visible = true;
this.gridColumn48.VisibleIndex = 6;
this.gridColumn48.Width = 94;
@@ -3294,7 +3278,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
this.splitMx98.Panel1.ResumeLayout(false);
@@ -3459,8 +3442,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index c01f4a0..d396cf2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -67,12 +67,78 @@
};
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
-
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鎵樻澘鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_daa{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
};
//杩欐槸杩芥函鐮�
this.ucBtnPrint98.btnPrintClick += (s, e) =>
{
_print98();
+ };
+ this.ucBtnPrint98.btnAllClick += (s, e) =>
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
};
//杩欐槸鍚庣洊鐮�
this.ucBtnPrint100.btnPrintClick += (s, e) =>
@@ -833,49 +899,7 @@
+ "," + ""
+ "}";
}
-
- /// <summary>
- /// 閲嶆墦
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
-
- MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
- return;
- var rowhandle = gvMx2.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var _obj = new
- {
- mxGuid = mxGuid,
- inType = "daa"
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "VArrivalBarcodeManager/DeleteBarcode",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
+
#endregion
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
index 4305f96..3acf403 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
@@ -37,9 +37,11 @@
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colT1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colT2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
- this.btnDelete = new DevExpress.XtraEditors.SimpleButton();
this.btnPrint = new DevExpress.XtraEditors.SimpleButton();
+ this.btnDelete = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -81,7 +83,9 @@
this.gv_billNo,
this.gv_supplierItemName,
this.gridColumn3,
- this.gv_supplierItemCode});
+ this.gv_supplierItemCode,
+ this.colT1,
+ this.colT2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -139,7 +143,7 @@
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.VisibleIndex = 2;
this.gv_supplierItemName.Width = 276;
//
// gridColumn3
@@ -150,7 +154,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 275;
//
// gv_supplierItemCode
@@ -164,8 +168,30 @@
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.VisibleIndex = 4;
this.gv_supplierItemCode.Width = 275;
+ //
+ // colT1
+ //
+ this.colT1.Caption = "缁戝畾鎵樻澘鐮�";
+ this.colT1.FieldName = "t1";
+ this.colT1.MinWidth = 25;
+ this.colT1.Name = "colT1";
+ this.colT1.Tag = "query_a.t1";
+ this.colT1.Visible = true;
+ this.colT1.VisibleIndex = 5;
+ this.colT1.Width = 94;
+ //
+ // colT2
+ //
+ this.colT2.Caption = "缁戝畾杩芥函鐮�";
+ this.colT2.FieldName = "t2";
+ this.colT2.MinWidth = 25;
+ this.colT2.Name = "colT2";
+ this.colT2.Tag = "query_a.t2";
+ this.colT2.Visible = true;
+ this.colT2.VisibleIndex = 6;
+ this.colT2.Width = 94;
//
// panelControl3
//
@@ -177,17 +203,6 @@
this.panelControl3.Size = new System.Drawing.Size(834, 38);
this.panelControl3.TabIndex = 6;
//
- // btnDelete
- //
- this.btnDelete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.btnDelete.Appearance.Options.UseBackColor = true;
- this.btnDelete.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- this.btnDelete.Location = new System.Drawing.Point(701, -1);
- this.btnDelete.Name = "btnDelete";
- this.btnDelete.Size = new System.Drawing.Size(94, 39);
- this.btnDelete.TabIndex = 5;
- this.btnDelete.Text = "鎵归噺鍒犻櫎";
- //
// btnPrint
//
this.btnPrint.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
@@ -198,6 +213,18 @@
this.btnPrint.Size = new System.Drawing.Size(94, 29);
this.btnPrint.TabIndex = 6;
this.btnPrint.Text = "鎵归噺閲嶆墦";
+ //
+ // btnDelete
+ //
+ this.btnDelete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.btnDelete.Appearance.Options.UseBackColor = true;
+ this.btnDelete.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ this.btnDelete.Location = new System.Drawing.Point(701, -1);
+ this.btnDelete.Name = "btnDelete";
+ this.btnDelete.Size = new System.Drawing.Size(94, 39);
+ this.btnDelete.TabIndex = 5;
+ this.btnDelete.Text = "鎵归噺鍒犻櫎";
+ this.btnDelete.Visible = false;
//
// SelectDeleteBar
//
@@ -234,5 +261,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraEditors.SimpleButton btnDelete;
private DevExpress.XtraEditors.SimpleButton btnPrint;
+ private DevExpress.XtraGrid.Columns.GridColumn colT1;
+ private DevExpress.XtraGrid.Columns.GridColumn colT2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
index b426905..5feff55 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -31,6 +31,23 @@
this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
this.aboutGuid = _aboutGuid;
this.aboutType = _aboutType;
+ this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�";
+ switch (aboutType)
+ {
+ case "鍚庣洊鐮�":
+ btnDelete.Visible = true;
+ colT1.Caption = "缁戝畾鎵樻澘鐮�";
+ colT2.Caption = "缁戝畾杩芥函鐮�";
+ break;
+ case "杩芥函鐮�":
+ colT1.Caption = "绾夸綋缂栧彿";
+ colT2.Caption = "绾夸綋鍚嶇О";
+ break;
+ default:
+ colT1.Caption = "鍏ュ簱浜�";
+ colT2.Caption = "鍏ュ簱鏃ユ湡";
+ break;
+ }
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
btnDelete.Click += (s, e) =>
@@ -112,7 +129,7 @@
MsgHelper.Warning("璇峰嬀閫変綘瑕佹墦鍗扮殑鏉＄爜锛�");
return;
}
-
+
UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString() }); Close();
};
}
@@ -156,28 +173,5 @@
}
- private bool _ckRptService(string _guidKey, string _rptParameter)
- {
- try
- {
- var _obj = new
- {
- guid = _guidKey,
- _rptParameter,
- isDesign = 1
- };
- var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) return true;
- return false;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return true;
- }
- return false;
- }
}
}
\ No newline at end of file
--
Gitblit v1.9.3