Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

lu

2024-11-11 acb4d0f2ee702dadf3656126fa7c4feae03c0357

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -54,6 +54,7 @@




        /// <summary>
        ///     初始化按钮状态
        /// </summary>
@@ -62,6 +63,9 @@
            base.OnCreateControl();
            if (Parent != null) getNamespace();
        }



        private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBoHuiClick != null)
@@ -372,18 +376,24 @@

        private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnReportClick != null)
                btnReportClick(this, e);
            else
                return;

            if (rptParameter == "return false")
                return;
            if (string.IsNullOrEmpty(rptParameter))
            {
                MsgHelper.ShowError("没有指定报表参数，请联系技术开发人员！");
                return;
            }

            var _bl = false;
            _bl = _ckRptService();
            if (_bl)
            {
                var frm = new RptPreview(rptParameter);
                frm.Show();
                var frm = new RptPreview(guidKey, rptParameter);
                frm.ShowDialog();
                return;
            }

@@ -392,24 +402,27 @@

        private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnDesignClick != null)
                btnDesignClick(this, e);
            else
                return;

            if (string.IsNullOrEmpty(rptParameter))
            {
                MsgHelper.ShowError("没有指定报表参数，请联系技术开发人员！");
                return;
            }

            var _bl = false;
            _bl = _ckRptService();
            //如果已经有模板了，直接打开设置模板
            if (_bl)
            {
                var frm = new EasyRptDesign(rptParameter);
                frm.Show();
                var frm = new EasyRptDesign(guidKey, rptParameter);
                frm.ShowDialog();
                return;
            }

            //否则向导设计模板
            var rptWizard = new ShowRptWizard(rptParameter);
            var rptWizard = new ShowRptWizard(guidKey, rptParameter);
            rptWizard.ShowDialog();
        }

@@ -665,9 +678,11 @@
            {
                var _obj = new
                {
                    rptParameter
                    guid = guidKey,
                    rptParameter,
                    isDesign = 1
                };
                var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
                var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0) return true;
@@ -806,6 +821,20 @@
        /// </summary>
        public event EventHandler btnBoHuiClick;

        /// <summary>
        /// 打印
        /// </summary>
        public event EventHandler btnPrintClick;

        /// <summary>
        /// 设置报表
        /// </summary>
        public event EventHandler btnDesignClick;

        /// <summary>
        /// 报表
        /// </summary>
        public event EventHandler btnReportClick;
        #endregion

        #region 公共属性