SVN-Revision: r460
This commit is contained in:
wyf
2025-04-08 08:05:56 +00:00
parent f6d4e3dfcb
commit 2b60b09ed5
+31 -4
View File
@@ -294,7 +294,19 @@ namespace Lskj.ProductiSched
{ {
BandedGridView view = sender as BandedGridView; BandedGridView view = sender as BandedGridView;
if (view == null) return; if (view == null) return;
if (DataModel.TopModuleModel.HasReport)//报表所有的都不能编辑
{
e.Cancel = true; // 取消编辑,单元格变灰
}
DataRow dataRow = view.GetFocusedDataRow();
if (dataRow == null) return;
string bj_tig = dataRow["bj_tig"]?.ToString() ?? "";
if (bj_tig == "0")
{
e.Cancel = true; // 取消编辑,单元格变灰
}
else
{
string billDocumentId = view.GetRowCellValue(view.FocusedRowHandle, DataModel.TopModuleModel.ParmaryKey) + ""; string billDocumentId = view.GetRowCellValue(view.FocusedRowHandle, DataModel.TopModuleModel.ParmaryKey) + "";
// 新方式 (精准替代原有取值方式) // 新方式 (精准替代原有取值方式)
DateTime date; DateTime date;
@@ -314,6 +326,7 @@ namespace Lskj.ProductiSched
} }
} }
} }
}
/// <summary> /// <summary>
/// 判断TreeList单元格是否可以编辑(精准适配原BandedGridView逻辑) /// 判断TreeList单元格是否可以编辑(精准适配原BandedGridView逻辑)
/// </summary> /// </summary>
@@ -2009,7 +2022,7 @@ namespace Lskj.ProductiSched
var cellValue = col.Value; var cellValue = col.Value;
row[column] = cellValue; row[column] = cellValue;
// 检查列可解析为日期格式 // 检查列可解析为日期格式
if (cellValue > 0 && DateTime.TryParse(column.ToString(), out DateTime newDate)) if (DateTime.TryParse(column.ToString(), out DateTime newDate))
{ {
if (!validDateColumns.Contains(newDate)) if (!validDateColumns.Contains(newDate))
{ {
@@ -2065,12 +2078,15 @@ namespace Lskj.ProductiSched
else else
{ {
if (!mvalidDateColumns.Contains(tempDate)) if (!mvalidDateColumns.Contains(tempDate))
{
if (decimal.TryParse(value + "", out decimal dValue) && dValue > 0)
{ {
mvalidDateColumns.Add(tempDate); mvalidDateColumns.Add(tempDate);
}
e.Row["PrecomputedMaxDate"] = tempDate.ToString("yyyy-MM-dd"); e.Row["PrecomputedMaxDate"] = tempDate.ToString("yyyy-MM-dd");
} }
} }
}
}
else if (decimal.TryParse(value + "", out decimal dValue) && dValue > 0) else if (decimal.TryParse(value + "", out decimal dValue) && dValue > 0)
{ {
bandGcTop.rowDateValues[rowHandle].Add(tempDate); bandGcTop.rowDateValues[rowHandle].Add(tempDate);
@@ -2294,6 +2310,13 @@ namespace Lskj.ProductiSched
/// <param name="e"></param> /// <param name="e"></param>
private void OnBandedViewKeyDown(object sender, KeyEventArgs e) private void OnBandedViewKeyDown(object sender, KeyEventArgs e)
{ {
BaseUserControl dataTypeControl = DataModel.TopSearchObj.ParentPanel.Controls.Cast<System.Windows.Forms.Control>().Where(n => n is LabelComboxEdit).Cast<BaseUserControl>().FirstOrDefault(); // 获取第一个符合条件的控件
string typeDate = "0";
if (dataTypeControl != null)
{
LabelComboxEdit labelAutoTextEdit = dataTypeControl as LabelComboxEdit;
typeDate = labelAutoTextEdit.EditValue;
}
BandedGridView bandedGridView = (BandedGridView)sender; BandedGridView bandedGridView = (BandedGridView)sender;
if (e.KeyCode == Keys.F7) if (e.KeyCode == Keys.F7)
{ {
@@ -2303,7 +2326,7 @@ namespace Lskj.ProductiSched
{ {
// 允许操作 // 允许操作
GridCell[] SelectCells = bandedGridView.GetSelectedCells(); GridCell[] SelectCells = bandedGridView.GetSelectedCells();
if (SelectCells.Length > 0) if (SelectCells.Length > 1)
{ {
object obj = bandedGridView.GetRowCellValue(SelectCells[0].RowHandle, SelectCells[0].Column); object obj = bandedGridView.GetRowCellValue(SelectCells[0].RowHandle, SelectCells[0].Column);
if (MessageUtil.Show("是否替换所选单元格值?", MessageBoxButtons.YesNo) == DialogResult.Yes) if (MessageUtil.Show("是否替换所选单元格值?", MessageBoxButtons.YesNo) == DialogResult.Yes)
@@ -2319,6 +2342,10 @@ namespace Lskj.ProductiSched
DateTime dateTime; DateTime dateTime;
if (DataModel.columnDateMapping.TryGetValue(gridCell.Column, out dateTime)) if (DataModel.columnDateMapping.TryGetValue(gridCell.Column, out dateTime))
{ {
if (typeDate.Equals("1"))
{
dateTime = dateTime.AddDays(7);
}
string bj_tig = bandedGridView.GetRowCellValue(gridCell.RowHandle, "bj_tig")?.ToString() ?? ""; string bj_tig = bandedGridView.GetRowCellValue(gridCell.RowHandle, "bj_tig")?.ToString() ?? "";
if (!DataModel.TopModuleModel.HasReport && bj_tig != "0" && dateTime.Date >= DateTime.Now.Date) if (!DataModel.TopModuleModel.HasReport && bj_tig != "0" && dateTime.Date >= DateTime.Now.Date)
{ {