提交当前本机整理版本

插件库/Lskj.PubAdd/FrmMain.cs

@@ -603,9 +603,14 @@ namespace Lskj.PubAdd
                         {
                             moduleGrid.ParentKeyValue = moduleGrid.UnionValue = this.ModuleAddControl.ControlObj.CurrentData[moduleGrid.ParentKeyField] + "";
                         }
-                        
-                       //moduleGrid.ParentKeyValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField);
-                       moduleGrid.DetailKeyField = detailModel.UnionValue;
+
+                        if (detailModel.AddHideBottomPanel || detailModel.HideBottomPanel || detailModel.Library.Equals("Lskj.Report.dll", StringComparison.OrdinalIgnoreCase))
+                        {
+                            moduleGrid.VisibleOperPanel = false;
+                        }
+
+                        //moduleGrid.ParentKeyValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField);
+                        moduleGrid.DetailKeyField = detailModel.UnionValue;
                         moduleGrid.UnionKey = detailModel.UnionValue;
                         //moduleGrid.UnionValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField); //Model.ObjectId;                   
                         moduleGrid.SearchControlSql = Model.ControlSql;
@@ -728,4 +733,33 @@ namespace Lskj.PubAdd
         /// <para>修改日期：</para>
         /// <para>修改备注：</para>
         /// <para>版本：1.0</para>
-        /// </
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="FormClosingEventArgs"/> instance containing the event data.</param>
+        protected void OnFormClosing(object sender, FormClosingEventArgs e)
+        {
+            try
+            {
+                if (this.ModuleAddControl != null && this.ModuleAddControl.IsCard)
+                {
+                    this.ModuleAddControl.CloseIDCardThread();
+                }
+                this.DialogResult = DialogResult.OK;
+            }
+            catch (Exception ex)
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+        }
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;
+                return cp;
+            }
+        }
+    }
+}