SVN-Revision: r802
This commit is contained in:
wyf
2025-06-27 08:03:42 +00:00
parent 13f2022d1a
commit 808c66caca
+4 -41
View File
@@ -867,7 +867,7 @@ namespace Lskj.PubBillSpecial
if ((rowItem["orderid"] + "").Equals("999")) if ((rowItem["orderid"] + "").Equals("999"))
{ {
string ModuleCode = model.DllParam2; string ModuleCode = model.DllParam2;
FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,false); FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow, false);
frmSource.PrimaryKey = this.BillModel.PrimaryKey; frmSource.PrimaryKey = this.BillModel.PrimaryKey;
frmSource.PrimaryValue = this.lblOrderNo.Text; frmSource.PrimaryValue = this.lblOrderNo.Text;
frmSource.DocumentColor = DocumentColor; frmSource.DocumentColor = DocumentColor;
@@ -881,7 +881,7 @@ namespace Lskj.PubBillSpecial
else if ((rowItem["orderid"] + "").Equals("888")) else if ((rowItem["orderid"] + "").Equals("888"))
{ {
string ModuleCode = model.DllParam2; string ModuleCode = model.DllParam2;
FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,true); FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow, true);
frmSource.PrimaryKey = this.BillModel.PrimaryKey; frmSource.PrimaryKey = this.BillModel.PrimaryKey;
frmSource.PrimaryValue = this.lblOrderNo.Text; frmSource.PrimaryValue = this.lblOrderNo.Text;
frmSource.DocumentColor = DocumentColor; frmSource.DocumentColor = DocumentColor;
@@ -1627,6 +1627,7 @@ namespace Lskj.PubBillSpecial
} }
string gridExSql = this.gridEx.SysModel.MenuSql; string gridExSql = this.gridEx.SysModel.MenuSql;
gridExSql = ReplaceHelper.ReplaceRowParam(rowItem, gridExSql); gridExSql = ReplaceHelper.ReplaceRowParam(rowItem, gridExSql);
this.gridEx.GridControlObj.LastSearchSql = gridExSql;
this.gridEx.GridControlObj.SetGridViewDataSource(BaseImpl.GetDataTableResult(gridExSql)); this.gridEx.GridControlObj.SetGridViewDataSource(BaseImpl.GetDataTableResult(gridExSql));
} }
else else
@@ -1669,6 +1670,7 @@ namespace Lskj.PubBillSpecial
{ {
userControl.EditText = this.rdRed.Checked ? "1" : "0"; userControl.EditText = this.rdRed.Checked ? "1" : "0";
} }
this.gridEx.GridControlObj.LastSearchSql = this.gridEx.SysModel.MenuSql;
this.gridEx.GridControlObj.SetGridViewDataSource(new DataTable()); this.gridEx.GridControlObj.SetGridViewDataSource(new DataTable());
} }
@@ -6794,43 +6796,4 @@ namespace Lskj.PubBillSpecial
if (rightEdge > maxRightEdge) if (rightEdge > maxRightEdge)
{ {
maxRightEdge = rightEdge; maxRightEdge = rightEdge;
}
}
}
}
if (minLeft == int.MaxValue) minLeft = 0;
int MovingDistance = (Screen.PrimaryScreen.WorkingArea.Width - maxRightEdge) / 2;
if (dataTable.Columns.Contains("controlLeft") && MovingDistance > 0)
{
foreach (DataRow item in dataTable.Rows)
{
item["controlLeft"] = int.Parse(item["controlLeft"] + "") + MovingDistance - minLeft;
}
}
return dataTable;
}
/// <summary>
/// 判断是不是数值
/// </summary>
/// <param name="oText"></param>
/// <returns></returns>
private bool IsNumberic(string oText)
{
try
{
int var1 = Convert.ToInt32(oText);
return true;
}
catch
{
return false;
}
}
}
}