From 92c92d9bfb4431a8e2f4b8ac494547d50ea3a7f6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 二月 2025 17:25:06 +0800
Subject: [PATCH] 板面

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs |   78 ++++++++++++++++++++++++--------------
 1 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index b5a0442..b6ec400 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -1,5 +1,6 @@
 锘縰sing System;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 using System.Windows.Forms;
 using DevExpress.XtraEditors;
@@ -21,6 +22,7 @@
         {
             InitializeComponent();
             getTree();
+            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -29,20 +31,12 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            gridView1.CustomDrawRowIndicator +=
-                GridView1_CustomDrawRowIndicator;
+            
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName, gridView1);
             getPageList(1, UtilityHelper.GetPageSize());
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
-
-        private void GridView1_CustomDrawRowIndicator(object sender,
-            RowIndicatorCustomDrawEventArgs e)
-        {
-            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                e.Info.DisplayText = (e.RowHandle + 1).ToString();
-        }
-
+ 
         /// <summary>
         ///     鍙嶅鏍�
         /// </summary>
@@ -127,7 +121,25 @@
         {
             UtilityHelper.JumpToTab(xtraTabControl1, 0);
         }
+        /// <summary>
+        ///     淇敼浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_name, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
 
+            getModel(rowGuid, true, 1);
+
+        }
         /// <summary>
         ///     鍒犻櫎浜嬩欢
         /// </summary>
@@ -137,7 +149,7 @@
         {
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_name, gridView1);
+                lbGuid, txt_name, gridView1, "name");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -178,8 +190,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
@@ -226,7 +240,7 @@
 
             var _obj = new
             {
-                guid = lbGuid.Text.Trim(), //涓诲缓
+                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 name = txt_name.Text.Trim(),
                 time1 = txt_begTime.Value.Date,
                 time2 = txt_endTime.Value.Date,
@@ -270,16 +284,22 @@
                 var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                gcMain.BindingContext = new BindingContext();
-                gcMain.DataSource = dt;
-                gcMain.ForceInitialize();
-                var dddd = dd.rtnData.pages; //鎬婚〉
-                pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage; //褰撳墠椤�
-                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
-                pageBar1.setTxt();
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gcMain.DataSource = dt;
+                    gcMain.ForceInitialize();
+                    int dddd = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.TotalPages = dddd;
+                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.setTxt();
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
             }
             catch (Exception ex)
             {
@@ -325,18 +345,18 @@
 
         private void getTree()
         {
-            var pgq = new PageQueryModel(1, 999999, "workshop_no", "asc",
+            var pgq = new PageQueryModel(1, 999999, "departmentid", "asc",
                 "notree", " and is_Status=1");
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
                 var strReturn = UtilityHelper.HttpPost("",
-                    "MesWorkshopManager/GetListPage", json);
+                    "SysDepartmentManager/GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 var dt = dd.rtnData.list;
                 txt_workshopNo.Properties.DataSource = dt;
-                txt_workshopNo.Properties.DisplayMember = "name"; // 鏄剧ず鐨勫垪
-                txt_workshopNo.Properties.ValueMember = "itemNo"; // 瀹為檯鍊肩殑鍒�
+                txt_workshopNo.Properties.DisplayMember = "departmentname"; // 鏄剧ず鐨勫垪
+                txt_workshopNo.Properties.ValueMember = "guid"; // 瀹為檯鍊肩殑鍒�
                 txt_workshopNo.Properties.TextEditStyle =
                     TextEditStyles.DisableTextEditor;
             }

--
Gitblit v1.9.3