SVN r247
SVN-Revision: r247
This commit is contained in:
@@ -2557,14 +2557,14 @@ namespace Lskj.Control
|
||||
modelLookUp.EditValue = string.Empty;
|
||||
}
|
||||
//多选关联单据头
|
||||
modelLookUp.SourceSQL = model.SqlSource.Replace("#", "");
|
||||
string SourceSQL = modelLookUp.SysModel.MenuSql.Replace("#", "") + model.SplicingConditions;
|
||||
//单据头关联取值
|
||||
if (this.ParentControl != null)
|
||||
{
|
||||
modelLookUp.SourceSQL = this.ParentControl.ReplaceControlValue(modelLookUp.SourceSQL);
|
||||
SourceSQL = this.ParentControl.ReplaceControlValue(SourceSQL);
|
||||
}
|
||||
|
||||
modelLookUp.SourceSQL = ReplaceHelper.ReplaceRowParam(this.GetViewFocusedDataRow(), modelLookUp.SourceSQL);
|
||||
modelLookUp.NewSourceSQL = ReplaceHelper.ReplaceRowParam(this.GetViewFocusedDataRow(), SourceSQL);
|
||||
//modelLookUp.DataSource = BaseImpl.GetDataTableResult(modelLookUp.SourceSQL);
|
||||
modelLookUp.InitControls(modelLookUp.UnionModuleCodel);
|
||||
DialogResult result = modelLookUp.ShowDialog();
|
||||
@@ -3942,32 +3942,3 @@ namespace Lskj.Control
|
||||
{
|
||||
item.OptionsColumn.AllowEdit = ModifyFields.IndexOf(item.FieldName + ",", StringComparison.OrdinalIgnoreCase) != -1;
|
||||
item.OptionsColumn.ReadOnly = !item.OptionsColumn.AllowEdit;
|
||||
|
||||
if (!item.OptionsColumn.AllowEdit)
|
||||
{
|
||||
item.AppearanceHeader.Options.UseForeColor = true;
|
||||
item.AppearanceHeader.ForeColor = ColorTranslator.FromHtml(HeaderColor);
|
||||
}
|
||||
else
|
||||
{
|
||||
item.AppearanceHeader.Options.UseForeColor = true;
|
||||
item.AppearanceHeader.ForeColor = ColorTranslator.FromHtml("#00000");
|
||||
}
|
||||
if (model.FieldType == ControlType.LabMemoEdit) item.OptionsColumn.AllowEdit = true;
|
||||
|
||||
}
|
||||
//必填
|
||||
if (Required && RequiredFields.IndexOf(item.FieldName + ",", StringComparison.OrdinalIgnoreCase) != -1)
|
||||
{
|
||||
item.AppearanceHeader.Options.UseForeColor = true;
|
||||
item.AppearanceHeader.ForeColor = RequiredForceColor;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user