diff --git a/插件库/Lskj.Business/Impl/BillImpl.cs b/插件库/Lskj.Business/Impl/BillImpl.cs index d68ffa3..f24eaa9 100644 --- a/插件库/Lskj.Business/Impl/BillImpl.cs +++ b/插件库/Lskj.Business/Impl/BillImpl.cs @@ -423,7 +423,7 @@ namespace Lskj.Business.Impl string columsSql = string.Format(@"SELECT DISTINCT isnull(CASE WHEN ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'' OR isnull(isVisible,0)=1 THEN 0 ELSE width END,0) width, - isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible, + isnull(CASE WHEN ISNULL(c.userList,'')='' AND ISNULL(a.PrivilegeOper,'')<>'' THEN 1 ELSE edited END,0) edit,isnull(isVisible,0) isVisible,CASE WHEN isnull(isVisible,0) = 0 THEN 0 ELSE 1 END vislble, a.id,a.fieldName,isnull(a.[sysName],'') sysName,a.username,a.dataFormat,a.fieldTypeId fieldsqltag,a.calcOrder,a.isSum,a.defaultValue defaultdate,{2} a.lookupKeyField fieldsqlid,a.lookupResult fieldsqlname,a.lookupSql fieldsql,a.calcExpr,a.orderid,isnull(a.nullable,0) nullable,a.unionFields,a.unionValue {3}{4} FROM p_systembillDetail a @@ -863,27 +863,4 @@ namespace Lskj.Business.Impl SqlParameter[] param = { new SqlParameter("@FormText",SqlDbType.VarChar,50), - new SqlParameter("@userId",SqlDbType.Int,20), - new SqlParameter("@UserName",SqlDbType.VarChar,50), - new SqlParameter("@Privilege",SqlDbType.Int,4), - new SqlParameter("@ModuleCode",SqlDbType.VarChar,50), - new SqlParameter("@ModuleId",SqlDbType.VarChar,50), - - }; - param[0].Value = SysModel.FormText; - param[1].Value = ERPInfo.Instance.UserId; - param[2].Value = ERPInfo.Instance.UserName; - param[3].Value = SysModel.Privilege; - param[4].Value = SysModel.ModuleCode; - param[5].Value = SysModel.ModuleId; - - - - ds = SqlHelper.ExecuteDataSet(CommandType.StoredProcedure, "p_Get_NewDesignPlatform_PubAccraditation2", "cacheSYSConfig", param); - - return ds; - } - - - } -} + new Sq \ No newline at end of file diff --git a/插件库/Lskj.Business/Impl/SystemInfo.cs b/插件库/Lskj.Business/Impl/SystemInfo.cs index e11e36b..eb428f9 100644 --- a/插件库/Lskj.Business/Impl/SystemInfo.cs +++ b/插件库/Lskj.Business/Impl/SystemInfo.cs @@ -284,6 +284,7 @@ namespace Lskj.Business //Instance.OptimizationSpeed = false; Instance.DetailExportDisplay = item.Table.Columns.Contains("DetailExportDisplay") && !string.IsNullOrEmpty(item["DetailExportDisplay"] + "") ? "1".Equals(item["DetailExportDisplay"] + "") : false; Instance.ConventionalPrintingDisplay = item.Table.Columns.Contains("ConventionalPrintingDisplay") && !string.IsNullOrEmpty(item["ConventionalPrintingDisplay"] + "") ? "1".Equals(item["ConventionalPrintingDisplay"] + "") : false; + Instance.HideSubtitle = item.Table.Columns.Contains("HideSubtitle") && !string.IsNullOrEmpty(item["HideSubtitle"] + "") ? "1".Equals(item["HideSubtitle"] + "") : false; } /// /// 高拍仪AccessKey @@ -902,32 +903,4 @@ namespace Lskj.Business /// ///mac地址强制判断(必须指定电脑，未指定的不允许登录) /// - public bool MacMandatoryJudgment; - /// - ///高效验证（表格重新加载数据前，验证是否有新增或者修改状态的列） - /// - public bool EfficientVerification; - /// - ///粘贴时不清除表格排序 - /// - public bool CancelPasteClearSort; - /// - ///树结构特殊加载（数据源中有Pid列，则pid设置为对应节点的父节点） - /// - public bool TreeSpecialBinding; - /// - ///优化速度加载 - /// - public bool OptimizationSpeed; - /// - ///明细导出显示 - /// - public bool DetailExportDisplay; - /// - ///常规打印显示 - /// - public bool ConventionalPrintingDisplay; - - - } -} + public bool MacMandatoryJudgme \ No newline at end of file diff --git a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs index 8407bab..eb0f691 100644 --- a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs +++ b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs @@ -628,11 +628,11 @@ namespace Lskj.Control.MultiModelLookUp public void InitControls(string UnionModuleCodel) { - this.SysModel.MenuSql = this.NewSourceSQL; + //this.SysModel.MenuSql = this.NewSourceSQL; //设置上方条件 this.pl_top.Controls.Clear(); DataTable queryTable = BaseModuleImpl.GetCustomQueryFields(this.SysModel.CondKey);//加载自定义配置字段 - this.SearchObj = new MyControl(this.SysModel.MenuSql, this.gcMain, LeftTreeViewEx, LeftGridEx); + this.SearchObj = new MyControl(this.NewSourceSQL, this.gcMain, LeftTreeViewEx, LeftGridEx); this.SearchObj.ParentUnionField = this.ParentUnionField; this.pl_top.Height = 0; this.pl_top.Height = this.SearchObj.InitSearchControl(queryTable, this.pl_top); diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs index ccc4a7e..0ed5ba4 100644 --- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs +++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs @@ -451,7 +451,7 @@ namespace Lskj.Main.Control //this.pl_top_left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pl_top_left.BackgroundImage"))); this.pl_top_left.Visible = true; this.menuMain.Visible = true; - this.lblSubTitle.Visible = true; + this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle?false:true; this.ResetPanelWidth(); } /// @@ -4216,41 +4216,4 @@ namespace Lskj.Main.Control { bottomLayoutPanel.RowStyles[i].Height = 25; } - } - } - catch (Exception) - { - } - } - } - /// - /// 判断是不是数值 - /// - /// - /// - private bool IsNumberic(string oText) - { - try - { - int var1 = Convert.ToInt32(oText); - return true; - } - catch - { - return false; - } - } - #region 加密狗验证 - /// - /// 加密狗验证 - /// - /// - private void DogVerify() - { - int[] keyHandles = ERPInfo.Instance.keyHandles = new int[8]; - int[] keyNumber = ERPInfo.Instance.keyNumber = new int[8]; - int rtn = SmartX1Api.SmartX1Find("Ls_ERP", keyHandles, keyNumber); - } - #endregion - } -} + \ No newline at end of file diff --git a/插件库/Lskj.Model/BillModel.cs b/插件库/Lskj.Model/BillModel.cs index d2fc092..858be99 100644 --- a/插件库/Lskj.Model/BillModel.cs +++ b/插件库/Lskj.Model/BillModel.cs @@ -342,6 +342,10 @@ namespace Lskj.Model /// 主表显示横向滚动条 /// public bool MainHorizontalScrolling; + /// + /// 禁显列不加载数据源 + /// + public bool DisableFieldSources; /// @@ -411,11 +415,4 @@ namespace Lskj.Model this.DraggingOrder = columns.Contains("DraggingOrder") && !string.IsNullOrEmpty(rowItem["DraggingOrder"] + "") ? "1".Equals(rowItem["DraggingOrder"] + "") : false; this.IsBrp = columns.Contains("IsBrp") && !string.IsNullOrEmpty(rowItem["IsBrp"] + "") ? "1".Equals(rowItem["IsBrp"] + "") : false; this.DetailTreeTable = columns.Contains("DetailTreeTable") && !string.IsNullOrEmpty(rowItem["DetailTreeTable"] + "") ? "1".Equals(rowItem["DetailTreeTable"] + "") : false; - this.DetailTreeTableExpansion = columns.Contains("DetailTreeTableExpansion") && !string.IsNullOrEmpty(rowItem["DetailTreeTableExpansion"] + "") ? rowItem["DetailTreeTableExpansion"] + "" : "1"; - this.SelectLast = columns.Contains("SelectLast") && !string.IsNullOrEmpty(rowItem["SelectLast"] + "") ? "1".Equals(rowItem["SelectLast"] + "") : false; - this.LoadFilter = columns.Contains("LoadFilter") && !string.IsNullOrEmpty(rowItem["LoadFilter"] + "") ? "1".Equals(rowItem["LoadFilter"] + "") : false; - this.MainVerticalScroll = columns.Contains("MainVerticalScroll") && !string.IsNullOrEmpty(rowItem["MainVerticalScroll"] + "") ? "1".Equals(rowItem["MainVerticalScroll"] + "") : false; - this.MainHorizontalScrolling = columns.Contains("MainHorizontalScrolling") && !string.IsNullOrEmpty(rowItem["MainHorizontalScrolling"] + "") ? "1".Equals(rowItem["MainHorizontalScrolling"] + "") : false; - } - } -} \ No newline at end of file + this.DetailTreeTableExpansion = columns.Contains("DetailTreeTableExpansion") && !string \ No newline at end of file diff --git a/插件库/Lskj.Model/ModuleModel.cs b/插件库/Lskj.Model/ModuleModel.cs index 3005b9f..d81370f 100644 --- a/插件库/Lskj.Model/ModuleModel.cs +++ b/插件库/Lskj.Model/ModuleModel.cs @@ -876,6 +876,10 @@ namespace Lskj.Model /// 多表头为空的列头加在最后 /// public bool BandedAddToEnd; + /// + /// 禁显列不加载数据源 + /// + public bool DisableFieldSources; #endregion /// @@ -1019,13 +1023,4 @@ namespace Lskj.Model this.ImportConditions = rowItem.Table.Columns.Contains("ImportConditions") ? rowItem["ImportConditions"] + "" : ""; this.TreeNodeRefresh = rowItem.Table.Columns.Contains("TreeNodeRefresh") ? "1".Equals(rowItem["TreeNodeRefresh"] + "") : false; this.DragDirection = rowItem.Table.Columns.Contains("DragDirection") && !string.IsNullOrEmpty(rowItem["DragDirection"] + "") ? Convert.ToInt32(rowItem["DragDirection"] + "") : 0; - this.VerifyRowStatus = rowItem.Table.Columns.Contains("VerifyRowStatus") ? "1".Equals(rowItem["VerifyRowStatus"] + "") : false; - this.DoubleClickMode = rowItem.Table.Columns.Contains("DoubleClickMode") ? "1".Equals(rowItem["DoubleClickMode"] + "") : false; - this.SaveWhenSwitching = rowItem.Table.Columns.Contains("SaveWhenSwitching") ? "1".Equals(rowItem["SaveWhenSwitching"] + "") : false; - this.LoadFilter = rowItem.Table.Columns.Contains("LoadFilter") ? "1".Equals(rowItem["LoadFilter"] + "") : false; - this.DoubleClickDetail = rowItem.Table.Columns.Contains("DoubleClickDetail") ? "1".Equals(rowItem["DoubleClickDetail"] + "") : false; - this.DynamicMain = rowItem.Table.Columns.Contains("DynamicMain") ? "1".Equals(rowItem["DynamicMain"] + "") : false; - this.BandedAddToEnd = rowItem.Table.Columns.Contains("BandedAddToEnd") ? "1".Equals(rowItem["BandedAddToEnd"] + "") : false; - } - } -} + this.VerifyRowStatus = rowItem.Table.Columns.Contains("VerifyRowStatus") ? "1".Equals(rowItem["VerifyRowSta \ No newline at end of file diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs index c97736b..b00d797 100644 --- a/插件库/Lskj.PubBill/BillModule.cs +++ b/插件库/Lskj.PubBill/BillModule.cs @@ -1001,6 +1001,7 @@ namespace Lskj.PubBill _detailColumns = BillImpl.GetDetailColumns(this.SysModel.ModuleCode, true);//初始化单据明细列 } } + this.gcMain.DisableFieldSources = this.BillModel.DisableFieldSources; this.gcMain.Model = this.SysModel; this.gcMain.ParentControl = this.ControlObj;//把主表控件赋给 单据主表控件、基础档案查询条件控件等等 this.gcMain.SetEditColumns(_detailColumns, GridCustomColumnStruct.BillDetailGridView + this.BillModel.FormKey);//设置可编辑列 @@ -7302,37 +7303,4 @@ namespace Lskj.PubBill /// /// The cond. /// The data row. - /// true if XXXX, false otherwise. - private bool ValidateCond(string cond, DataRow dataRow) - { - bool result = false; - string condition = cond; - try - { - if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确 - cond = ReplaceHelper.ReplaceRowParam(dataRow, cond); - if (cond.StartsWith("@") || cond.StartsWith("!")) - { - result = "1".Equals(BaseImpl.GetDefaultValue(cond)); - } - else if (dataRow == null) - { - result = ReplaceHelper.EvalCond(cond); - } - else - { - result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond); - } - return result; - } - catch (Exception ex) - { - - } - return result; - - } - - - } -} \ No newline at end of file + /// true if XXXX, < \ No newline at end of file