From 465f62c705dc6f0a1b161d18bf9968d69cdabfe5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 十月 2024 15:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index b5a0442..e596080 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -1,10 +1,12 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Data;
using System.Text;
using System.Windows.Forms;
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;
@@ -21,6 +23,7 @@
{
InitializeComponent();
getTree();
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -35,6 +38,7 @@
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
+
private void GridView1_CustomDrawRowIndicator(object sender,
RowIndicatorCustomDrawEventArgs e)
@@ -127,7 +131,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>
@@ -270,16 +292,23 @@
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.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
@@ -336,7 +365,7 @@
var dt = dd.rtnData.list;
txt_workshopNo.Properties.DataSource = dt;
txt_workshopNo.Properties.DisplayMember = "name"; // 鏄剧ず鐨勫垪
- txt_workshopNo.Properties.ValueMember = "itemNo"; // 瀹為檯鍊肩殑鍒�
+ txt_workshopNo.Properties.ValueMember = "workshopNo"; // 瀹為檯鍊肩殑鍒�
txt_workshopNo.Properties.TextEditStyle =
TextEditStyles.DisableTextEditor;
}
--
Gitblit v1.9.3