From b2ae2d8e16c6f8daeb5853d3f31d6895f1bf8a3a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 30 十一月 2024 15:45:28 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index e596080..538bebc 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;
@@ -33,12 +32,15 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus","");
+ };
gridView1.CustomDrawRowIndicator +=
GridView1_CustomDrawRowIndicator;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
private void GridView1_CustomDrawRowIndicator(object sender,
RowIndicatorCustomDrawEventArgs e)
@@ -148,7 +150,7 @@
}
getModel(rowGuid, true, 1);
-
+
}
/// <summary>
/// 鍒犻櫎浜嬩欢
@@ -159,7 +161,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 +202,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 +252,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,
@@ -354,18 +358,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