SVN r694

SVN-Revision: r694

插件库/Lskj.Control/ModuleEx.cs

@@ -37,6 +37,7 @@ using DevExpress.XtraTreeList.Nodes;
 using DevExpress.XtraTreeList;
 using System.Collections;
 using System.Threading.Tasks;
+using DevExpress.XtraRichEdit;
 
 namespace Lskj.Control
 {
@@ -45,7 +46,10 @@ namespace Lskj.Control
     /// </summary>
     public partial class ModuleEx : UserControl
     {
-
+        /// <summary>
+        /// 当前富文本框是否改变
+        /// </summary>
+        private bool _richTextDirty;
         /// <summary>
         /// BMP字段
         /// </summary>
@@ -366,7 +370,7 @@ namespace Lskj.Control
                         }
                         // 重点：针对 TextEdit 绑定
                         this.ModuleGridObj.PromptBox.TextEdit.KeyDown += PromptBox_KeyDown;
-                        this.ModuleGridObj.PromptBox.TextEdit.ReadOnly = true;
+                        //this.ModuleGridObj.PromptBox.TextEdit.ReadOnly = true;
                         if (string.IsNullOrWhiteSpace(this.ModuleGridObj.PromptBox.EditText)) this.ModuleGridObj.PromptBox.EditText = "请点击左侧查看备注信息！";
                         this.ModuleGridObj.TipsobjPanel.Controls.Add(this.ModuleGridObj.PromptBox);
                     }
@@ -395,11 +399,26 @@ namespace Lskj.Control
             {
                 e.Handled = true;   // 阻止控件继续处理
                 e.SuppressKeyPress = true; // 阻止dev功能
-               
+                SaveRemark();
             }
         }
+        /// <summary>
+        /// 保存编码
+        /// </summary>
+        private void SaveRemark()
+        {
+            RichEditControl labelRichEdit = this.ModuleGridObj.PromptBox.TextEdit;
+            DataRow dataRow = ModuleGridObj.LeftGridEx.GetViewFocusedDataRow();
           
-
+            if (dataRow != null && labelRichEdit != null)
+            {
+                string msg;
+                int ret = BaseModuleImpl.UpdateRemarkByModule(Model.ModuleCode, dataRow[this.ModuleGridObj.ParentKeyField] + "",
+                                               labelRichEdit.Text, out msg);
+                MessageUtil.Show(msg);
+                this.ModuleGridObj._leftGridSearchObj.SearchLastGrid();
+            }
+        }
         /// <summary>
         /// 获取数据源缓存
         /// </summary>

插件库/Lskj.Control/ModuleGridDetailEx.cs

@@ -619,6 +619,29 @@ namespace Lskj.Control
             }
             GridDetailModel model = this.tcButtom.GetGridDetailModel(tabPage);
             DataRow rowItem = this.ModuleGridObj.GridControlObj.GetViewFocusedDataRow();
+            if (!string.IsNullOrEmpty(SysModel.PageVisbleCond) )
+            {
+                string condSql= ReplaceHelper.ReplaceRowParam(rowItem, ReplaceHelper.ReplaceUserInfo(SysModel.PageVisbleCond)).Replace("''", "'");
+                // 形如 "1,2,3" 的返回值
+                string numberList = MainImpl.GetResult(condSql) + "";
+
+                // ---------- 判断当前 orderid 是否在列表中 ----------
+                string orderIdStr = model.Orderid.ToString();                         // 统一转成字符串
+                string[] idArr = numberList.Split(new[] { ',' },
+                                                     StringSplitOptions.RemoveEmptyEntries);
+
+                if (!idArr.Contains(orderIdStr))
+                {
+                    tabPage.PageVisible = false;
+                    return;     // 不包含当前 orderid，直接退出
+                }
+                else
+                {
+                    tabPage.PageVisible = true;
+                }
+            }
+
+            
             if (IsDynamicDetailType)
             {
                 //string mainModuleCode = model.ParentModuleCode;

插件库/Lskj.Control/ModuleGridEx.cs

@@ -83,6 +83,10 @@ namespace Lskj.Control
         /// </summary>
         private bool _isExcPrint;
         /// <summary>
+        /// 最新的名字
+        /// </summary>
+        public string lastrichtext;
+        /// <summary>
         /// 主打印Sql
         /// </summary>
         private string _mainPrintSql;
@@ -5380,6 +5384,7 @@ namespace Lskj.Control
         {
             if (!this.SysModel.SearchEnable) 
             {
+                lastrichtext = text;
                 PromptBox.EditText = text;
                 // 获取文档对象
                 Document document = this.PromptBox.TextEdit.Document;