SVN r1000

SVN-Revision: r1000
2025-09-28 06:50:51 +00:00
parent d6739afcd1
commit 533029e001
10 changed files with 354 additions and 112 deletions
@@ -112,7 +112,7 @@ namespace Lskj.Control.Model
        /// Gets or sets the field text.
        /// </summary>
        /// <value>The field text.</value>
-        public string Text { get; set; }
+        public string Text = string.Empty;
        /// <summary>
        /// Gets or sets the default value.
        /// </summary>
@@ -371,6 +371,12 @@ namespace Lskj.Control.Model
        /// 新版模块返回框类型，显示对应text值（默认只显示数据库中对应内容）
        /// </summary>
        public bool ModuleFrameDisplayText;
+        /// <summary>
+        /// 编辑框格式化(和显示格式一致)
+        /// </summary>
+        public bool FormatEditBox; 
+
+
        #endregion

        /// <summary>
@@ -463,4 +469,5 @@ namespace Lskj.Control.Model
            this.IsCustomGroupField = item.Table.Columns.Contains("IsCustomGroupField")&&int.TryParse(item["IsCustomGroupField"] + "",out IsCustomGroupField) ? IsCustomGroupField : 0;
            this.ImportConversionFormat = item.Table.Columns.Contains("ImportConversionFormat")  ? item["ImportConversionFormat"]+"" : string.Empty;
            this.PrivilegeView = item.Table.Columns.Contains("PrivilegeView") ? item["PrivilegeView"] + "" : string.Empty;
-            this.PrivilegeOper = item.Table.Columns
+            this.PrivilegeOper = item.Table.Columns.Contains("PrivilegeOper") ? item["PrivilegeOper"] + "" : string.Empty;
+            this.AdditionalAssociations = item.Table.Col
@@ -753,6 +753,10 @@ namespace Lskj.Control.Model
                catch (Exception)
                {
                    result = 0;
+                    if (result==0 && ERPInfo.Instance.UserName.Equals("管理员"))
+                    {
+                        SqlStoredProcedurepPrompt.GenerateProcedureExecutionScript(procName, paramList,  isFirstFlag,  comfirmFlag );
+                    }
                }
                finally
                {
@@ -769,6 +773,10 @@ namespace Lskj.Control.Model
                switch (rValue)
                {
                    case -1:
+                        if (rValue == -1 && ERPInfo.Instance.UserName.Equals("管理员"))
+                        {
+                            SqlStoredProcedurepPrompt.GenerateProcedureExecutionScript(procName, paramList, isFirstFlag, comfirmFlag);
+                        }
                        MessageUtil.Show(string.IsNullOrEmpty(model.ErrorMsg) ? ResourceKeys.OperFault + "\n" + pMsg.Value : model.ErrorMsg);
                        reaultValue = false;
                        break;
@@ -5199,7 +5199,7 @@ namespace Lskj.Control.Model
        {
            ControlModel[] controls = this._models.Where(x => x.DisableCond.Contains("{" + model.FieldName + "}")).ToArray();
            ControlModel[] requiredcontrols = this._models.Where(x => x.RequiredCond.Contains("{" + model.FieldName + "}")).ToArray();
-            if (controls == null || controls.Length == 0) return;
+            if ((controls == null || controls.Length == 0)&&(requiredcontrols == null || requiredcontrols.Length == 0)) return;

            string fieldValue = GetControlValue(model);
            foreach (ControlModel item in requiredcontrols)