From c417c607f22f90e1e1cec2d2a5fcde754f5adb73 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期一, 09 九月 2024 22:13:34 +0800
Subject: [PATCH] 增加日志
---
DevApp/Gs.DevApp/TestForm/TEST.Designer.cs | 229 ----
DevApp/Gs.DevApp/Resources/formatnumbertime_16x16.png | 0
DevApp/Gs.DevApp/Properties/Settings.Designer.cs | 6
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/Entity/ReturnModel.cs | 2
DevApp/Gs.DevApp/Properties/Settings.settings | 2
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs | 174 +++
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs | 82 +
DevApp/Gs.DevApp/Query/MesItemQuery.cs | 2
DevApp/Gs.DevApp/Service/MesItemServices.cs | 2
DevApp/Gs.DevApp/DevFrm/User/Organization.cs | 4
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 6
DevApp/Gs.DevApp/Resources/csharp_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 681 ++++++++++++++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 75 +
DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 373 +++++++
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/FrmMesItems.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 39
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 2
DevApp/Gs.DevApp/Entity/PageQueryModel.cs | 2
DevApp/Gs.DevApp/DevFrm/User/User.cs | 4
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 114 +
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.resx | 140 ++
/dev/null | 14
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 8
DevApp/Gs.DevApp/Entity/LoginInfoModel.cs | 2
DevApp/Gs.DevApp/Properties/Resources1.Designer.cs | 20
DevApp/Gs.DevApp/Properties/Resources.resx | 20
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 579 ++++++++++++
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.resx | 120 ++
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 91 +
35 files changed, 2,475 insertions(+), 332 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index ff5c903..23847a0 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -38,7 +38,7 @@
<setting name="remember" serializeAs="String">
<value>False</value>
</setting>
- <setting name="orgguid" serializeAs="String">
+ <setting name="orgGuid" serializeAs="String">
<value />
</setting>
</Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/FrmMesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/FrmMesItems.cs
index 0d78b7a..9572161 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/FrmMesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/FrmMesItems.cs
@@ -1,6 +1,6 @@
锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraTab;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.Query;
using Gs.DevApp.Service;
using System;
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index c624c79..274ef24 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using System;
using System.Windows.Forms;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Newtonsoft.Json.Linq;
using System.Data;
@@ -24,7 +24,7 @@
/// </summary>
private void getTree()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "factory", "asc", "", "and status=1");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "and status=1");
string json = JsonConvert.SerializeObject(pgq);
string strReturn = "";
try
@@ -86,7 +86,7 @@
{
Properties.Settings.Default.userName = (ckRemember.Checked ? txtUser.Text.Trim() : "");
Properties.Settings.Default.userPwd = (ckRemember.Checked ? txtPwd.Text.Trim() : "");
- Properties.Settings.Default.orgguid = (ckRemember.Checked ? comOrg.SelectedValue.ToString() : "");
+ Properties.Settings.Default.orgGuid = (ckRemember.Checked ? comOrg.SelectedValue.ToString() : "");
Properties.Settings.Default.remember = ckRemember.Checked;
Properties.Settings.Default.Save();
LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
@@ -116,7 +116,7 @@
{
txtUser.Text = Properties.Settings.Default.userName;
txtPwd.Text = Properties.Settings.Default.userPwd;
- comOrg.SelectedValue = Properties.Settings.Default.orgguid;
+ comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
ckRemember.Checked = true;
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index fd2a596..4733e48 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -8,7 +8,7 @@
using System.Windows.Forms;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm
@@ -23,7 +23,57 @@
tab.CloseButtonClick += Tab_CloseButtonClick;
tooLoading.Click += TooLoading_Click;
getTree();
+ barPwd.ItemClick += BarPwd_ItemClick;
+ barExit.ItemClick += BarExit_ItemClick;
+ this.FormClosing += FrmMain_FormClosing;
}
+
+ private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
+ {
+ int i = _userOut();
+ if (i > 0)
+ {
+ this.FormClosing -= new FormClosingEventHandler(this.FrmMain_FormClosing);
+ Application.Exit();
+ }
+ else
+ e.Cancel = true;//鍙栨秷銆傝繑鍥炵獥浣�
+ }
+ else
+ e.Cancel = true;//鍙栨秷銆傝繑鍥炵獥浣�
+ }
+
+ /// <summary>
+ /// 閫�鍑�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void BarExit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
+ {
+ int i = _userOut();
+ if (i > 0)
+ {
+ this.FormClosing -= new FormClosingEventHandler(this.FrmMain_FormClosing);
+ Application.Exit();
+ }
+ }
+ }
+
+ /// <summary>
+ /// 璁剧疆鐢ㄦ埛瀵嗙爜
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void BarPwd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ User.UserSetPwd frm = new User.UserSetPwd(LoginInfoModel.CurrentUser.LoginUserGuid);
+ frm.ShowDialog();
+ }
+
/// <summary>
/// 閲嶆柊鍔犺浇绯荤粺
/// </summary>
@@ -240,5 +290,28 @@
}
return null;
}
+
+ private int _userOut()
+ {
+ var _obj = new
+ {
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "User/UserOut", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ return _rtn.rtnCode;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ return _rtn.rtnCode;
+ }
+ catch (Exception ex)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ return -1;
+ }
+ }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index aa61b63..09809d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -29,19 +29,694 @@
/// </summary>
private void InitializeComponent()
{
+ this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_flagIncludeDocCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_flagSpilitNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_resetZero = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_noLength = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ruleFormat = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_docCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.pageBar1 = new UserControls.Data.PageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_noLength = new System.Windows.Forms.NumericUpDown();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_flagIncludeDocCode = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_flagSpilitNo = new DevExpress.XtraEditors.CheckEdit();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.lblPreview = new DevExpress.XtraEditors.LabelControl();
+ this.txxtItem4 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txxtItem3 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_ruleFormat = new DevExpress.XtraEditors.TextEdit();
+ this.txxtItem2 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.lblRuleFormat = new DevExpress.XtraEditors.LabelControl();
+ this.txxtItem1 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.lblDocCode = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.lblResetZero = new DevExpress.XtraEditors.LabelControl();
+ this.txt_resetZero = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_docCode = new DevExpress.XtraEditors.LookUpEdit();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ this.xtraTabPage2.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_noLength)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_flagIncludeDocCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_flagSpilitNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ruleFormat.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_resetZero.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).BeginInit();
this.SuspendLayout();
+ //
+ // gv_createdBy
+ //
+ this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createdBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createdBy.Caption = "寤虹珛鑰�";
+ this.gv_createdBy.FieldName = "createdBy";
+ this.gv_createdBy.MinWidth = 25;
+ this.gv_createdBy.Name = "gv_createdBy";
+ this.gv_createdBy.OptionsColumn.AllowEdit = false;
+ this.gv_createdBy.Visible = true;
+ this.gv_createdBy.VisibleIndex = 7;
+ this.gv_createdBy.Width = 94;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "寤虹珛鏃ユ湡";
+ this.gv_createDate.FieldName = "createTime";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 6;
+ this.gv_createDate.Width = 94;
+ //
+ // gv_flagIncludeDocCode
+ //
+ this.gv_flagIncludeDocCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
+ this.gv_flagIncludeDocCode.Caption = "鍖呭惈鍗曟嵁绫诲瀷";
+ this.gv_flagIncludeDocCode.FieldName = "flagIncludeDocCode";
+ this.gv_flagIncludeDocCode.MinWidth = 25;
+ this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
+ this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
+ this.gv_flagIncludeDocCode.Visible = true;
+ this.gv_flagIncludeDocCode.VisibleIndex = 5;
+ this.gv_flagIncludeDocCode.Width = 94;
+ //
+ // gv_flagSpilitNo
+ //
+ this.gv_flagSpilitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
+ this.gv_flagSpilitNo.Caption = "搴忓彿鍓嶅垎闅旂";
+ this.gv_flagSpilitNo.FieldName = "flagSpilitNo";
+ this.gv_flagSpilitNo.MinWidth = 25;
+ this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
+ this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
+ this.gv_flagSpilitNo.Visible = true;
+ this.gv_flagSpilitNo.VisibleIndex = 4;
+ this.gv_flagSpilitNo.Width = 94;
+ //
+ // gv_resetZero
+ //
+ this.gv_resetZero.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_resetZero.AppearanceCell.Options.UseFont = true;
+ this.gv_resetZero.Caption = "姣忓ぉ褰掗浂";
+ this.gv_resetZero.FieldName = "resetZero";
+ this.gv_resetZero.MinWidth = 25;
+ this.gv_resetZero.Name = "gv_resetZero";
+ this.gv_resetZero.OptionsColumn.AllowEdit = false;
+ this.gv_resetZero.Visible = true;
+ this.gv_resetZero.VisibleIndex = 3;
+ this.gv_resetZero.Width = 94;
+ //
+ // gv_noLength
+ //
+ this.gv_noLength.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_noLength.AppearanceCell.Options.UseFont = true;
+ this.gv_noLength.Caption = "搴忓彿闀垮害";
+ this.gv_noLength.FieldName = "noLength";
+ this.gv_noLength.MinWidth = 25;
+ this.gv_noLength.Name = "gv_noLength";
+ this.gv_noLength.OptionsColumn.AllowEdit = false;
+ this.gv_noLength.Visible = true;
+ this.gv_noLength.VisibleIndex = 2;
+ this.gv_noLength.Width = 94;
+ //
+ // gv_ruleFormat
+ //
+ this.gv_ruleFormat.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
+ this.gv_ruleFormat.Caption = "缂栫爜瑙勫垯";
+ this.gv_ruleFormat.FieldName = "ruleFormat";
+ this.gv_ruleFormat.MinWidth = 25;
+ this.gv_ruleFormat.Name = "gv_ruleFormat";
+ this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
+ this.gv_ruleFormat.Visible = true;
+ this.gv_ruleFormat.VisibleIndex = 1;
+ this.gv_ruleFormat.Width = 94;
+ //
+ // gv_docCode
+ //
+ this.gv_docCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_docCode.AppearanceCell.Options.UseFont = true;
+ this.gv_docCode.Caption = "鍗曟嵁绫诲瀷";
+ this.gv_docCode.FieldName = "docCode";
+ this.gv_docCode.MinWidth = 25;
+ this.gv_docCode.Name = "gv_docCode";
+ this.gv_docCode.OptionsColumn.AllowEdit = false;
+ this.gv_docCode.Visible = true;
+ this.gv_docCode.VisibleIndex = 0;
+ this.gv_docCode.Width = 94;
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.actions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.Size = new System.Drawing.Size(997, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(995, 510);
+ this.gcMain.TabIndex = 1;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_docCode,
+ this.gv_ruleFormat,
+ this.gv_noLength,
+ this.gv_flagSpilitNo,
+ this.gv_resetZero,
+ this.gv_flagIncludeDocCode,
+ this.gv_createDate,
+ this.gv_createdBy});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(997, 580);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(995, 548);
+ this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 510);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(995, 38);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
+ this.xtraTabPage2.Size = new System.Drawing.Size(995, 548);
+ this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_noLength);
+ this.panel1.Controls.Add(this.labelControl8);
+ this.panel1.Controls.Add(this.labelControl7);
+ this.panel1.Controls.Add(this.txt_flagIncludeDocCode);
+ this.panel1.Controls.Add(this.txt_flagSpilitNo);
+ this.panel1.Controls.Add(this.panelControl1);
+ this.panel1.Controls.Add(this.lblDocCode);
+ this.panel1.Controls.Add(this.labelControl6);
+ this.panel1.Controls.Add(this.lblResetZero);
+ this.panel1.Controls.Add(this.txt_resetZero);
+ this.panel1.Controls.Add(this.txt_docCode);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(72, 33);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(797, 448);
+ this.panel1.TabIndex = 1;
+ //
+ // txt_noLength
+ //
+ this.txt_noLength.Location = new System.Drawing.Point(166, 284);
+ this.txt_noLength.Maximum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.txt_noLength.Minimum = new decimal(new int[] {
+ 3,
+ 0,
+ 0,
+ 0});
+ this.txt_noLength.Name = "txt_noLength";
+ this.txt_noLength.Size = new System.Drawing.Size(159, 28);
+ this.txt_noLength.TabIndex = 237;
+ this.txt_noLength.Value = new decimal(new int[] {
+ 3,
+ 0,
+ 0,
+ 0});
+ //
+ // labelControl8
+ //
+ this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl8.Appearance.Options.UseFont = true;
+ this.labelControl8.Location = new System.Drawing.Point(81, 35);
+ this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(85, 21);
+ this.labelControl8.TabIndex = 236;
+ this.labelControl8.Text = "鍗曟嵁绫诲瀷锛�";
+ //
+ // labelControl7
+ //
+ this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl7.Appearance.Options.UseFont = true;
+ this.labelControl7.Location = new System.Drawing.Point(543, -23);
+ this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(85, 21);
+ this.labelControl7.TabIndex = 232;
+ this.labelControl7.Text = "鍗曟嵁瀛楀ご锛�";
+ //
+ // txt_flagIncludeDocCode
+ //
+ this.txt_flagIncludeDocCode.Location = new System.Drawing.Point(372, 337);
+ this.txt_flagIncludeDocCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_flagIncludeDocCode.Name = "txt_flagIncludeDocCode";
+ this.txt_flagIncludeDocCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_flagIncludeDocCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_flagIncludeDocCode.Properties.Caption = "鍖呭惈鍗曟嵁瀛楀ご";
+ this.txt_flagIncludeDocCode.Size = new System.Drawing.Size(174, 25);
+ this.txt_flagIncludeDocCode.TabIndex = 231;
+ //
+ // txt_flagSpilitNo
+ //
+ this.txt_flagSpilitNo.Location = new System.Drawing.Point(372, 287);
+ this.txt_flagSpilitNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_flagSpilitNo.Name = "txt_flagSpilitNo";
+ this.txt_flagSpilitNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_flagSpilitNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_flagSpilitNo.Properties.Caption = "搴忓彿鍓嶅姞闂撮殧绗﹀彿";
+ this.txt_flagSpilitNo.Size = new System.Drawing.Size(174, 25);
+ this.txt_flagSpilitNo.TabIndex = 230;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Appearance.BackColor = System.Drawing.SystemColors.ActiveCaption;
+ this.panelControl1.Appearance.ForeColor = System.Drawing.Color.White;
+ this.panelControl1.Appearance.Options.UseBackColor = true;
+ this.panelControl1.Appearance.Options.UseForeColor = true;
+ this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+ this.panelControl1.Controls.Add(this.labelControl1);
+ this.panelControl1.Controls.Add(this.lblPreview);
+ this.panelControl1.Controls.Add(this.txxtItem4);
+ this.panelControl1.Controls.Add(this.txxtItem3);
+ this.panelControl1.Controls.Add(this.txt_ruleFormat);
+ this.panelControl1.Controls.Add(this.txxtItem2);
+ this.panelControl1.Controls.Add(this.lblRuleFormat);
+ this.panelControl1.Controls.Add(this.txxtItem1);
+ this.panelControl1.Controls.Add(this.labelControl4);
+ this.panelControl1.Controls.Add(this.labelControl5);
+ this.panelControl1.Controls.Add(this.labelControl2);
+ this.panelControl1.Controls.Add(this.labelControl3);
+ this.panelControl1.Location = new System.Drawing.Point(81, 73);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(661, 188);
+ this.panelControl1.TabIndex = 229;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(110, 17);
+ this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(60, 21);
+ this.labelControl1.TabIndex = 0;
+ this.labelControl1.Text = "鍙傛暟1锛�";
+ //
+ // lblPreview
+ //
+ this.lblPreview.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+ this.lblPreview.Appearance.ForeColor = System.Drawing.Color.White;
+ this.lblPreview.Appearance.Options.UseFont = true;
+ this.lblPreview.Appearance.Options.UseForeColor = true;
+ this.lblPreview.Location = new System.Drawing.Point(112, 140);
+ this.lblPreview.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblPreview.Name = "lblPreview";
+ this.lblPreview.Size = new System.Drawing.Size(269, 24);
+ this.lblPreview.TabIndex = 0;
+ this.lblPreview.Text = "鏍蜂緥锛歑X20150506-00001";
+ //
+ // txxtItem4
+ //
+ this.txxtItem4.Location = new System.Drawing.Point(489, 48);
+ this.txxtItem4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txxtItem4.Name = "txxtItem4";
+ this.txxtItem4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txxtItem4.Properties.Appearance.Options.UseFont = true;
+ this.txxtItem4.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txxtItem4.Properties.Items.AddRange(new object[] {
+ "<鏃�>",
+ "<鍏徃缂栧彿>",
+ "<骞村勾>",
+ "<骞村勾骞村勾>",
+ "<鏈堟湀>",
+ "<鏃ユ棩>"});
+ this.txxtItem4.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txxtItem4.Size = new System.Drawing.Size(122, 28);
+ this.txxtItem4.TabIndex = 2;
+ //
+ // txxtItem3
+ //
+ this.txxtItem3.Location = new System.Drawing.Point(363, 48);
+ this.txxtItem3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txxtItem3.Name = "txxtItem3";
+ this.txxtItem3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txxtItem3.Properties.Appearance.Options.UseFont = true;
+ this.txxtItem3.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txxtItem3.Properties.Items.AddRange(new object[] {
+ "<鏃�>",
+ "<鍏徃缂栧彿>",
+ "<骞村勾>",
+ "<骞村勾骞村勾>",
+ "<鏈堟湀>",
+ "<鏃ユ棩>"});
+ this.txxtItem3.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txxtItem3.Size = new System.Drawing.Size(122, 28);
+ this.txxtItem3.TabIndex = 2;
+ //
+ // txt_ruleFormat
+ //
+ this.txt_ruleFormat.EditValue = "";
+ this.txt_ruleFormat.Location = new System.Drawing.Point(112, 91);
+ this.txt_ruleFormat.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_ruleFormat.Name = "txt_ruleFormat";
+ this.txt_ruleFormat.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.txt_ruleFormat.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_ruleFormat.Properties.Appearance.Options.UseBackColor = true;
+ this.txt_ruleFormat.Properties.Appearance.Options.UseFont = true;
+ this.txt_ruleFormat.Properties.ReadOnly = true;
+ this.txt_ruleFormat.Size = new System.Drawing.Size(499, 28);
+ this.txt_ruleFormat.TabIndex = 0;
+ //
+ // txxtItem2
+ //
+ this.txxtItem2.Location = new System.Drawing.Point(238, 48);
+ this.txxtItem2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txxtItem2.Name = "txxtItem2";
+ this.txxtItem2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txxtItem2.Properties.Appearance.Options.UseFont = true;
+ this.txxtItem2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txxtItem2.Properties.Items.AddRange(new object[] {
+ "<鏃�>",
+ "<鍏徃缂栧彿>",
+ "<骞村勾>",
+ "<骞村勾骞村勾>",
+ "<鏈堟湀>",
+ "<鏃ユ棩>"});
+ this.txxtItem2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txxtItem2.Size = new System.Drawing.Size(122, 28);
+ this.txxtItem2.TabIndex = 2;
+ //
+ // lblRuleFormat
+ //
+ this.lblRuleFormat.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lblRuleFormat.Appearance.Options.UseFont = true;
+ this.lblRuleFormat.Location = new System.Drawing.Point(25, 91);
+ this.lblRuleFormat.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblRuleFormat.Name = "lblRuleFormat";
+ this.lblRuleFormat.Size = new System.Drawing.Size(85, 21);
+ this.lblRuleFormat.TabIndex = 0;
+ this.lblRuleFormat.Text = "缂栫爜瑙勫垯锛�";
+ //
+ // txxtItem1
+ //
+ this.txxtItem1.Location = new System.Drawing.Point(112, 48);
+ this.txxtItem1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txxtItem1.Name = "txxtItem1";
+ this.txxtItem1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txxtItem1.Properties.Appearance.Options.UseFont = true;
+ this.txxtItem1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txxtItem1.Properties.Items.AddRange(new object[] {
+ "<鏃�>",
+ "<鍏徃缂栧彿>",
+ "<骞村勾>",
+ "<骞村勾骞村勾>",
+ "<鏈堟湀>",
+ "<鏃ユ棩>"});
+ this.txxtItem1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txxtItem1.Size = new System.Drawing.Size(122, 28);
+ this.txxtItem1.TabIndex = 2;
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(25, 49);
+ this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(85, 21);
+ this.labelControl4.TabIndex = 0;
+ this.labelControl4.Text = "閰嶇疆鍙傛暟锛�";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(488, 17);
+ this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(60, 21);
+ this.labelControl5.TabIndex = 0;
+ this.labelControl5.Text = "鍙傛暟4锛�";
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(238, 17);
+ this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(60, 21);
+ this.labelControl2.TabIndex = 0;
+ this.labelControl2.Text = "鍙傛暟2锛�";
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(362, 17);
+ this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(60, 21);
+ this.labelControl3.TabIndex = 0;
+ this.labelControl3.Text = "鍙傛暟3锛�";
+ //
+ // lblDocCode
+ //
+ this.lblDocCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lblDocCode.Appearance.Options.UseFont = true;
+ this.lblDocCode.Location = new System.Drawing.Point(194, -23);
+ this.lblDocCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblDocCode.Name = "lblDocCode";
+ this.lblDocCode.Size = new System.Drawing.Size(85, 21);
+ this.lblDocCode.TabIndex = 226;
+ this.lblDocCode.Text = "鍗曟嵁鍚嶇О锛�";
+ //
+ // labelControl6
+ //
+ this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl6.Appearance.Options.UseFont = true;
+ this.labelControl6.Location = new System.Drawing.Point(81, 289);
+ this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl6.Name = "labelControl6";
+ this.labelControl6.Size = new System.Drawing.Size(85, 21);
+ this.labelControl6.TabIndex = 227;
+ this.labelControl6.Text = "搴忓彿闀垮害锛�";
+ //
+ // lblResetZero
+ //
+ this.lblResetZero.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lblResetZero.Appearance.Options.UseFont = true;
+ this.lblResetZero.Location = new System.Drawing.Point(81, 339);
+ this.lblResetZero.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblResetZero.Name = "lblResetZero";
+ this.lblResetZero.Size = new System.Drawing.Size(85, 21);
+ this.lblResetZero.TabIndex = 221;
+ this.lblResetZero.Text = "褰掗浂鏂瑰紡锛�";
+ //
+ // txt_resetZero
+ //
+ this.txt_resetZero.EditValue = "";
+ this.txt_resetZero.Location = new System.Drawing.Point(166, 335);
+ this.txt_resetZero.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_resetZero.Name = "txt_resetZero";
+ this.txt_resetZero.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_resetZero.Properties.Appearance.Options.UseFont = true;
+ this.txt_resetZero.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_resetZero.Properties.Items.AddRange(new object[] {
+ "--璇烽�夋嫨--",
+ "褰掗浂",
+ "涓嶅綊闆�"});
+ this.txt_resetZero.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_resetZero.Size = new System.Drawing.Size(159, 28);
+ this.txt_resetZero.TabIndex = 218;
+ //
+ // txt_docCode
+ //
+ this.txt_docCode.Location = new System.Drawing.Point(166, 31);
+ this.txt_docCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_docCode.Name = "txt_docCode";
+ this.txt_docCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_docCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_docCode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_docCode.Properties.NullText = "";
+ this.txt_docCode.Size = new System.Drawing.Size(248, 28);
+ this.txt_docCode.TabIndex = 224;
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(81, 390);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(45, 18);
+ this.labelControl11.TabIndex = 130;
+ this.labelControl11.Text = "涓婚敭锛�";
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(118, 390);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
//
// DocNoRule
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(657, 342);
+ this.ClientSize = new System.Drawing.Size(997, 660);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
this.Name = "DocNoRule";
- this.Text = "DocNoRule";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ this.xtraTabPage2.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_noLength)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_flagIncludeDocCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_flagSpilitNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.panelControl1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ruleFormat.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_resetZero.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).EndInit();
this.ResumeLayout(false);
}
-
#endregion
+ private UserControl.ToolBarMenu toolBarMenu1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private UserControls.Data.PageBar pageBar1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_flagIncludeDocCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_flagSpilitNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_resetZero;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_noLength;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ruleFormat;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_docCode;
+ private DevExpress.XtraEditors.LabelControl labelControl7;
+ private DevExpress.XtraEditors.CheckEdit txt_flagIncludeDocCode;
+ private DevExpress.XtraEditors.CheckEdit txt_flagSpilitNo;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.LabelControl lblPreview;
+ private DevExpress.XtraEditors.ComboBoxEdit txxtItem4;
+ private DevExpress.XtraEditors.ComboBoxEdit txxtItem3;
+ private DevExpress.XtraEditors.TextEdit txt_ruleFormat;
+ private DevExpress.XtraEditors.ComboBoxEdit txxtItem2;
+ private DevExpress.XtraEditors.LabelControl lblRuleFormat;
+ private DevExpress.XtraEditors.ComboBoxEdit txxtItem1;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.LabelControl lblDocCode;
+ private DevExpress.XtraEditors.LabelControl labelControl6;
+ private DevExpress.XtraEditors.LabelControl lblResetZero;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_resetZero;
+ private DevExpress.XtraEditors.LookUpEdit txt_docCode;
+ private DevExpress.XtraEditors.LabelControl labelControl8;
+ private System.Windows.Forms.NumericUpDown txt_noLength;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 3e45ef2..a2c41f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,12 +1,11 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
@@ -16,6 +15,364 @@
public DocNoRule()
{
InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ getPageList(1, UtilityHelper.GetPageSize());
+ getTree();
+ txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
+ txxtItem1.EditValueChanged += TxxtItem1_EditValueChanged;
+ txxtItem2.EditValueChanged += TxxtItem1_EditValueChanged;
+ txxtItem3.EditValueChanged += TxxtItem1_EditValueChanged;
+ txxtItem4.EditValueChanged += TxxtItem1_EditValueChanged;
+ txt_noLength.ValueChanged += Txt_noLength_ValueChanged;
+ txt_flagIncludeDocCode.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
+ txt_flagSpilitNo.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
}
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ //// 鑾峰彇GridView缁勪欢
+ //GridView view = sender as GridView;
+ //// 纭繚view涓嶄负null
+ //if (view == null) return;
+ //// 鑾峰彇搴旂敤鐨勭瓫閫夊櫒淇℃伅
+ //string filter = view.ActiveFilterString;
+ //MessageBox.Show(filter);
+ //getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 鍙屽嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ GridHitInfo info = gridView1.CalcHitInfo(e.Location);
+ if (info.InRow)
+ {
+ GridView view = info.View as GridView;
+ if (view != null)
+ {
+ DataRow row = view.GetDataRow(info.RowHandle);
+ if (row != null)
+ {
+ string rowGuid = (row["guid"].ToString());
+ getModel(rowGuid, false, 999);
+ }
+ }
+ }
+ }
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ }
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ DataRow dr = gridView1.GetFocusedDataRow();
+ if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + dr["docCode"].ToString() + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guidList = dr["guid"].ToString(),//涓诲缓
+ };
+ string strJson = "";
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "DocNoRule/DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ DataRow dr = gridView1.GetFocusedDataRow();
+ if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
+ getModel(dr["guid"].ToString(), true, 1);
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = true;
+ }
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 1);
+ lbGuid.Text = "";
+ UtilityHelper.CleanValue(this.panel1.Controls, true);
+ txxtItem1.SelectedIndex = txxtItem2.SelectedIndex = txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0;
+
+ }
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ if (txt_docCode.EditValue == null || string.IsNullOrEmpty(txt_docCode.EditValue.ToString()))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_docCode.Focus();
+ return;
+ }
+ if (txt_ruleFormat.Text.Length <= 0)
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閰嶇疆鍙傛暟锛�");
+ txt_docCode.Focus();
+ return;
+ }
+ if (txt_resetZero.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨褰掗浂鏂瑰紡锛�");
+ txt_resetZero.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//涓诲缓
+ docCode = txt_docCode.EditValue.ToString(),
+ ruleFormat = txt_ruleFormat.Text.ToString(),
+ //currentValue = txt_currentValue.Text.ToString(),
+ noLength = txt_noLength.Value.ToString(),
+ resetZero = txt_resetZero.SelectedIndex.ToString(),
+ flagSpilitNo = txt_flagSpilitNo.Checked ? 1 : 2,
+ flagIncludeDocCode = txt_flagIncludeDocCode.Checked ? 1 : 2,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "DocNoRule/EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnable(this.panel1.Controls, false);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", "DocNoRule/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ int dddd = dd.rtnData.pages;//鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
+ {
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "DocNoRule/GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ txt_docCode.EditValue = dy.docCode.ToString();
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
+ string _rule = dy.ruleFormat.ToString();
+ string[] _ary = _rule.Split(new char[] { '<' }, StringSplitOptions.RemoveEmptyEntries);
+ if (_ary.Length > 0)
+ txxtItem1.Text = "<" + _ary[0];
+ if (_ary.Length > 1)
+ txxtItem2.Text = "<" + _ary[1];
+ if (_ary.Length > 2)
+ txxtItem3.Text = "<" + _ary[2];
+ if (_ary.Length > 3)
+ txxtItem4.Text = "<" + _ary[3];
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void getTree()
+ {
+ // 鍒涘缓鏁版嵁琛�
+ DataTable dataTable = new DataTable();
+ dataTable.Columns.Add("docCode", typeof(string));
+ // 娣诲姞鏁版嵁琛�
+ dataTable.Rows.Add("DH(鍒拌揣鍗�)");
+ dataTable.Rows.Add("QO(鎶ヤ环鍗�)");
+ dataTable.Rows.Add("PO(閲囪喘璁㈠崟)");
+ dataTable.Rows.Add("IA(搴撳瓨璋冩暣)");
+ dataTable.Rows.Add("IO(鍑哄簱鍗�)");
+ dataTable.Rows.Add("AR(搴旀敹娆�)");
+ dataTable.Rows.Add("SO(閿�鍞鍗�)");
+ dataTable.Rows.Add("AP(搴斾粯娆�)");
+ dataTable.Rows.Add("IV(閿�鍞彂绁�)");
+ dataTable.Rows.Add("IV(閿�鍞彂绁�)");
+ dataTable.Rows.Add("IN(鍏ュ簱)");
+ dataTable.Rows.Add("PN(鐢熶骇搴�)");
+ // 璁剧疆LookUpEdit鐨勬暟鎹簮
+ txt_docCode.Properties.DataSource = dataTable;
+ txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
+ txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
+ txt_docCode.Properties.TextEditStyle = TextEditStyles.Standard;
+ }
+
+ private void Txt_flagIncludeDocCode_CheckedChanged(object sender, EventArgs e)
+ {
+ DoPreviewCode();
+ }
+
+ private void Txt_noLength_ValueChanged(object sender, EventArgs e)
+ {
+ DoPreviewCode();
+ }
+
+ private void TxxtItem1_EditValueChanged(object sender, EventArgs e)
+ {
+ DoPreviewCode();
+ }
+ private void DoPreviewCode()
+ {
+ if (txt_docCode.Enabled == false
+ || txxtItem1.Enabled==false
+ || txxtItem2.Enabled == false
+ || txxtItem3.Enabled == false
+ || txxtItem4.Enabled == false)
+ return;
+ var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text;
+ txt_ruleFormat.Text = text;
+ if (txt_docCode.EditValue == null)
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨鍗曟嵁绫诲瀷");
+ txt_docCode.Focus();
+ return;
+ }
+ if (txt_ruleFormat.Text == "")
+ {
+ lblPreview.Text = "璇峰畾涔夎鍒�.";
+ }
+ else
+ {
+ // txtRuleFormat="<骞村勾>", "<骞村勾骞村勾>", "<鏈堟湀>", "<鏃ユ棩>" });
+ var preview = txt_ruleFormat.Text;
+ var length = int.Parse(txt_noLength.Value.ToString());
+ var docCode = "";
+ if (txt_flagIncludeDocCode.Checked)
+ {
+ docCode = txt_docCode.EditValue.ToString();
+ }
+ preview = docCode + preview;
+ preview = preview.Replace("<鏃�>", "");
+ preview = preview.Replace("<骞村勾骞村勾>", "2024");
+ preview = preview.Replace("<骞村勾>", "24");
+ preview = preview.Replace("<鏈堟湀>", "06");
+ preview = preview.Replace("<鏃ユ棩>", "18");
+ preview = preview + (txt_flagSpilitNo.Checked ? "-" : "") + "8".PadLeft(length, '0');
+ lblPreview.Text = "鐢熸垚缂栧彿锛�" + preview;
+ }
+ }
+ private void Txt_docCode_EditValueChanged(object sender, EventArgs e)
+ {
+ DoPreviewCode();
+ }
+
}
-}
\ No newline at end of file
+}
+
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
index 92eedd6..0c06a41 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
@@ -241,7 +241,9 @@
+ "this." + _gvName + ".MinWidth = 25;" + line
+ "this." + _gvName + ".Visible = true;" + line
+ "this." + _gvName + ".Width =94;" + line
+ + "this." + _gvName + ".OptionsColumn.AllowEdit = false;" + line
+ "this." + _gvName + ".VisibleIndex = 0;" + line;
+
strbuilder.Replace("BQSetControlInfo", BQSetControlInfo);
//BQAddControltoMContainer//灏嗘帶浠舵坊鍔犲埌Form 瀹瑰櫒涓� 杩欎釜瀹瑰櫒鍙互鏄� panel 鍙互鏄痝roupbox 绛夌瓑
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
new file mode 100644
index 0000000..033c178
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -0,0 +1,579 @@
+锘�
+namespace Gs.DevApp.DevFrm.Sys
+{
+ partial class SysLog
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lb_abtGuid = new DevExpress.XtraEditors.LabelControl();
+ this.txt_abtGuid = new DevExpress.XtraEditors.TextEdit();
+ this.lb_msg = new DevExpress.XtraEditors.LabelControl();
+ this.txt_msg = new DevExpress.XtraEditors.TextEdit();
+ this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_menuName = new DevExpress.XtraEditors.LabelControl();
+ this.txt_menuName = new DevExpress.XtraEditors.TextEdit();
+ this.lb_formCaption = new DevExpress.XtraEditors.LabelControl();
+ this.txt_formCaption = new DevExpress.XtraEditors.TextEdit();
+ this.lb_formName = new DevExpress.XtraEditors.LabelControl();
+ this.txt_formName = new DevExpress.XtraEditors.TextEdit();
+ this.lb_userName = new DevExpress.XtraEditors.LabelControl();
+ this.txt_userName = new DevExpress.XtraEditors.TextEdit();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_userGuid = new DevExpress.XtraEditors.LabelControl();
+ this.txt_userGuid = new DevExpress.XtraEditors.TextEdit();
+ this.lb_operationTable = new DevExpress.XtraEditors.LabelControl();
+ this.txt_operationTable = new DevExpress.XtraEditors.TextEdit();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_operationTime = new DevExpress.XtraEditors.LabelControl();
+ this.txt_operationTime = new DevExpress.XtraEditors.TextEdit();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_operationType = new DevExpress.XtraEditors.LabelControl();
+ this.txt_operationType = new DevExpress.XtraEditors.TextEdit();
+ this.lb_guid = new DevExpress.XtraEditors.LabelControl();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.pageBar1 = new UserControls.Data.PageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtGuid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_menuName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formCaption.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userGuid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ this.xtraTabPage2.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // lb_abtGuid
+ //
+ this.lb_abtGuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_abtGuid.Appearance.Options.UseFont = true;
+ this.lb_abtGuid.Location = new System.Drawing.Point(520, 84);
+ this.lb_abtGuid.Name = "lb_abtGuid";
+ this.lb_abtGuid.Size = new System.Drawing.Size(74, 21);
+ this.lb_abtGuid.TabIndex = 235;
+ this.lb_abtGuid.Tag = "abtGuid";
+ this.lb_abtGuid.Text = "abtGuid锛�";
+ //
+ // txt_abtGuid
+ //
+ this.txt_abtGuid.Location = new System.Drawing.Point(580, 84);
+ this.txt_abtGuid.Name = "txt_abtGuid";
+ this.txt_abtGuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_abtGuid.Properties.Appearance.Options.UseFont = true;
+ this.txt_abtGuid.Size = new System.Drawing.Size(150, 28);
+ this.txt_abtGuid.TabIndex = 235;
+ this.txt_abtGuid.Tag = "abtGuid";
+ //
+ // lb_msg
+ //
+ this.lb_msg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_msg.Appearance.Options.UseFont = true;
+ this.lb_msg.Location = new System.Drawing.Point(270, 84);
+ this.lb_msg.Name = "lb_msg";
+ this.lb_msg.Size = new System.Drawing.Size(48, 21);
+ this.lb_msg.TabIndex = 231;
+ this.lb_msg.Tag = "msg";
+ this.lb_msg.Text = "msg锛�";
+ //
+ // txt_msg
+ //
+ this.txt_msg.Location = new System.Drawing.Point(330, 84);
+ this.txt_msg.Name = "txt_msg";
+ this.txt_msg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_msg.Properties.Appearance.Options.UseFont = true;
+ this.txt_msg.Size = new System.Drawing.Size(150, 28);
+ this.txt_msg.TabIndex = 231;
+ this.txt_msg.Tag = "msg";
+ //
+ // gv_msg
+ //
+ this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_msg.AppearanceCell.Options.UseFont = true;
+ this.gv_msg.Caption = "鎿嶄綔璇︽儏";
+ this.gv_msg.FieldName = "msg";
+ this.gv_msg.MinWidth = 25;
+ this.gv_msg.Name = "gv_msg";
+ this.gv_msg.OptionsColumn.AllowEdit = false;
+ this.gv_msg.Visible = true;
+ this.gv_msg.VisibleIndex = 3;
+ this.gv_msg.Width = 94;
+ //
+ // lb_menuName
+ //
+ this.lb_menuName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_menuName.Appearance.Options.UseFont = true;
+ this.lb_menuName.Location = new System.Drawing.Point(20, 84);
+ this.lb_menuName.Name = "lb_menuName";
+ this.lb_menuName.Size = new System.Drawing.Size(101, 21);
+ this.lb_menuName.TabIndex = 228;
+ this.lb_menuName.Tag = "menuName";
+ this.lb_menuName.Text = "menuName锛�";
+ //
+ // txt_menuName
+ //
+ this.txt_menuName.Location = new System.Drawing.Point(80, 84);
+ this.txt_menuName.Name = "txt_menuName";
+ this.txt_menuName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_menuName.Properties.Appearance.Options.UseFont = true;
+ this.txt_menuName.Size = new System.Drawing.Size(150, 28);
+ this.txt_menuName.TabIndex = 228;
+ this.txt_menuName.Tag = "menuName";
+ //
+ // lb_formCaption
+ //
+ this.lb_formCaption.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_formCaption.Appearance.Options.UseFont = true;
+ this.lb_formCaption.Location = new System.Drawing.Point(770, 52);
+ this.lb_formCaption.Name = "lb_formCaption";
+ this.lb_formCaption.Size = new System.Drawing.Size(107, 21);
+ this.lb_formCaption.TabIndex = 226;
+ this.lb_formCaption.Tag = "formCaption";
+ this.lb_formCaption.Text = "formCaption锛�";
+ //
+ // txt_formCaption
+ //
+ this.txt_formCaption.Location = new System.Drawing.Point(830, 52);
+ this.txt_formCaption.Name = "txt_formCaption";
+ this.txt_formCaption.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_formCaption.Properties.Appearance.Options.UseFont = true;
+ this.txt_formCaption.Size = new System.Drawing.Size(150, 28);
+ this.txt_formCaption.TabIndex = 226;
+ this.txt_formCaption.Tag = "formCaption";
+ //
+ // lb_formName
+ //
+ this.lb_formName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_formName.Appearance.Options.UseFont = true;
+ this.lb_formName.Location = new System.Drawing.Point(520, 52);
+ this.lb_formName.Name = "lb_formName";
+ this.lb_formName.Size = new System.Drawing.Size(94, 21);
+ this.lb_formName.TabIndex = 222;
+ this.lb_formName.Tag = "formName";
+ this.lb_formName.Text = "formName锛�";
+ //
+ // txt_formName
+ //
+ this.txt_formName.Location = new System.Drawing.Point(580, 52);
+ this.txt_formName.Name = "txt_formName";
+ this.txt_formName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_formName.Properties.Appearance.Options.UseFont = true;
+ this.txt_formName.Size = new System.Drawing.Size(150, 28);
+ this.txt_formName.TabIndex = 222;
+ this.txt_formName.Tag = "formName";
+ //
+ // lb_userName
+ //
+ this.lb_userName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_userName.Appearance.Options.UseFont = true;
+ this.lb_userName.Location = new System.Drawing.Point(270, 52);
+ this.lb_userName.Name = "lb_userName";
+ this.lb_userName.Size = new System.Drawing.Size(92, 21);
+ this.lb_userName.TabIndex = 219;
+ this.lb_userName.Tag = "userName";
+ this.lb_userName.Text = "userName锛�";
+ //
+ // txt_userName
+ //
+ this.txt_userName.Location = new System.Drawing.Point(330, 52);
+ this.txt_userName.Name = "txt_userName";
+ this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_userName.Properties.Appearance.Options.UseFont = true;
+ this.txt_userName.Size = new System.Drawing.Size(150, 28);
+ this.txt_userName.TabIndex = 219;
+ this.txt_userName.Tag = "userName";
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鎿嶄綔浜哄憳";
+ this.gv_userName.FieldName = "userName";
+ this.gv_userName.MinWidth = 25;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Visible = true;
+ this.gv_userName.VisibleIndex = 2;
+ this.gv_userName.Width = 94;
+ //
+ // lb_userGuid
+ //
+ this.lb_userGuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_userGuid.Appearance.Options.UseFont = true;
+ this.lb_userGuid.Location = new System.Drawing.Point(20, 52);
+ this.lb_userGuid.Name = "lb_userGuid";
+ this.lb_userGuid.Size = new System.Drawing.Size(82, 21);
+ this.lb_userGuid.TabIndex = 217;
+ this.lb_userGuid.Tag = "userGuid";
+ this.lb_userGuid.Text = "userGuid锛�";
+ //
+ // txt_userGuid
+ //
+ this.txt_userGuid.Location = new System.Drawing.Point(80, 52);
+ this.txt_userGuid.Name = "txt_userGuid";
+ this.txt_userGuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_userGuid.Properties.Appearance.Options.UseFont = true;
+ this.txt_userGuid.Size = new System.Drawing.Size(150, 28);
+ this.txt_userGuid.TabIndex = 217;
+ this.txt_userGuid.Tag = "userGuid";
+ //
+ // lb_operationTable
+ //
+ this.lb_operationTable.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_operationTable.Appearance.Options.UseFont = true;
+ this.lb_operationTable.Location = new System.Drawing.Point(770, 20);
+ this.lb_operationTable.Name = "lb_operationTable";
+ this.lb_operationTable.Size = new System.Drawing.Size(128, 21);
+ this.lb_operationTable.TabIndex = 216;
+ this.lb_operationTable.Tag = "operationTable";
+ this.lb_operationTable.Text = "operationTable锛�";
+ //
+ // txt_operationTable
+ //
+ this.txt_operationTable.Location = new System.Drawing.Point(830, 20);
+ this.txt_operationTable.Name = "txt_operationTable";
+ this.txt_operationTable.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_operationTable.Properties.Appearance.Options.UseFont = true;
+ this.txt_operationTable.Size = new System.Drawing.Size(150, 28);
+ this.txt_operationTable.TabIndex = 216;
+ this.txt_operationTable.Tag = "operationTable";
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "鐩稿叧琛�";
+ this.gv_operationTable.FieldName = "operationTable";
+ this.gv_operationTable.MinWidth = 25;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 94;
+ //
+ // lb_operationTime
+ //
+ this.lb_operationTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_operationTime.Appearance.Options.UseFont = true;
+ this.lb_operationTime.Location = new System.Drawing.Point(520, 20);
+ this.lb_operationTime.Name = "lb_operationTime";
+ this.lb_operationTime.Size = new System.Drawing.Size(124, 21);
+ this.lb_operationTime.TabIndex = 213;
+ this.lb_operationTime.Tag = "operationTime";
+ this.lb_operationTime.Text = "operationTime锛�";
+ //
+ // txt_operationTime
+ //
+ this.txt_operationTime.Location = new System.Drawing.Point(580, 20);
+ this.txt_operationTime.Name = "txt_operationTime";
+ this.txt_operationTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_operationTime.Properties.Appearance.Options.UseFont = true;
+ this.txt_operationTime.Size = new System.Drawing.Size(150, 28);
+ this.txt_operationTime.TabIndex = 213;
+ this.txt_operationTime.Tag = "operationTime";
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
+ this.gv_operationTime.FieldName = "operationTime";
+ this.gv_operationTime.MinWidth = 25;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 94;
+ //
+ // lb_operationType
+ //
+ this.lb_operationType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_operationType.Appearance.Options.UseFont = true;
+ this.lb_operationType.Location = new System.Drawing.Point(270, 20);
+ this.lb_operationType.Name = "lb_operationType";
+ this.lb_operationType.Size = new System.Drawing.Size(123, 21);
+ this.lb_operationType.TabIndex = 211;
+ this.lb_operationType.Tag = "operationType";
+ this.lb_operationType.Text = "operationType锛�";
+ //
+ // txt_operationType
+ //
+ this.txt_operationType.Location = new System.Drawing.Point(330, 20);
+ this.txt_operationType.Name = "txt_operationType";
+ this.txt_operationType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_operationType.Properties.Appearance.Options.UseFont = true;
+ this.txt_operationType.Size = new System.Drawing.Size(150, 28);
+ this.txt_operationType.TabIndex = 211;
+ this.txt_operationType.Tag = "operationType";
+ //
+ // lb_guid
+ //
+ this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_guid.Appearance.Options.UseFont = true;
+ this.lb_guid.Location = new System.Drawing.Point(20, 20);
+ this.lb_guid.Name = "lb_guid";
+ this.lb_guid.Size = new System.Drawing.Size(48, 21);
+ this.lb_guid.TabIndex = 210;
+ this.lb_guid.Tag = "guid";
+ this.lb_guid.Text = "guid锛�";
+ //
+ // txt_guid
+ //
+ this.txt_guid.Location = new System.Drawing.Point(80, 20);
+ this.txt_guid.Name = "txt_guid";
+ this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_guid.Properties.Appearance.Options.UseFont = true;
+ this.txt_guid.Size = new System.Drawing.Size(150, 28);
+ this.txt_guid.TabIndex = 210;
+ this.txt_guid.Tag = "guid";
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.actions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.TabIndex = 1;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_msg});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.lb_abtGuid);
+ this.panel1.Controls.Add(this.txt_abtGuid);
+ this.panel1.Controls.Add(this.lb_msg);
+ this.panel1.Controls.Add(this.txt_msg);
+ this.panel1.Controls.Add(this.lb_menuName);
+ this.panel1.Controls.Add(this.txt_menuName);
+ this.panel1.Controls.Add(this.lb_formCaption);
+ this.panel1.Controls.Add(this.txt_formCaption);
+ this.panel1.Controls.Add(this.lb_formName);
+ this.panel1.Controls.Add(this.txt_formName);
+ this.panel1.Controls.Add(this.lb_userName);
+ this.panel1.Controls.Add(this.txt_userName);
+ this.panel1.Controls.Add(this.lb_userGuid);
+ this.panel1.Controls.Add(this.txt_userGuid);
+ this.panel1.Controls.Add(this.lb_operationTable);
+ this.panel1.Controls.Add(this.txt_operationTable);
+ this.panel1.Controls.Add(this.lb_operationTime);
+ this.panel1.Controls.Add(this.txt_operationTime);
+ this.panel1.Controls.Add(this.lb_operationType);
+ this.panel1.Controls.Add(this.txt_operationType);
+ this.panel1.Controls.Add(this.lb_guid);
+ this.panel1.Controls.Add(this.txt_guid);
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(76, 20);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(585, 426);
+ this.panel1.TabIndex = 1;
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(61, 388);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(45, 18);
+ this.labelControl11.TabIndex = 130;
+ this.labelControl11.Text = "涓婚敭锛�";
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(112, 388);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ //
+ // SysLog
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "SysLog";
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtGuid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_menuName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formCaption.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userGuid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ this.xtraTabPage2.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.ToolBarMenu toolBarMenu1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private UserControls.Data.PageBar pageBar1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ //BQCreateConrolObejct
+ private DevExpress.XtraEditors.LabelControl lb_abtGuid;
+ private DevExpress.XtraEditors.TextEdit txt_abtGuid;
+
+ private DevExpress.XtraEditors.LabelControl lb_msg;
+ private DevExpress.XtraEditors.TextEdit txt_msg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
+
+ private DevExpress.XtraEditors.LabelControl lb_menuName;
+ private DevExpress.XtraEditors.TextEdit txt_menuName;
+
+ private DevExpress.XtraEditors.LabelControl lb_formCaption;
+ private DevExpress.XtraEditors.TextEdit txt_formCaption;
+
+ private DevExpress.XtraEditors.LabelControl lb_formName;
+ private DevExpress.XtraEditors.TextEdit txt_formName;
+
+ private DevExpress.XtraEditors.LabelControl lb_userName;
+ private DevExpress.XtraEditors.TextEdit txt_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+
+ private DevExpress.XtraEditors.LabelControl lb_userGuid;
+ private DevExpress.XtraEditors.TextEdit txt_userGuid;
+
+ private DevExpress.XtraEditors.LabelControl lb_operationTable;
+ private DevExpress.XtraEditors.TextEdit txt_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+
+ private DevExpress.XtraEditors.LabelControl lb_operationTime;
+ private DevExpress.XtraEditors.TextEdit txt_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+
+ private DevExpress.XtraEditors.LabelControl lb_operationType;
+ private DevExpress.XtraEditors.TextEdit txt_operationType;
+
+ private DevExpress.XtraEditors.LabelControl lb_guid;
+ private DevExpress.XtraEditors.TextEdit txt_guid;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
new file mode 100644
index 0000000..3f0fc86
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -0,0 +1,91 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Sys
+{
+ public partial class SysLog : DevExpress.XtraEditors.XtraForm
+ {
+ public SysLog()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ //// 鑾峰彇GridView缁勪欢
+ //GridView view = sender as GridView;
+ //// 纭繚view涓嶄负null
+ //if (view == null) return;
+ //// 鑾峰彇搴旂敤鐨勭瓫閫夊櫒淇℃伅
+ //string filter = view.ActiveFilterString;
+ //MessageBox.Show(filter);
+ //getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "operationTime", "asc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ int dddd = dd.rtnData.pages;//鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
+
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.resx b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
index acdf450..e582010 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
@@ -1,4 +1,4 @@
-锘縰sing Gs.DevApp.Models;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -194,7 +194,7 @@
imageList.Images.Add("icon1", Properties.Resources.publicfix_32x32);
imageList.Images.Add("icon2", Properties.Resources.user_16x16);
tlMenu.ImageList = imageList;
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "name", "desc", "", "");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "name", "desc", "", "");
string json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 6c143a2..72eddd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -1,7 +1,7 @@
锘縰sing DevExpress.XtraGrid.Views.Base;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -249,7 +249,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(curPage, pageSize, "createDate", "asc", "", "");
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createDate", "asc", "", "");
string json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index 14b07ae..7696f4c 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -1,6 +1,6 @@
锘縰sing DevExpress.XtraTreeList;
using DevExpress.XtraTreeList.Nodes;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -210,7 +210,7 @@
private void getTree()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "asc", "", "");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "idx", "asc", "", "");
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -265,7 +265,7 @@
private void getDownList()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "asc", "", " and category=1");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "idx", "asc", "", " and category=1");
string json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index ec5a2f2..577be87 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -2,7 +2,7 @@
using DevExpress.XtraGrid.Views.Base;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -232,7 +232,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
string json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 52a469a..e638298 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -1,5 +1,5 @@
锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs
new file mode 100644
index 0000000..541dc19
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.Designer.cs
@@ -0,0 +1,174 @@
+锘�
+namespace Gs.DevApp.DevFrm.User
+{
+ partial class UserSetPwd
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserSetPwd));
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ this.txtNewPwd = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.txtNewPwd2 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd2.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.btnCancel);
+ this.panel1.Controls.Add(this.btnSave);
+ this.panel1.Controls.Add(this.txtNewPwd);
+ this.panel1.Controls.Add(this.labelControl1);
+ this.panel1.Controls.Add(this.txtNewPwd2);
+ this.panel1.Controls.Add(this.labelControl2);
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.panel1.Location = new System.Drawing.Point(86, 65);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(385, 228);
+ this.panel1.TabIndex = 0;
+ //
+ // btnCancel
+ //
+ this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnCancel.Appearance.Options.UseFont = true;
+ this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
+ this.btnCancel.Location = new System.Drawing.Point(222, 164);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(87, 37);
+ this.btnCancel.TabIndex = 238;
+ this.btnCancel.Text = "鍙栨秷 (&C)";
+ //
+ // btnSave
+ //
+ this.btnSave.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnSave.Appearance.Options.UseFont = true;
+ this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
+ this.btnSave.Location = new System.Drawing.Point(101, 164);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(87, 37);
+ this.btnSave.TabIndex = 237;
+ this.btnSave.Text = "纭畾 (&L)";
+ //
+ // txtNewPwd
+ //
+ this.txtNewPwd.EditValue = "";
+ this.txtNewPwd.Location = new System.Drawing.Point(140, 35);
+ this.txtNewPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtNewPwd.Name = "txtNewPwd";
+ this.txtNewPwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtNewPwd.Properties.Appearance.Options.UseFont = true;
+ this.txtNewPwd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.txtNewPwd.Properties.PasswordChar = '*';
+ this.txtNewPwd.Size = new System.Drawing.Size(154, 30);
+ this.txtNewPwd.TabIndex = 235;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Black;
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Appearance.Options.UseForeColor = true;
+ this.labelControl1.Appearance.Options.UseTextOptions = true;
+ this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
+ this.labelControl1.Location = new System.Drawing.Point(44, 41);
+ this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(93, 18);
+ this.labelControl1.TabIndex = 236;
+ this.labelControl1.Text = "鏂板瘑鐮侊細";
+ //
+ // txtNewPwd2
+ //
+ this.txtNewPwd2.EditValue = "";
+ this.txtNewPwd2.Location = new System.Drawing.Point(140, 99);
+ this.txtNewPwd2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtNewPwd2.Name = "txtNewPwd2";
+ this.txtNewPwd2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtNewPwd2.Properties.Appearance.Options.UseFont = true;
+ this.txtNewPwd2.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.txtNewPwd2.Properties.PasswordChar = '*';
+ this.txtNewPwd2.Size = new System.Drawing.Size(154, 30);
+ this.txtNewPwd2.TabIndex = 233;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.ForeColor = System.Drawing.Color.Black;
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Appearance.Options.UseForeColor = true;
+ this.labelControl2.Appearance.Options.UseTextOptions = true;
+ this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
+ this.labelControl2.Location = new System.Drawing.Point(44, 105);
+ this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(93, 18);
+ this.labelControl2.TabIndex = 234;
+ this.labelControl2.Text = "鍐嶈緭涓�娆★細";
+ //
+ // UserSetPwd
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(558, 381);
+ this.Controls.Add(this.panel1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "UserSetPwd";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "UserSetPwd";
+ this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd2.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.TextEdit txtNewPwd;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.TextEdit txtNewPwd2;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.SimpleButton btnCancel;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
new file mode 100644
index 0000000..efe9e25
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -0,0 +1,82 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.User
+{
+ public partial class UserSetPwd : DevExpress.XtraEditors.XtraForm
+ {
+ public string userGuid { get; set; }
+ public UserSetPwd(string _userGuid)
+ {
+ InitializeComponent();
+ this.userGuid = _userGuid;
+ btnCancel.Click += BtnCancel_Click;
+ btnSave.Click += BtnSave_Click;
+ }
+
+ private void BtnSave_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(txtNewPwd.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏂板瘑鐮佷笉鑳戒负绌猴紒");
+ txtNewPwd.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtNewPwd2.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ txtNewPwd2.Focus();
+ return;
+ }
+ if (txtNewPwd.Text!=txtNewPwd2.Text)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犵殑涓ゆ瀵嗙爜涓嶄竴鑷达紒");
+ txtNewPwd2.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ edtUserGuid = userGuid,
+ userGuid = userGuid,
+ newPass = txtNewPwd.Text.Trim()
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "User/SetUserPass", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+ else
+ {
+ this.DialogResult = DialogResult.None;
+ }
+ }
+ catch (Exception ex)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void BtnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.resx b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.resx
new file mode 100644
index 0000000..c0dfd5d
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.resx
@@ -0,0 +1,140 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
+ bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
+ tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW
+ aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA
+ 9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
+ bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
+ PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL
+ cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM
+ bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c
+ 0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg==
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Models/LoginInfoModel.cs b/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
similarity index 97%
rename from DevApp/Gs.DevApp/Models/LoginInfoModel.cs
rename to DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
index 02c1b18..0f57f03 100644
--- a/DevApp/Gs.DevApp/Models/LoginInfoModel.cs
+++ b/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
@@ -1,7 +1,7 @@
锘縰sing System;
-namespace Gs.DevApp.Models
+namespace Gs.DevApp.Entity
{
public class LoginInfoModel
{
diff --git a/DevApp/Gs.DevApp/Models/PageQueryModel.cs b/DevApp/Gs.DevApp/Entity/PageQueryModel.cs
similarity index 98%
rename from DevApp/Gs.DevApp/Models/PageQueryModel.cs
rename to DevApp/Gs.DevApp/Entity/PageQueryModel.cs
index 7a39e7f..0d07321 100644
--- a/DevApp/Gs.DevApp/Models/PageQueryModel.cs
+++ b/DevApp/Gs.DevApp/Entity/PageQueryModel.cs
@@ -1,7 +1,7 @@
锘縰sing System;
-namespace Gs.DevApp.Models
+namespace Gs.DevApp.Entity
{
/// <summary>
/// 鏌ヨ瀹炰綋
diff --git a/DevApp/Gs.DevApp/Models/ReturnModel.cs b/DevApp/Gs.DevApp/Entity/ReturnModel.cs
similarity index 97%
rename from DevApp/Gs.DevApp/Models/ReturnModel.cs
rename to DevApp/Gs.DevApp/Entity/ReturnModel.cs
index 8e9762c..b6801e2 100644
--- a/DevApp/Gs.DevApp/Models/ReturnModel.cs
+++ b/DevApp/Gs.DevApp/Entity/ReturnModel.cs
@@ -1,7 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
-namespace Gs.DevApp.Models
+namespace Gs.DevApp.Entity
{
/// <summary>
/// 杩斿洖鐨勫鍥寸粨鏋�
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c01bc33..9c81670 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -33,15 +33,27 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.BonusSkins.v19.2" />
+ <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v19.2" />
+ <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.PivotGrid.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v19.2" />
<Reference Include="DevExpress.Sparkline.v19.2.Core" />
+ <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraEditors.v19.2" />
<Reference Include="DevExpress.Printing.v19.2.Core" />
+ <Reference Include="DevExpress.XtraGauges.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraReports.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraReports.v19.2.Extensions, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -91,6 +103,12 @@
<Compile Include="DevFrm\Sys\EasyCode.Designer.cs">
<DependentUpon>EasyCode.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\SysLog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SysLog.Designer.cs">
+ <DependentUpon>SysLog.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\User\Organization.cs">
<SubType>Form</SubType>
</Compile>
@@ -121,10 +139,16 @@
<Compile Include="DevFrm\User\UserSelectRole.Designer.cs">
<DependentUpon>UserSelectRole.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\User\UserSetPwd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
+ <DependentUpon>UserSetPwd.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\MesItems.cs" />
- <Compile Include="Models\LoginInfoModel.cs" />
- <Compile Include="Models\PageQueryModel.cs" />
- <Compile Include="Models\ReturnModel.cs" />
+ <Compile Include="Entity\PageQueryModel.cs" />
+ <Compile Include="Entity\ReturnModel.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources1.Designer.cs">
@@ -183,6 +207,9 @@
<EmbeddedResource Include="DevFrm\Sys\EasyCode.resx">
<DependentUpon>EasyCode.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\SysLog.resx">
+ <DependentUpon>SysLog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\Organization.resx">
<DependentUpon>Organization.cs</DependentUpon>
</EmbeddedResource>
@@ -195,9 +222,11 @@
<EmbeddedResource Include="DevFrm\User\User.resx">
<DependentUpon>User.cs</DependentUpon>
</EmbeddedResource>
- <None Include="Properties\licenses.licx" />
<EmbeddedResource Include="DevFrm\User\UserSelectRole.resx">
<DependentUpon>UserSelectRole.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
+ <DependentUpon>UserSetPwd.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -288,6 +317,8 @@
<None Include="Resources\editrangepermission_16x16.png" />
<None Include="Resources\encryptdocument_32x321.png" />
<None Include="Resources\bouser_16x161.png" />
+ <None Include="Resources\csharp_16x16.png" />
+ <None Include="Resources\formatnumbertime_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup>
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 3f27fef..0535a3c 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -166,9 +166,6 @@
<data name="salesperiodlifetime_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salesperiodlifetime_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -180,6 +177,9 @@
</data>
<data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="login_bg222" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\login_bg222.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -196,8 +196,8 @@
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -255,6 +255,9 @@
</data>
<data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -334,6 +337,9 @@
<data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -343,7 +349,7 @@
<data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
index 274560d..0896c4f 100644
--- a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
@@ -283,6 +283,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap csharp_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("csharp_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap doublenext_16x16 {
get {
object obj = ResourceManager.GetObject("doublenext_16x16", resourceCulture);
@@ -483,6 +493,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap formatnumbertime_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("formatnumbertime_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap fullstackedcolumn3d_32x32 {
get {
object obj = ResourceManager.GetObject("fullstackedcolumn3d_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Settings.Designer.cs b/DevApp/Gs.DevApp/Properties/Settings.Designer.cs
index 8220d8c..5554b3d 100644
--- a/DevApp/Gs.DevApp/Properties/Settings.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Settings.Designer.cs
@@ -62,12 +62,12 @@
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
- public string orgguid {
+ public string orgGuid {
get {
- return ((string)(this["orgguid"]));
+ return ((string)(this["orgGuid"]));
}
set {
- this["orgguid"] = value;
+ this["orgGuid"] = value;
}
}
}
diff --git a/DevApp/Gs.DevApp/Properties/Settings.settings b/DevApp/Gs.DevApp/Properties/Settings.settings
index b06072b..b9966d6 100644
--- a/DevApp/Gs.DevApp/Properties/Settings.settings
+++ b/DevApp/Gs.DevApp/Properties/Settings.settings
@@ -11,7 +11,7 @@
<Setting Name="remember" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
- <Setting Name="orgguid" Type="System.String" Scope="User">
+ <Setting Name="orgGuid" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
deleted file mode 100644
index 64ce0a4..0000000
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ /dev/null
@@ -1,14 +0,0 @@
-DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=6.2.0.0, Culture=neutral, PublicKeyToken=87f9927a37ac6066
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/Query/MesItemQuery.cs b/DevApp/Gs.DevApp/Query/MesItemQuery.cs
index eae41aa..af46458 100644
--- a/DevApp/Gs.DevApp/Query/MesItemQuery.cs
+++ b/DevApp/Gs.DevApp/Query/MesItemQuery.cs
@@ -1,5 +1,5 @@
锘�
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
namespace Gs.DevApp.Query
{
diff --git a/DevApp/Gs.DevApp/Resources/csharp_16x16.png b/DevApp/Gs.DevApp/Resources/csharp_16x16.png
new file mode 100644
index 0000000..7148e85
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/csharp_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/formatnumbertime_16x16.png b/DevApp/Gs.DevApp/Resources/formatnumbertime_16x16.png
new file mode 100644
index 0000000..95d5b5b
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/formatnumbertime_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Service/MesItemServices.cs b/DevApp/Gs.DevApp/Service/MesItemServices.cs
index 0ac10f3..ef30a70 100644
--- a/DevApp/Gs.DevApp/Service/MesItemServices.cs
+++ b/DevApp/Gs.DevApp/Service/MesItemServices.cs
@@ -1,4 +1,4 @@
-锘縰sing Gs.DevApp.Models;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.Query;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
diff --git a/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs b/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs
index 3816d52..285dcdc 100644
--- a/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/TEST.Designer.cs
@@ -28,246 +28,21 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_status = new DevExpress.XtraEditors.LabelControl();
- this.txt_status = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastUpdatedBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastUpdatedBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastUpdateDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastUpdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_rolRemark = new DevExpress.XtraEditors.LabelControl();
- this.txt_rolRemark = new DevExpress.XtraEditors.TextEdit();
- this.lb_roleName = new DevExpress.XtraEditors.LabelControl();
- this.txt_roleName = new DevExpress.XtraEditors.TextEdit();
- this.lb_guid = new DevExpress.XtraEditors.LabelControl();
- this.txt_guid = new DevExpress.XtraEditors.TextEdit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdatedBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rolRemark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
this.SuspendLayout();
- //
- // lb_status
- //
- this.lb_status.Location = new System.Drawing.Point(1027, 65);
- this.lb_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(55, 18);
- this.lb_status.TabIndex = 226;
- this.lb_status.Tag = "status";
- this.lb_status.Text = "status锛�";
- //
- // txt_status
- //
- this.txt_status.Location = new System.Drawing.Point(1107, 65);
- this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_status.Name = "txt_status";
- this.txt_status.Size = new System.Drawing.Size(300, 24);
- this.txt_status.TabIndex = 226;
- this.txt_status.Tag = "status";
- //
- // lb_lastUpdatedBy
- //
- this.lb_lastUpdatedBy.Location = new System.Drawing.Point(693, 65);
- this.lb_lastUpdatedBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_lastUpdatedBy.Name = "lb_lastUpdatedBy";
- this.lb_lastUpdatedBy.Size = new System.Drawing.Size(109, 18);
- this.lb_lastUpdatedBy.TabIndex = 222;
- this.lb_lastUpdatedBy.Tag = "lastUpdatedBy";
- this.lb_lastUpdatedBy.Text = "lastUpdatedBy锛�";
- //
- // txt_lastUpdatedBy
- //
- this.txt_lastUpdatedBy.Location = new System.Drawing.Point(773, 65);
- this.txt_lastUpdatedBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lastUpdatedBy.Name = "txt_lastUpdatedBy";
- this.txt_lastUpdatedBy.Size = new System.Drawing.Size(300, 24);
- this.txt_lastUpdatedBy.TabIndex = 222;
- this.txt_lastUpdatedBy.Tag = "lastUpdatedBy";
- //
- // lb_lastUpdateDate
- //
- this.lb_lastUpdateDate.Location = new System.Drawing.Point(360, 65);
- this.lb_lastUpdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_lastUpdateDate.Name = "lb_lastUpdateDate";
- this.lb_lastUpdateDate.Size = new System.Drawing.Size(115, 18);
- this.lb_lastUpdateDate.TabIndex = 219;
- this.lb_lastUpdateDate.Tag = "lastUpdateDate";
- this.lb_lastUpdateDate.Text = "lastUpdateDate锛�";
- //
- // txt_lastUpdateDate
- //
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(440, 65);
- this.txt_lastUpdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(300, 24);
- this.txt_lastUpdateDate.TabIndex = 219;
- this.txt_lastUpdateDate.Tag = "lastUpdateDate";
- //
- // lb_createBy
- //
- this.lb_createBy.Location = new System.Drawing.Point(27, 65);
- this.lb_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(73, 18);
- this.lb_createBy.TabIndex = 217;
- this.lb_createBy.Tag = "createBy";
- this.lb_createBy.Text = "createBy锛�";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(107, 65);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(300, 24);
- this.txt_createBy.TabIndex = 217;
- this.txt_createBy.Tag = "createBy";
- //
- // lb_createDate
- //
- this.lb_createDate.Location = new System.Drawing.Point(1027, 25);
- this.lb_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(87, 18);
- this.lb_createDate.TabIndex = 216;
- this.lb_createDate.Tag = "createDate";
- this.lb_createDate.Text = "createDate锛�";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(1107, 25);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(300, 24);
- this.txt_createDate.TabIndex = 216;
- this.txt_createDate.Tag = "createDate";
- //
- // lb_rolRemark
- //
- this.lb_rolRemark.Location = new System.Drawing.Point(693, 25);
- this.lb_rolRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_rolRemark.Name = "lb_rolRemark";
- this.lb_rolRemark.Size = new System.Drawing.Size(80, 18);
- this.lb_rolRemark.TabIndex = 213;
- this.lb_rolRemark.Tag = "rolRemark";
- this.lb_rolRemark.Text = "rolRemark锛�";
- //
- // txt_rolRemark
- //
- this.txt_rolRemark.Location = new System.Drawing.Point(773, 25);
- this.txt_rolRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_rolRemark.Name = "txt_rolRemark";
- this.txt_rolRemark.Size = new System.Drawing.Size(300, 24);
- this.txt_rolRemark.TabIndex = 213;
- this.txt_rolRemark.Tag = "rolRemark";
- //
- // lb_roleName
- //
- this.lb_roleName.Location = new System.Drawing.Point(360, 25);
- this.lb_roleName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_roleName.Name = "lb_roleName";
- this.lb_roleName.Size = new System.Drawing.Size(77, 18);
- this.lb_roleName.TabIndex = 211;
- this.lb_roleName.Tag = "roleName";
- this.lb_roleName.Text = "roleName锛�";
- //
- // txt_roleName
- //
- this.txt_roleName.Location = new System.Drawing.Point(440, 25);
- this.txt_roleName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_roleName.Name = "txt_roleName";
- this.txt_roleName.Size = new System.Drawing.Size(300, 24);
- this.txt_roleName.TabIndex = 211;
- this.txt_roleName.Tag = "roleName";
- //
- // lb_guid
- //
- this.lb_guid.Location = new System.Drawing.Point(27, 25);
- this.lb_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.lb_guid.Name = "lb_guid";
- this.lb_guid.Size = new System.Drawing.Size(41, 18);
- this.lb_guid.TabIndex = 210;
- this.lb_guid.Tag = "guid";
- this.lb_guid.Text = "guid锛�";
- //
- // txt_guid
- //
- this.txt_guid.Location = new System.Drawing.Point(107, 25);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(300, 24);
- this.txt_guid.TabIndex = 210;
- this.txt_guid.Tag = "guid";
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1189, 328);
- this.Controls.Add(this.lb_status);
- this.Controls.Add(this.txt_status);
- this.Controls.Add(this.lb_lastUpdatedBy);
- this.Controls.Add(this.txt_lastUpdatedBy);
- this.Controls.Add(this.lb_lastUpdateDate);
- this.Controls.Add(this.txt_lastUpdateDate);
- this.Controls.Add(this.lb_createBy);
- this.Controls.Add(this.txt_createBy);
- this.Controls.Add(this.lb_createDate);
- this.Controls.Add(this.txt_createDate);
- this.Controls.Add(this.lb_rolRemark);
- this.Controls.Add(this.txt_rolRemark);
- this.Controls.Add(this.lb_roleName);
- this.Controls.Add(this.txt_roleName);
- this.Controls.Add(this.lb_guid);
- this.Controls.Add(this.txt_guid);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.ClientSize = new System.Drawing.Size(1189, 666);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Form1";
this.Text = "Form1";
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdatedBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rolRemark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- //BQCreateConrolObejct
-private DevExpress.XtraEditors.LabelControl lb_status;
-private DevExpress.XtraEditors.TextEdit txt_status;
-
-private DevExpress.XtraEditors.LabelControl lb_lastUpdatedBy;
-private DevExpress.XtraEditors.TextEdit txt_lastUpdatedBy;
-
-private DevExpress.XtraEditors.LabelControl lb_lastUpdateDate;
-private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
-
-private DevExpress.XtraEditors.LabelControl lb_createBy;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
-
-private DevExpress.XtraEditors.LabelControl lb_createDate;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
-
-private DevExpress.XtraEditors.LabelControl lb_rolRemark;
-private DevExpress.XtraEditors.TextEdit txt_rolRemark;
-
-private DevExpress.XtraEditors.LabelControl lb_roleName;
-private DevExpress.XtraEditors.TextEdit txt_roleName;
-
-private DevExpress.XtraEditors.LabelControl lb_guid;
-private DevExpress.XtraEditors.TextEdit txt_guid;
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 41cdf53..36f25fc 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -61,7 +61,7 @@
//
// simpleButton1
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.bouser_16x16;
+ this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.formatnumbertime_16x16;
this.simpleButton1.Location = new System.Drawing.Point(472, 102);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index a892778..235ded3 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -9,7 +9,7 @@
using System.Resources;
using System.Drawing;
using Newtonsoft.Json;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using System.Windows.Forms;
using static System.Windows.Forms.Control;
using DevExpress.XtraEditors;
@@ -173,7 +173,7 @@
rto.rtnData = dt;
return rto;
}
-
+
/// <summary>
/// 璇诲彇榛樿椤靛ぇ灏�
@@ -193,54 +193,86 @@
/// <param name="isEdt">鏄惁鍙紪杈�</param>
public static void SetValueByObj(ControlCollection controls, dynamic dynamicObject, Boolean isEdt)
{
+
foreach (JProperty property in dynamicObject.Properties())
{
string strName = property.Name;
string strVal = property.Value.ToString();
- // // 濡傛灉value鏄竴涓璞★紝鍙互閫掑綊閬嶅巻
- // if (property.Value is JObject)
- // {
- // JObject nestedObject = (JObject)property.Value;
- // foreach (JProperty nestedProperty in nestedObject.Properties())
- // {
- // Console.WriteLine("\tName: {0}, Value: {1}", nestedProperty.Name, nestedProperty.Value);
- // }
- // }
- Control[] cols = controls.Find("txt_" + strName, true);
- if (cols.Length > 0)
+ try
{
- Control colType = cols[0];
- //涓嬫媺
- if (colType is ComboBoxEdit)
+ // // 濡傛灉value鏄竴涓璞★紝鍙互閫掑綊閬嶅巻
+ // if (property.Value is JObject)
+ // {
+ // JObject nestedObject = (JObject)property.Value;
+ // foreach (JProperty nestedProperty in nestedObject.Properties())
+ // {
+ // Console.WriteLine("\tName: {0}, Value: {1}", nestedProperty.Name, nestedProperty.Value);
+ // }
+ // }
+ Control[] cols = controls.Find("txt_" + strName, true);
+ if (cols.Length > 0)
{
- ComboBoxEdit txt = colType as ComboBoxEdit;
- if (txt.Properties.TextEditStyle == DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor)
- txt.SelectedIndex = int.Parse(strVal);
- else
- txt.Text = strVal;
- txt.Enabled = isEdt;
- continue;
- }
- //鏂囨湰
- if (colType is TextEdit)
- {
- TextEdit txt = colType as TextEdit;
- if (txt != null)
- txt.Text = strVal;
- txt.Enabled = isEdt;
- continue;
- }
- //鏁板瓧鍗�
- if (colType is NumericUpDown)
- {
- NumericUpDown txt = colType as NumericUpDown;
- if (txt != null)
- txt.Text = strVal;
- txt.Enabled = isEdt;
- continue;
+ Control colType = cols[0];
+ //LookUpEdit
+ if (colType is LookUpEdit)
+ {
+ LookUpEdit txt = colType as LookUpEdit;
+ if (txt != null)
+ {
+ txt.EditValue = strVal;
+ // txt.Text = strVal;
+ }
+ txt.Enabled = isEdt;
+ continue;
+ }
+ //涓嬫媺
+ if (colType is ComboBoxEdit)
+ {
+ ComboBoxEdit txt = colType as ComboBoxEdit;
+ if (txt.Properties.TextEditStyle == DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor)
+ txt.SelectedIndex = int.Parse(strVal);
+ else
+ txt.Text = strVal;
+ txt.Enabled = isEdt;
+ continue;
+ }
+ //鏂囨湰
+ if (colType is TextEdit)
+ {
+ TextEdit txt = colType as TextEdit;
+ if (txt != null)
+ txt.Text = strVal;
+ txt.Enabled = isEdt;
+ continue;
+ }
+ //鏁板瓧鍗�
+ if (colType is NumericUpDown)
+ {
+ NumericUpDown txt = colType as NumericUpDown;
+ if (txt != null)
+ txt.Text = strVal;
+ txt.Enabled = isEdt;
+ continue;
+ }
+ //鍗曢��
+ if (colType is CheckEdit)
+ {
+ CheckEdit txt = colType as CheckEdit;
+ if (txt != null)
+ txt.Checked = (strVal.ToString() == "1" ? true : false);
+ txt.Enabled = isEdt;
+ continue;
+ }
}
}
+ catch (Exception ex)
+ {
+
+ MessageBox.Show(strName + ex.Message);
+ }
+
}
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
index 2387192..d063d77 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
@@ -1,6 +1,6 @@
锘縰sing DevExpress.XtraBars;
using DevExpress.XtraEditors;
-using Gs.DevApp.Models;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
--
Gitblit v1.9.3