销售功能挪移

cnf

6 天以前 44c37aed88aac50a6c2ae140f47bf3d01d174c71

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -57,6 +57,7 @@
            btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
            btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
            btnHb.ItemClick += BtnHb_ItemClick;
            btnChbg.ItemClick += BtnChbg_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
@@ -310,24 +311,24 @@
                btnPrintClick(this, e);
            else
                return;
            //2025-09-01 kyy 注释不使用这个公用方法
            //if (rptParameter == "return false")
            //    return;
            //if (string.IsNullOrEmpty(rptParameter))
            //{
            //    MsgHelper.ShowError("没有指定报表参数，请联系技术开发人员！");
            //    return;
            //}
            //var _bl = false;
            //_bl = _ckRptService();
            //if (_bl)
            //{
            //    var frm = new RptPreview(guidKey, rptParameter);
            //    frm.ShowDialog();
            //    return;
            //}

            if (rptParameter == "return false")
                return;
            if (string.IsNullOrEmpty(rptParameter))
            {
                MsgHelper.ShowError("没有指定报表参数，请联系技术开发人员！");
                return;
            }
            var _bl = false;
            _bl = _ckRptService();
            if (_bl)
            {
                var frm = new RptPreview(guidKey, rptParameter);
                frm.ShowDialog();
                return;
            }

            MsgHelper.ShowError("没有设计模板，请先设计模板！");
            //MsgHelper.ShowError("没有设计模板，请先设计模板！");
        }

        private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
@@ -399,6 +400,7 @@
                lst.Add(btnShouHouChk.Name);
                lst.Add(btnShouHouFchk.Name);
                lst.Add(btnHb.Name);
                lst.Add(btnChbg.Name);
                _enabledBtn(lst);
                this.currentAction = "esc";
                if (btnEscClick != null) btnEscClick(this, e);
@@ -446,6 +448,8 @@
                    lst.Add(btnShouHouChk.Name);
                    lst.Add(btnShouHouFchk.Name);
                    lst.Add(btnEdit.Name);
                    lst.Add(btnHb.Name);
                    lst.Add(btnChbg.Name);
                    _enabledBtn(lst);
                }

@@ -532,7 +536,14 @@

        private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnHbClick != null) btnHbClick(this, e);
            
            bool bl = _isCk(1);
            if (bl) return;
            if (btnHbClick != null)
            {
                btnHbClick(this, e);
            }
            return;
        }


@@ -599,6 +610,13 @@
            Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont();
            DevFrm.ShowDialog();
        }

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


        private void _enabledBtn(List<string> lstBtn)
        {
            foreach (BarItem item in barManager1.Items)
@@ -980,6 +998,11 @@
        /// </summary>
        public event EventHandler btnHbClick;

        /// <summary>
        ///    撤回报工
        /// </summary>
        public event EventHandler btnChbgClick;

        #endregion

        #region 公共属性
@@ -1112,7 +1135,6 @@
            }
            return spcList;
        }

        /// <summary>
        /// 读取xml配置，目前配置gcMain1,layoutMx1,加查询条件
        /// </summary>