diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs index 777d7d3..1730872 100644 --- a/插件库/Lskj.Control/Model/MyControl.cs +++ b/插件库/Lskj.Control/Model/MyControl.cs @@ -2975,7 +2975,7 @@ namespace Lskj.Control.Model string token = UploadFileUtil.Login(SystemInfo.Instance.OAUrl); if (!string.IsNullOrEmpty(token)) { - string speciesno = "010106"; + string speciesno = "010105"; byte[] fileBytes = UploadFileUtil.ConvertFileToBytes(filePath); string fileStream = Convert.ToBase64String(fileBytes); string postUrl = "{0}Api/FileUploadApi.ashx?moduleId={1}&idValue={2}&speciesno={8}&folder={3}&totsize={4}&position={5}&filename={6}&method={7}"; @@ -3388,7 +3388,7 @@ namespace Lskj.Control.Model LabelImageEdit imageEdit = baseControl as LabelImageEdit; imageEdit.LoadImage(controlValue + ""); } - else if (baseControl is LabelRemarkEdit && baseControl.Model.FileUploadControl) + else if (baseControl is LabelRemarkEdit && baseControl.Model.FileUploadControl && string.IsNullOrEmpty(PrimaryValue)) { LabelRemarkEdit labelRemarkEdit = baseControl as LabelRemarkEdit; labelRemarkEdit.lasttext = controlValue + ""; @@ -5825,4 +5825,30 @@ 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 \ No newline at end of file + 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; + } + + + } +} \ No newline at end of file