From be94e54dc7cd0eb2e66f25d7def9a873c563564c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 10 一月 2025 09:53:30 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index e596080..6d11c85 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -6,7 +6,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
-using FastReport.Dialog;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -32,21 +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(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>
@@ -148,7 +138,7 @@
}
getModel(rowGuid, true, 1);
-
+
}
/// <summary>
/// 鍒犻櫎浜嬩欢
@@ -159,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("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -200,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>
@@ -248,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,
@@ -302,7 +294,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
@@ -354,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 = "workshopNo"; // 瀹為檯鍊肩殑鍒�
+ txt_workshopNo.Properties.DisplayMember = "departmentname"; // 鏄剧ず鐨勫垪
+ txt_workshopNo.Properties.ValueMember = "guid"; // 瀹為檯鍊肩殑鍒�
txt_workshopNo.Properties.TextEditStyle =
TextEditStyles.DisableTextEditor;
}
--
Gitblit v1.9.3