Merge remote-tracking branch 'origin/master'

啊鑫

2024-10-29 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -37,12 +37,18 @@
            btnFchk.ItemClick += BtnFchk_ItemClick;
            btnJianYan.ItemClick += BtnJianYan_ItemClick;
            btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
            btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
                    if (!string.IsNullOrEmpty(item.Caption))
                        lst.Add(item.Caption);
            actions = lst;
        }

        private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnPiZhunClick != null) btnPiZhunClick(this, e);
        }


@@ -631,6 +637,12 @@
        /// </summary>
        public event EventHandler btnFjianYanClick;


        /// <summary>
        ///    批准
        /// </summary>
        public event EventHandler btnPiZhunClick;

        #endregion

        #region 公共属性
@@ -663,7 +675,7 @@
        public string xlsInService { get; set; }

        /// <summary>
        ///     审核参数,表名,字段名，如：MES_HOLIDAY,check_date,check_status,check_by
        ///     审核参数,表名,字段名，如：MES_HOLIDAY,check_date,check_status,check_by,存储过程名
        /// </summary>
        public string chkParameter { get; set; }