SVN r973
SVN-Revision: r973
This commit is contained in:
@@ -152,6 +152,10 @@ namespace Lskj.Control.Model
|
||||
/// 是否为审核界面主表
|
||||
/// </summary>
|
||||
public bool isAuditMain = false;
|
||||
/// <summary>
|
||||
///单据特殊模块id(单据来源控件)
|
||||
/// </summary>
|
||||
public string BillSourceControlId = string.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -236,6 +240,10 @@ namespace Lskj.Control.Model
|
||||
/// </summary>
|
||||
public event KeyEventHandler OnDataFileRefrshCallBack;
|
||||
/// <summary>
|
||||
/// 打开来源模块
|
||||
/// </summary>
|
||||
public event EventHandler OpenDocumentSource;
|
||||
/// <summary>
|
||||
/// 控件Panel对象
|
||||
/// </summary>
|
||||
public XtraScrollableControl ParentPanel
|
||||
@@ -1578,6 +1586,10 @@ namespace Lskj.Control.Model
|
||||
case ControlType.LabCheckText:
|
||||
LabelCheckText labelCheckText = ctr as LabelCheckText;
|
||||
break;
|
||||
case ControlType.LabBillSource:
|
||||
LabelBillSourceComboxEdit billSourceComboxEdit = ctr as LabelBillSourceComboxEdit;
|
||||
billSourceComboxEdit.SetDataSource(table);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1699,7 +1711,7 @@ namespace Lskj.Control.Model
|
||||
}
|
||||
else if (model.FieldName.EndsWith("operatedate", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
controlValue = DateTime.Now.ToString();
|
||||
controlValue = SqlHelper.ExecuteScalar("select getdate()")+"";//DateTime.Now.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1718,7 +1730,7 @@ namespace Lskj.Control.Model
|
||||
if (model.FieldName.ToLower().EndsWith("operatorname"))
|
||||
control.EditText = ERPInfo.Instance.UserName;
|
||||
if (model.FieldName.ToLower().EndsWith("operatedate"))
|
||||
control.EditText = DateTime.Now.ToString();
|
||||
control.EditText = SqlHelper.ExecuteScalar("select getdate()") + "";//DateTime.Now.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2516,7 +2528,7 @@ namespace Lskj.Control.Model
|
||||
}
|
||||
else if (model.FieldName.EndsWith("operatedate", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
controlValue = DateTime.Now.ToString();
|
||||
controlValue = SqlHelper.ExecuteScalar("select getdate()") + ""; //DateTime.Now.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2563,8 +2575,9 @@ namespace Lskj.Control.Model
|
||||
}
|
||||
else if (model.FieldName.EndsWith("operatedate", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
control.EditText = DateTime.Now.ToString();
|
||||
control.Model.Text = DateTime.Now.ToString();
|
||||
string date = SqlHelper.ExecuteScalar("select getdate()") + "";
|
||||
control.EditText = date; //DateTime.Now.ToString();
|
||||
control.Model.Text = date; //DateTime.Now.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3704,7 +3717,7 @@ namespace Lskj.Control.Model
|
||||
if (model.FieldName.ToLower().EndsWith("operatorname"))
|
||||
SetControlValue(model, ERPInfo.Instance.UserName);
|
||||
if (model.FieldName.ToLower().EndsWith("operatedate"))
|
||||
SetControlValue(model, DateTime.Now.ToString());
|
||||
SetControlValue(model, SqlHelper.ExecuteScalar("select getdate()") + "");//DateTime.Now.ToString()
|
||||
}
|
||||
|
||||
// 没有权限的控件设置为****
|
||||
@@ -4609,6 +4622,28 @@ namespace Lskj.Control.Model
|
||||
labApiButtonEdit.OnRefreshDataCallBack += new EventHandler(OnLabApiDataCallBack);
|
||||
baseControl = labApiButtonEdit;
|
||||
break;
|
||||
case ControlType.LabBillSource:
|
||||
LabelBillSourceComboxEdit billSourceComboxEdit = new LabelBillSourceComboxEdit();
|
||||
|
||||
billSourceComboxEdit.Button.Visible = true;
|
||||
billSourceComboxEdit.OpenDocumentSource += new EventHandler(OpenDocumentSource);
|
||||
|
||||
billSourceComboxEdit.clickAfterEmpty = model.clickAfterEmpty;
|
||||
billSourceComboxEdit.ValueMember =model.ValueMember;
|
||||
billSourceComboxEdit.ValueField = model.ValueMember;
|
||||
billSourceComboxEdit.TextField = model.TextMember;
|
||||
billSourceComboxEdit.FormKey = model.FieldName + "_" + model.FormKey;
|
||||
//billSourceComboxEdit.SetDataSource(dataSource);
|
||||
billSourceComboxEdit.TextEdit.SourceSQL = model.SourceSql;
|
||||
billSourceComboxEdit.TextEdit.SpeciesValue = ParentKey;
|
||||
billSourceComboxEdit.TextEdit.ControlObj = this;
|
||||
billSourceComboxEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
|
||||
//billSourceComboxEdit.TextEdit.TextChanged += new EventHandler(GetAutoSearcher_HandleSQL);
|
||||
//billSourceComboxEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
|
||||
billSourceComboxEdit.TextEdit.HiddenValueChange += new EventHandler(OnTextEditTextChanged);
|
||||
if (!isLoadBorder) billSourceComboxEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
|
||||
baseControl = billSourceComboxEdit;
|
||||
break;
|
||||
case ControlType.LabText:
|
||||
case ControlType.LabTextInt:
|
||||
default:
|
||||
@@ -4941,7 +4976,7 @@ namespace Lskj.Control.Model
|
||||
else
|
||||
cond = ReplaceHelper.ReplaceSearchControlCond(cond, fieldValue);
|
||||
|
||||
// 带复选框控件构造sql语句时,假如没有值,则不构造查询条件
|
||||
// 带复选框控件构造sql语句时,假如没有值,则不构造查询条件
|
||||
if ((fieldTypeId == ControlType.LabCheckAutoSeacherText ||
|
||||
fieldTypeId == ControlType.LabCheckAutoSeacherValue ||
|
||||
fieldTypeId == ControlType.LabCheckBox ||
|
||||
@@ -6059,30 +6094,4 @@ namespace Lskj.Control.Model
|
||||
LabelDateEdit dateEdit = controlObj as LabelDateEdit;
|
||||
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (controlObj is LabelCheckEdit)
|
||||
{
|
||||
LabelCheckEdit checkEdit = controlObj as LabelCheckEdit;
|
||||
value = checkEdit.EditText;
|
||||
}
|
||||
else if (controlObj is LabelComboxEdit)
|
||||
{
|
||||
LabelComboxEdit autoEdit = controlObj as LabelComboxEdit;
|
||||
value = autoEdit.EditValue;
|
||||
}
|
||||
else if (controlObj is LabelTextEdit)
|
||||
{
|
||||
LabelTextEdit textIntEdit = controlObj as LabelTextEdit;
|
||||
if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText;
|
||||
}
|
||||
|
||||
defaultValue = defaultValue.Replace(item, value);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else if
|
||||
Reference in New Issue
Block a user