From c03605a41b7aff06afd0407b0133a7cabf982b71 Mon Sep 17 00:00:00 2001 From: luoxingjian <1010378449@qq.com> Date: Fri, 29 Nov 2024 14:10:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=AE=B3=E5=9B=A0=E7=B4=A0=E5=8F=8C?= =?UTF-8?q?=E5=87=BB=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/DictHTypeFItem.cs | 1 - PEIS/View/Setting/HazardTypeForm.Designer.cs | 2 +- PEIS/View/Setting/HazardTypeForm.cs | 95 ++++---------------- 3 files changed, 20 insertions(+), 78 deletions(-) diff --git a/PEIS/Entity/DictHTypeFItem.cs b/PEIS/Entity/DictHTypeFItem.cs index 643e375..7c580e8 100644 --- a/PEIS/Entity/DictHTypeFItem.cs +++ b/PEIS/Entity/DictHTypeFItem.cs @@ -61,6 +61,5 @@ namespace PEIS.Entity public String DeptName { get; set; } public String ItemClass { get; set; } public Decimal Price { get; set; } - public bool isNew { get; set; } = false; } } diff --git a/PEIS/View/Setting/HazardTypeForm.Designer.cs b/PEIS/View/Setting/HazardTypeForm.Designer.cs index ae80d62..b7eb55b 100644 --- a/PEIS/View/Setting/HazardTypeForm.Designer.cs +++ b/PEIS/View/Setting/HazardTypeForm.Designer.cs @@ -488,7 +488,7 @@ this.gVFeelItem.OptionsView.ShowPreviewRowLines = DevExpress.Utils.DefaultBoolean.False; this.gVFeelItem.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.False; this.gVFeelItem.OptionsView.ShowViewCaption = true; - this.gVFeelItem.ViewCaption = "双击添加到接害类型下，再进行保存"; + this.gVFeelItem.ViewCaption = "双击添加到接害类型下"; // // ID1 // diff --git a/PEIS/View/Setting/HazardTypeForm.cs b/PEIS/View/Setting/HazardTypeForm.cs index 6c40252..8470c3f 100644 --- a/PEIS/View/Setting/HazardTypeForm.cs +++ b/PEIS/View/Setting/HazardTypeForm.cs @@ -19,7 +19,6 @@ namespace PEIS.View.Setting { public partial class HazardTypeForm : ViewBase,IHazardTypeView { - public bool isChange = false; public HazardTypeForm() { InitializeComponent(); @@ -35,10 +34,9 @@ namespace PEIS.View.Setting opMenuRelation.TsmiRefresh.Visible = true; opMenuRelation.TsmiAdd.Visible = false; opMenuRelation.TsmiDelete.Visible = true; - opMenuRelation.TsmiSave.Visible = true; + opMenuRelation.TsmiSave.Visible = false; opMenuRelation.TsmiSearch.Visible = false; opMenuRelation.TstbKey.Visible = false; - opMenuRelation.TsmiSave.Click += TsmiSave_Click; opMenuRelation.TsmiDelete.Click += TsmiDelete_Click; opMenuRelation.TsmiRefresh.Click += TsmiRefresh_Click2; @@ -128,23 +126,17 @@ namespace PEIS.View.Setting Global.Msg("info", "项目已经存在"); return; } - isChange = true; - HTypeFItemInfo hTypeFItem = new HTypeFItemInfo(); - hTypeFItem.ID = HFeelItem.Count == 0 ? 1 : (HFeelItem.Select(p => p.ID).OrderByDescending(p => p).ToList()[0]+1); - hTypeFItem.HID = hazardTypeRow.ID; - hTypeFItem.FID = feeItemRow.ID; - hTypeFItem.FeeItemCode = feeItemRow.FeeItemCode; - hTypeFItem.FeeItemName = feeItemRow.FeeItemName; - hTypeFItem.Sort = HFeelItem.Count + 1; - hTypeFItem.SettlePrice = feeItemRow.SettlePrice; - hTypeFItem.Unit = feeItemRow.Unit; - hTypeFItem.UnitName = feeItemRow.UnitName; - hTypeFItem.DeptName = feeItemRow.DeptName; - hTypeFItem.ItemClass = feeItemRow.ItemClass; - hTypeFItem.Price = feeItemRow.Price; - hTypeFItem.isNew = true; - HFeelItem.Add(hTypeFItem); - Invoke(new Action(() => { gCHFeelItem.DataSource = null; gCHFeelItem.DataSource = HFeelItem; })); + DictHTypeFItem dictHType = new DictHTypeFItem(); + dictHType.FID = feeItemRow.ID; + dictHType.HID = hazardTypeRow.ID ; + dictHType.FeeItemCode = feeItemRow.FeeItemName; + dictHType.Sort = HFeelItem.Count + 1; + var result = dictHType.Save(); + if (result) + { + LoadHTypeFItem(); + } + } #endregion #region 接害类型关联检查项目 @@ -160,46 +152,6 @@ namespace PEIS.View.Setting var hazardTypeRow = gVHazardType.GetRow(hazardTypeIndex) as DictHazardType; GetHTypeFItem?.Invoke(this, new Args() { Eid = hazardTypeRow.ID }); } - private void TsmiSave_Click(object sender, EventArgs e) - { - if (isChange) - { - var HFeelItem = gCHFeelItem.DataSource as List; - if (HFeelItem != null && HFeelItem.Count > 0) - { - int hazardTypeIndex = gVHazardType.FocusedRowHandle; - var hazardTypeRow = gVHazardType.GetRow(hazardTypeIndex) as DictHazardType; - Model.Setting.HazardTypeModel hazardType = new Model.Setting.HazardTypeModel(); - var alreadlydata = hazardType.GetDictHTypeFItem(hazardTypeRow.ID); - if (alreadlydata != null && alreadlydata.Count > 0) - { - foreach (var item in alreadlydata) - { - item.Delete(); - } - } - foreach (var item in HFeelItem) - { - DictHTypeFItem dictHType = new DictHTypeFItem(); - dictHType.FID = item.FID; - dictHType.HID = item.HID; - dictHType.FeeItemCode = item.FeeItemCode; - dictHType.Sort = item.Sort; - dictHType.Save(); - } - } - else - { - Global.Msg("info", "没有需要保存的数据"); - } - isChange = false; - } - else - { - Global.Msg("info", "数据已经保存"); - } - - } private void TsmiDelete_Click(object sender, EventArgs e) { int hazardTypeIndex = gVHFeelItem.FocusedRowHandle; @@ -209,22 +161,13 @@ namespace PEIS.View.Setting var resultDel = Global.MsgDelete($"是否确认删除{hazardTypeRow.FeeItemName}"); if (resultDel) { - if (hazardTypeRow.isNew) - { - var HFeelItemData = gVHFeelItem.DataSource as List; - HFeelItemData.Remove(hazardTypeRow); - Invoke(new Action(() => { gCHFeelItem.DataSource = null; gCHFeelItem.DataSource = HFeelItemData; })); - } - else - { - DictHTypeFItem dictHType = new DictHTypeFItem(); - dictHType.ID = hazardTypeRow.ID; - var result = dictHType.Delete(); - if (result) - { - LoadHTypeFItem(); - } - } + DictHTypeFItem dictHType = new DictHTypeFItem(); + dictHType.ID = hazardTypeRow.ID; + var result = dictHType.Delete(); + if (result) + { + LoadHTypeFItem(); + } } } else {