From 4bc7030c4cea5b3deed0c938ec388ae94e33c51c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 09:42:36 +0800
Subject: [PATCH] 修改会页

---
 DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs |  118 ++++++-----------------------------------------------------
 1 files changed, 12 insertions(+), 106 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
index 0cc0003..a152a48 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
@@ -14,10 +14,10 @@
     public partial class ShowRptWizard : DevExpress.XtraEditors.XtraForm
     {
 
-        private string _reportType;
-        public ShowRptWizard(string reportType)
+        private string _rptParameter;
+        public ShowRptWizard(string rptParameter)
         {
-            _reportType = reportType;
+            _rptParameter = rptParameter;
             InitializeComponent();
             wizardControl1.NextClick += WizardControl1_NextClick;
             wizardControl1.FinishClick += WizardControl1_FinishClick;
@@ -25,31 +25,10 @@
 
         private void WizardControl1_FinishClick(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            System.Text.StringBuilder sb = new System.Text.StringBuilder();
-            foreach (DevExpress.XtraEditors.GroupControl ctrl in this.wizardPage2.Controls)
-            {
-                if (ctrl is GroupControl)
-                {
-                    GroupControl _grpBox = ctrl as GroupControl;
-                    foreach (DevExpress.XtraEditors.CheckedListBoxControl _ckBox in _grpBox.Controls)
-                    {
-                        CheckedListBoxControl _kk = _ckBox as CheckedListBoxControl;
-                        for (int i = 0; i < _ckBox.ItemCount; i++)
-                        {
-                            if (_ckBox.GetItemChecked(i))
-                            {
-                                if (sb.Length > 0)
-                                    sb.Append(",");
-                                sb.Append(_ckBox.GetItemValue(i).ToString());
-                            }
-                        }
-                    }
-                }
-            }
             var _obj = new
             {
-                rptType = _reportType,
-                colDec = sb.ToString(),
+                rptParameter = this._rptParameter,
+                // rptData = null,鍒濆鏃朵笉鐢ㄨ璁℃ā鏉�
             };
             try
             {
@@ -57,13 +36,17 @@
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this._reportType);
+                    Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this._rptParameter);
                     frm.Show();
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message.ToString());
             }
         }
 
@@ -71,87 +54,10 @@
         {
             if (this.wizardControl1.SelectedPage == this.welcomeWizardPage1)
             {
-                _getTable();
-                return;
-            }
-            if (this.wizardControl1.SelectedPage == this.wizardPage1)
-            {
-                _getZiDuan();
+                this.lbParameter.Text = "璇ユ姤琛ㄤ娇鐢ㄤ簡濡備笅鍙傛暟锛�" + _rptParameter;
                 return;
             }
         }
 
-        private void _getTable()
-        {
-            chkTable.Items.Clear();
-            var _obj = new
-            {
-            };
-            string strReturn = "";
-            try
-            {
-                strReturn = UtilityHelper.HttpPost("", "Report/GetTableList", JsonConvert.SerializeObject(_obj));
-                ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
-                DataTable dt = dd.rtnData;
-                chkTable.DisplayMember = "tableDesc";
-                chkTable.ValueMember = "tableName";
-                chkTable.DataSource = dt;
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        private void _getZiDuan()
-        {
-            this.wizardPage2.Controls.Clear();
-            System.Text.StringBuilder sb = new System.Text.StringBuilder();
-            for (int i = 0; i < chkTable.ItemCount; i++)
-            {
-                if (chkTable.GetItemChecked(i))
-                {
-                    if (sb.Length > 0)
-                        sb.Append(",");
-                    sb.Append(chkTable.GetItemValue(i).ToString());
-                }
-            }
-            var _obj = new
-            {
-                tablesName = sb.ToString(),
-            };
-            try
-            {
-                string strReturn = UtilityHelper.HttpPost("", "Report/GetZiDuanList", JsonConvert.SerializeObject(_obj));
-                JObject _job = JObject.Parse(strReturn);
-                string rtnCode = _job["rtnCode"].ToString();
-                if (int.Parse(rtnCode) > 0)
-                {
-                    var _table = _job["rtnData"];
-                    foreach (var _col in _table)
-                    {
-                        DevExpress.XtraEditors.GroupControl grp = new DevExpress.XtraEditors.GroupControl();
-                        grp.Size = new System.Drawing.Size(259, 420);
-                        grp.Text = _col["tableName"].ToString();
-                        grp.Dock = System.Windows.Forms.DockStyle.Left;
-                        // grp.TabIndex = 0;
-                        DevExpress.XtraEditors.CheckedListBoxControl chkZiDuan = new DevExpress.XtraEditors.CheckedListBoxControl();
-                        chkZiDuan.CheckOnClick = true;
-                        chkZiDuan.Dock = System.Windows.Forms.DockStyle.Fill;
-                        var _tbCol = _col["colList"];
-                        foreach (var _ccccc in _tbCol)
-                        {
-                            string _t = _ccccc["ziDuanName"].ToString();
-                            chkZiDuan.Items.Add(_t);
-                        }
-                        grp.Controls.Add(chkZiDuan);
-                        this.wizardPage2.Controls.Add(grp);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3