| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@ </assemblyBinding> </runtime> <appSettings> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs
@@ -28,65 +28,33 @@ /// </summary> private void InitializeComponent() { this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); this.splitMx1.Panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit(); this.splitMx1.SuspendLayout(); this.SuspendLayout(); // // splitMx1 // this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // this.splitMx1.Panel1.Controls.Add(this.flowLayoutPanel1); this.splitMx1.Panel1.Text = "Panel1"; // // splitMx1.Panel2 // this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(918, 623); this.splitMx1.SplitterPosition = 593; this.splitMx1.TabIndex = 0; // // flowLayoutPanel1 // this.flowLayoutPanel1.AutoScroll = true; this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(100); this.flowLayoutPanel1.Size = new System.Drawing.Size(918, 593); this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(100, 0, 100, 100); this.flowLayoutPanel1.Size = new System.Drawing.Size(1049, 787); this.flowLayoutPanel1.TabIndex = 1; // // EasyRptEdt // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(918, 623); this.Controls.Add(this.splitMx1); this.ClientSize = new System.Drawing.Size(1049, 787); this.Controls.Add(this.flowLayoutPanel1); this.Name = "EasyRptEdt"; this.Text = "打印模板"; ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); this.splitMx1.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit(); this.splitMx1.ResumeLayout(false); this.ResumeLayout(false); } #endregion private DevExpress.XtraEditors.SplitContainerControl splitMx1; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; } } DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
@@ -4,7 +4,9 @@ using Gs.DevApp.UserControl; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Data; using System.Windows.Forms; namespace Gs.DevApp.DevFrm.Sys { @@ -18,6 +20,7 @@ private void GetList() { this.flowLayoutPanel1.Controls.Clear(); var _obj = new { keyType = "" @@ -32,10 +35,15 @@ foreach (DataRow row in dt.Rows) { SimpleButton btn = new DevExpress.XtraEditors.SimpleButton(); btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32; if (row["reportType"].ToString().StartsWith("客户模板")) { btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32; } else btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32; btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter; btn.Name = Guid.NewGuid().ToString(); btn.Size = new System.Drawing.Size(150, 150); btn.Size = new System.Drawing.Size(170, 170); btn.TabIndex = 1; btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString(); btn.Margin = new System.Windows.Forms.Padding(20); @@ -56,12 +64,16 @@ btn2.Click += (s, e) => { EasyRptEdtShow frm = new EasyRptEdtShow(); frm.UpdateParent += (ss, ee) => { GetList(); }; frm.ShowDialog(); }; } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } }
@@ -18,7 +18,14 @@ }, null, false); getPageList(1, 999999); btnSave.Click += BtnSave_Click; this.FormClosed += EasyRptEdtShow_FormClosed; } private void EasyRptEdtShow_FormClosed(object sender, FormClosedEventArgs e) { UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = "1" }); } /// <summary> /// 增加 /// </summary> @@ -43,6 +50,7 @@ if (_rtn.rtnCode > 0) { MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg); txt_reportName.Text = ""; getPageList(1, 999999); } else @@ -108,19 +116,19 @@ return; var _obj = new { suppId = mxGuid, joinType = -1, guid = mxGuid, }; try { var strJson = UtilityHelper.HttpPost("", "Report/" + "SrmJoin", "Report/" + "DeleteModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg); getPageList(1, 999999); getPageList(1, 999999); } else MsgHelper.ShowError("提示：" + _rtn.rtnMsg); @@ -131,5 +139,12 @@ } } } /// <summary> /// 选择后的回调事件 /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; } } DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -59,7 +59,6 @@ getPageList(1); getPageListSrm(1); }; ///////// Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView2, null, null, null, "", null, null, false); getPageListSrm(1);
