cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r949

Browse Source 
SVN-Revision: r949
This commit is contained in:
cyf
2025-08-14 08:47:36 +00:00
parent 648ff1099d
commit 18b823a11e
6 changed files with 135 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/FrmImport.cs
+10 -6
View File
@@ -277,15 +277,16 @@ namespace Lskj.Control
model.FieldType == ControlType.LabMultiSelectValueNew||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue||
model.FieldType == ControlType.LabSelectReturnId
model.FieldType == ControlType.LabSelectReturnId||
(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
if (model.FieldType == ControlType.LabSelectReturnId)
if (model.FieldType == ControlType.LabSelectReturnId|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText))
{
if (model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))|| model.FieldType == ControlType.LabSelectReturnIdNew)
{
//单选模式数据源为模块sql
//单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
sqlValue = modelRow["SQL"] + "";
}
@@ -326,7 +327,9 @@ namespace Lskj.Control
{
string selWhere = "1=1";
DataTable table = this.ValueGridColumnTable[model];
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam
||(model.FieldType == ControlType.LabSelectReturnId && !model.IsRadio)
||(model.FieldType == ControlType.LabSelectReturnIdNew && !model.IsRadio && model.ModuleFrameDisplayText))
{
string[] splitString = text.Split(',');
string nemValue = string.Empty;
@@ -480,7 +483,8 @@ namespace Lskj.Control
model.FieldType == ControlType.LabMultiSelectValue ||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue||
model.FieldType == ControlType.LabSelectReturnId
model.FieldType == ControlType.LabSelectReturnId||
(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
string fieldValue = GetValueByImportText(dr, gc.FieldName, dr[gc.FieldName] + "");