From adc3fd8af6ff791cd3f924890419cd0cba385f51 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:48:34 +0800
Subject: [PATCH] 调整审核的文字提示
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 123 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 327add0..d961773 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Repository;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -35,7 +34,6 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-
}, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
@@ -63,13 +61,28 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
//Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
+ };
+
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
+ string _orgId = txt_fapporgid.GetId();
+ string _orgName = txt_fapporgid.GetName();
+ if (string.IsNullOrEmpty(_orgId)) return;
+ gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
+ gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
+ gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
+ gvMx1.SetFocusedRowCellValue("drOrgGuid", _orgId);
+ gvMx1.SetFocusedRowCellValue("drHz", _orgName);
+ gvMx1.SetFocusedRowCellValue("drHzGuid", _orgId);
+ gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
+ gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -97,7 +110,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -152,19 +165,20 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -212,8 +226,13 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
+ UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼渚涘簲鍟嗗拰缁勭粐srm,绂佺敤
+ txt_fapporgid.IsReadly = true;
+ txt_ftranstype.ReadOnly = true;
+ txt_fOwnerTypeIdHead.ReadOnly = true;
+ txt_fOwnerTypeInIdHead.ReadOnly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -228,6 +247,9 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);
+
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -252,13 +274,13 @@
//}
if (txt_fTransferDirect.SelectedIndex <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
txt_fTransferDirect.Focus();
return;
}
if (string.IsNullOrEmpty(sqOrg))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐢宠缁勭粐锛�");
txt_fapporgid.Focus();
return;
}
@@ -356,9 +378,9 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_fBillNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -368,10 +390,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -394,7 +418,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -437,7 +461,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -476,11 +500,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -521,13 +545,14 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -543,9 +568,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -554,13 +579,21 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
+
+
+ /// <summary>
+ /// 閫夋嫨鐗╂枡
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
@@ -575,6 +608,11 @@
gvMx1.UpdateCurrentRow();
}
+ /// <summary>
+ /// 鍒犻櫎鐗╂枡
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -604,13 +642,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -650,9 +690,10 @@
var strOrgGuid = dr["dcOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
return;
- };
+ }
+ ;
SelectCk frm = new SelectCk(strOrgGuid);
frm.UpdateParent += (ss, ee) =>
{
@@ -676,15 +717,17 @@
var dr = gvMx1.GetDataRow(rowhandle);
if (dr["dcCkGuid"] == null)
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
return;
- };
+ }
+ ;
var strCkGuid = dr["dcCkGuid"].ToString();
if (string.IsNullOrEmpty(strCkGuid))
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
return;
- };
+ }
+ ;
SelectCw frm = new SelectCw(strCkGuid);
frm.UpdateParent += (ss, ee) =>
{
@@ -730,9 +773,10 @@
var strOrgGuid = dr["drOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
return;
- };
+ }
+ ;
SelectCk frm = new SelectCk(strOrgGuid);
frm.UpdateParent += (ss, ee) =>
{
@@ -756,15 +800,17 @@
var dr = gvMx1.GetDataRow(rowhandle);
if (dr["drCkGuid"] == null)
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
return;
- };
+ }
+ ;
var strCkGuid = dr["drCkGuid"].ToString();
if (string.IsNullOrEmpty(strCkGuid))
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
return;
- };
+ }
+ ;
SelectCw frm = new SelectCw(strCkGuid);
frm.UpdateParent += (ss, ee) =>
{
@@ -786,7 +832,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
//if (rowhandle < 0)
// return;
- int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
+ int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
//if (_drhzlx <= 0)
//{
// MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
@@ -799,6 +845,7 @@
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("drHz", lst[0].name);
gvMx1.SetFocusedRowCellValue("drHzGuid", lst[0].guid);
+
};
frm.ShowDialog();
}
--
Gitblit v1.9.3