From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs |   86 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index 90ade0c..4ffa9c7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -1,20 +1,14 @@
 锘縰sing DevExpress.Utils;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Columns;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraRichEdit.Model;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.Configuration;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Net;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.Rpt
@@ -25,6 +19,10 @@
         public WomShjh()
         {
             InitializeComponent();
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(ucLookOrg1);
+            dateEdit1.DateTime = DateTime.Now;
+            dateEdit2.DateTime = DateTime.Now.AddDays(30);
             this.gridView1.OptionsView.ShowGroupPanel = false;
             tips.Appearance.BackColor = Color.LightBlue; // 璁剧疆鑳屾櫙棰滆壊
             tips.Appearance.ForeColor = Color.Black; // 璁剧疆鍓嶆櫙鑹诧紙鏂囧瓧棰滆壊锛�
@@ -65,6 +63,7 @@
             gridView1.OptionsFind.ShowClearButton = true; // 鏄剧ず娓呴櫎鎸夐挳
             gridView1.OptionsFind.ShowCloseButton = true; // 鏄剧ず鍏抽棴鎸夐挳
             gridView1.IndicatorWidth = 60;
+            gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             gridView1.CustomDrawRowIndicator += (s, e) =>
             {
                 if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -80,6 +79,10 @@
             };
             gridView1.ShowFindPanel(); // 鏄剧ず鏌ユ壘闈㈡澘
             getPageList();
+            btnQuery.Click += (s, e) =>
+            {
+                getPageList();
+            };
         }
 
         /// <summary>
@@ -91,15 +94,15 @@
             gcMain1.DataSource = null;
             var _obj = new
             {
-                orgId = "",//涓诲缓
-                beginDate = DateTime.Now.AddMonths(-1).ToString(),
-                endDate = DateTime.Now.ToString()
+                orgId = ucLookOrg1.GetId(),//涓诲缓
+                beginDate = dateEdit1.EditValue.ToString(),
+                endDate = dateEdit2.EditValue.ToString()
             };
             var json = JsonConvert.SerializeObject(_obj);
             try
             {
                 var strReturn = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetQLList", JsonConvert.SerializeObject(_obj));
+                    _webServiceName + "GetShjhList", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strReturn);
                 if (_rtn.rtnCode > 0)
                 {
@@ -129,5 +132,64 @@
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        /// <summary>
+        /// 鏌ョ湅璇︾粏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptBtnView_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            string itemId = "";
+            string orgId = ucLookOrg1.GetId();
+            string beginDate = dateEdit1.DateTime.ToString();
+            string endDate = dateEdit2.DateTime.ToString();
+            Form frm = new WomShjhShow(orgId, beginDate, endDate, itemId);
+            frm.ShowDialog();
+        }
+
+        private void btnOutput_Click(object sender, EventArgs e)
+        {
+            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            {
+                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+                if (dialogResult == DialogResult.OK)
+                {
+                    string _folder = folderBrowserDialog.SelectedPath;
+                    var _params = new
+                    {
+                        orgId = ucLookOrg1.GetId(),//涓诲缓
+                        beginDate = dateEdit1.EditValue.ToString(),
+                        endDate = dateEdit2.EditValue.ToString()
+                    };
+                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh","","","", _params);
+                    try
+                    {
+                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
+                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                        if (_rtn.rtnCode > 0)
+                        {
+                            string _file = _rtn.rtnData.fileUrl.ToString();
+                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
+                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+                            using (WebClient client = new WebClient())
+                            {
+                                client.DownloadFile(_url, _folderName);
+                            }
+                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+                        }
+                        else
+                        {
+                            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3