diff --git a/插件库/Lskj.PubSpec/FrmMain.cs b/插件库/Lskj.PubSpec/FrmMain.cs index b311ddf..f427534 100644 --- a/插件库/Lskj.PubSpec/FrmMain.cs +++ b/插件库/Lskj.PubSpec/FrmMain.cs @@ -320,7 +320,7 @@ namespace Lskj.PubSpec //GridDragTree dragTree = new GridDragTree(this.gcMain.GridView, this.treeLeft.TreeView); //dragTree.OnDragComplete += new GridDragTreeCompleteEventHandler(OnDragCompleted); this.gcMain.IsSpecModel = true; - this.gcMain.SetEditColumns(this._gridColumns); + this.gcMain.SetEditColumns(this._gridColumns, GridCustomColumnStruct.PubSpecMainGridView + this.SysModel.FormKey); this.gcMain.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(this.Model.ModuleCode)); this.gcMain.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(this.Model.ModuleCode), this.Model, OnGridViewRightCallBack, null); this.gcMain.GridView.FocusedRowObjectChanged += new DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventHandler(OnGridViewFocusedRowObjectChanged); @@ -466,10 +466,10 @@ namespace Lskj.PubSpec { string sortField = _leftTreeRow["fieldsqlid"] + ""; //配置了树节点不排序,主sql排序默认添加orderid - if (this.SysModel.TreeInhibitSort) + if (this.SysModel.TreeInhibitSort) { sortField = " orderid," + _leftTreeRow["fieldsqlid"]; - if (!Lskj.Business.Impl.BaseImpl.HasExistsColumn(this.SysModel.MenuTable, "orderid")) + if (!Lskj.Business.Impl.BaseImpl.HasExistsColumn(this.SysModel.MenuTable, "orderid")) { MessageUtil.Show(string.Format("配置了树节点禁用默认排序的情况下,请在主表{0}中,添加orderid字段", this.SysModel.MenuTable)); return; @@ -480,7 +480,7 @@ namespace Lskj.PubSpec ? this.SysModel.MenuSql : this.SysModel.MenuSql + string.Format(" and {0} like '{1}{2}' order by {3}", _leftTreeRow["fieldsqlid"] + "", parentValue, maxdivision, sortField); - if (!string.IsNullOrWhiteSpace(this.SysModel.SortField)) + if (!string.IsNullOrWhiteSpace(this.SysModel.SortField)) { sqlValue = string.IsNullOrWhiteSpace(parentValue) ? this.SysModel.MenuSql @@ -493,7 +493,7 @@ namespace Lskj.PubSpec { sqlValue = string.IsNullOrWhiteSpace(parentValue) ? this.SysModel.MenuSql - : this.SysModel.MenuSql + string.Format(" and {0} like '{1}{2}' order by {0}","SpeciesNo", parentValue, maxdivision); + : this.SysModel.MenuSql + string.Format(" and {0} like '{1}{2}' order by {0}", "SpeciesNo", parentValue, maxdivision); } this.gcMain.SetGridViewDataSource(BaseImpl.GetDataTableResult(sqlValue)); @@ -1162,35 +1162,4 @@ namespace Lskj.PubSpec /// 修改人: /// 修改日期: /// 修改备注: - /// 版本:1.0 - /// - /// The sender. - /// The instance containing the event data. - private void OnExportClick(object sender, EventArgs e) - { - try - { - this.gcMain.GridControl.ToExcel(this.Model.FormText); - } - catch (Exception ex) - { - string Message = ErrorMessage.PromptErrorMessage(ex); - MessageUtil.Show(Message, ex.Message); - } - } - - private void simpleButton1_Click(object sender, EventArgs e) - { - try - { - WebBrowserUtil.StartWebBrowser(this.Model.ModuleCode, this.SysModel.MenuText); - } - catch (Exception ex) - { - string Message = ErrorMessage.PromptErrorMessage(ex); - MessageUtil.Show(Message, ex.Message); - } - } - - } -} + /// 版本:1. \ No newline at end of file