From 2b1c73c9f79ff6118324581e9ab6138e944d0bfe Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 四月 2025 15:29:41 +0800
Subject: [PATCH] 多级审核
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 96 ++++++++++++------------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 47 ++++++-----
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 26 +++---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 51 ++++++++++++
4 files changed, 136 insertions(+), 84 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 28c5bfd..4b9bb93 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -297,8 +297,6 @@
this.gv_qt014.OptionsColumn.AllowEdit = false;
this.gv_qt014.Tag = "query_a.qt014";
this.gv_qt014.UnboundDataType = typeof(bool);
- this.gv_qt014.Visible = true;
- this.gv_qt014.VisibleIndex = 1;
this.gv_qt014.Width = 50;
//
// gv_qtck
@@ -311,7 +309,7 @@
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 2;
+ this.gv_qtck.VisibleIndex = 1;
this.gv_qtck.Width = 100;
//
// gridColumn3
@@ -321,7 +319,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 94;
//
// gv_qt020
@@ -334,7 +332,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 4;
+ this.gv_qt020.VisibleIndex = 3;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -344,7 +342,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 5;
+ this.gridColumn4.VisibleIndex = 4;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -357,7 +355,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 6;
+ this.gv_qt005.VisibleIndex = 5;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -370,7 +368,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 7;
+ this.gv_qt001.VisibleIndex = 6;
this.gv_qt001.Width = 180;
//
// gv_qt008
@@ -383,7 +381,7 @@
this.gv_qt008.OptionsColumn.AllowEdit = false;
this.gv_qt008.Tag = "query_a.qt008";
this.gv_qt008.Visible = true;
- this.gv_qt008.VisibleIndex = 8;
+ this.gv_qt008.VisibleIndex = 7;
this.gv_qt008.Width = 94;
//
// gv_qt010
@@ -396,7 +394,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 9;
+ this.gv_qt010.VisibleIndex = 8;
this.gv_qt010.Width = 94;
//
// gv_qt016
@@ -409,7 +407,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 10;
+ this.gv_qt016.VisibleIndex = 9;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -422,7 +420,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 11;
+ this.gv_qt002.VisibleIndex = 10;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -432,7 +430,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.VisibleIndex = 11;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -442,7 +440,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 13;
+ this.gridColumn6.VisibleIndex = 12;
this.gridColumn6.Width = 94;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 9f19828..33fff5f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -34,6 +34,10 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
+ toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
+ toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
+ toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
@@ -86,6 +90,8 @@
};
}
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -394,7 +400,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;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
@@ -518,6 +524,49 @@
}
/// <summary>
+ /// 鍞悗瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouChkClick(object sender, EventArgs e)
+ {
+ _toolCk(20);
+ }
+
+ /// <summary>
+ /// 鍞悗鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(21);
+ }
+
+ /// <summary>
+ /// 璐㈠姟瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e)
+ {
+ _toolCk(30);
+ }
+ /// <summary>
+ /// 璐㈠姟鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(31);
+ }
+
+ /// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 23498b1..39f1d89 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -64,13 +64,13 @@
this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouHouChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -127,8 +127,8 @@
this.btnShouJian,
this.btnCaiWuChk,
this.btnCaiWuFchk,
- this.barLargeButtonItem1,
- this.barLargeButtonItem2});
+ this.btnShouHouChk,
+ this.btnShouHouFchk});
this.barManager1.MainMenu = this.bar2;
this.barManager1.MaxItemId = 62;
//
@@ -174,8 +174,8 @@
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouChk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
@@ -497,6 +497,42 @@
this.btnOa.Name = "btnOa";
this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnShouHouChk
+ //
+ this.btnShouHouChk.Caption = "鍞悗瀹℃牳";
+ this.btnShouHouChk.Id = 60;
+ this.btnShouHouChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_16x163;
+ this.btnShouHouChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.user_32x321;
+ this.btnShouHouChk.Name = "btnShouHouChk";
+ this.btnShouHouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnShouHouFchk
+ //
+ this.btnShouHouFchk.Caption = "鍞悗鍙嶅鏍�";
+ this.btnShouHouFchk.Id = 61;
+ this.btnShouHouFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.employee_16x161;
+ this.btnShouHouFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.employee_32x322;
+ this.btnShouHouFchk.Name = "btnShouHouFchk";
+ this.btnShouHouFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnCaiWuChk
+ //
+ this.btnCaiWuChk.Caption = "璐㈠姟瀹℃牳";
+ this.btnCaiWuChk.Id = 58;
+ this.btnCaiWuChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
+ this.btnCaiWuChk.Name = "btnCaiWuChk";
+ this.btnCaiWuChk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnCaiWuFchk
+ //
+ this.btnCaiWuFchk.Caption = "璐㈠姟鍙嶅鏍�";
+ this.btnCaiWuFchk.Id = 59;
+ this.btnCaiWuFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insertdatafield_32x32;
+ this.btnCaiWuFchk.Name = "btnCaiWuFchk";
+ this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnLayout
//
this.btnLayout.Caption = "鐗堥潰";
@@ -524,42 +560,6 @@
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
//
- // btnCaiWuChk
- //
- this.btnCaiWuChk.Caption = "璐㈠姟瀹℃牳";
- this.btnCaiWuChk.Id = 58;
- this.btnCaiWuChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
- this.btnCaiWuChk.Name = "btnCaiWuChk";
- this.btnCaiWuChk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.btnCaiWuChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnCaiWuFchk
- //
- this.btnCaiWuFchk.Caption = "璐㈠姟鍙嶅鏍�";
- this.btnCaiWuFchk.Id = 59;
- this.btnCaiWuFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insertdatafield_32x32;
- this.btnCaiWuFchk.Name = "btnCaiWuFchk";
- this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // barLargeButtonItem1
- //
- this.barLargeButtonItem1.Caption = "鍞悗瀹℃牳";
- this.barLargeButtonItem1.Id = 60;
- this.barLargeButtonItem1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_16x163;
- this.barLargeButtonItem1.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.user_32x321;
- this.barLargeButtonItem1.Name = "barLargeButtonItem1";
- this.barLargeButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // barLargeButtonItem2
- //
- this.barLargeButtonItem2.Caption = "鍞悗鍙嶅鏍�";
- this.barLargeButtonItem2.Id = 61;
- this.barLargeButtonItem2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.employee_16x161;
- this.barLargeButtonItem2.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.employee_32x322;
- this.barLargeButtonItem2.Name = "barLargeButtonItem2";
- this.barLargeButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -572,7 +572,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 66);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -601,7 +601,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 66);
+ this.Size = new System.Drawing.Size(1543, 67);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -651,7 +651,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnShouJian;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuChk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuFchk;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2;
+ private DevExpress.XtraBars.BarLargeButtonItem btnShouHouChk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnShouHouFchk;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 1aa1f91..87a4934 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -60,7 +60,8 @@
btnShouJian.ItemClick += BtnShouJian_ItemClick;
btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick;
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
-
+ btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
+ btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -68,9 +69,7 @@
lst.Add(item.Caption);
actions = lst;
}
-
-
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -159,26 +158,22 @@
if (btnCaiWuChkClick != null)
btnCaiWuChkClick(this, e);
}
+ private void BtnShouHouFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnShouHouFchkClick != null)
+ btnShouHouFchkClick(this, e);
+ }
+
+ private void BtnShouHouChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnShouHouChkClick != null)
+ btnShouHouChkClick(this, e);
+ }
private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnZhiLiangFchkClick != null)
btnZhiLiangFchkClick(this, e);
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�"))
- // return;
- //_ckService("-3");
}
private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
@@ -970,11 +965,21 @@
/// <summary>
- /// 璐ㄩ噺鍙嶅鏍�
+ /// 璐㈠姟鍙嶅鏍�
/// </summary>
public event EventHandler btnCaiWuFchkClick;
-
+ /// <summary>
+ /// 鍞悗瀹℃牳
+ /// </summary>
+ public event EventHandler btnShouHouChkClick;
+
+
+ /// <summary>
+ /// 鍞悗鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnShouHouFchkClick;
+
/// <summary>
/// 椹冲洖
/// </summary>
--
Gitblit v1.9.3