From 81a3c74280dd216deaf357b1e143a372c1a907e3 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 18 三月 2025 10:12:59 +0800 Subject: [PATCH] 人员绑定 --- DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 + DevApp/Gs.DevApp/Resources/projectfile_16x16.png | 0 DevApp/Gs.DevApp/XtraForm1.Designer.cs | 59 ++ DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 758 +++++++++++++++++++++++++++ DevApp/Gs.DevApp/Resources/pie3_32x32.png | 0 DevApp/Gs.DevApp/Gs.DevApp.csproj | 31 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx | 0 DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs | 21 DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 37 DevApp/Gs.DevApp/Resources/bo_dashboard.svg | 27 DevApp/Gs.DevApp/XtraForm1.resx | 0 DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs | 21 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs | 21 /dev/null | 54 - DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs | 38 + DevApp/Gs.DevApp/Resources/column2_32x32.png | 0 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 5 DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs | 38 + DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 2 DevApp/Gs.DevApp/Properties/Resources.resx | 44 + DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.resx | 0 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 410 ++++++++++++++ DevApp/Gs.DevApp/XtraForm1.cs | 21 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs | 46 + 24 files changed, 1,572 insertions(+), 101 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs new file mode 100644 index 0000000..f93e206 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs @@ -0,0 +1,758 @@ +锘縩amespace Gs.DevApp.DevFrm.PDA +{ + partial class Frm_UserBind + { + /// <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() + { + DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); + DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn(); + this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.account = new DevExpress.XtraGrid.Columns.GridColumn(); + this.userName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.colCreateBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.createTime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit(); + this.txt_staffId = new Gs.DevApp.UserControl.UcLookStaff(); + this.labelControl4 = new DevExpress.XtraEditors.LabelControl(); + this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.labelControl10 = new DevExpress.XtraEditors.LabelControl(); + this.txt_account = new DevExpress.XtraEditors.TextEdit(); + this.labelControl8 = new DevExpress.XtraEditors.LabelControl(); + this.txt_remark = new DevExpress.XtraEditors.MemoEdit(); + this.labelControl7 = new DevExpress.XtraEditors.LabelControl(); + this.txt_address = new DevExpress.XtraEditors.TextEdit(); + this.labelControl3 = new DevExpress.XtraEditors.LabelControl(); + this.txt_tel = new DevExpress.XtraEditors.TextEdit(); + this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); + this.txt_email = new DevExpress.XtraEditors.TextEdit(); + this.lbGuid = new System.Windows.Forms.Label(); + this.tipPwd = new DevExpress.XtraEditors.LabelControl(); + this.labelControl9 = new DevExpress.XtraEditors.LabelControl(); + this.labelControl6 = new DevExpress.XtraEditors.LabelControl(); + this.labelControl5 = new DevExpress.XtraEditors.LabelControl(); + this.txt_password = new DevExpress.XtraEditors.TextEdit(); + this.lbPwd = new DevExpress.XtraEditors.LabelControl(); + this.txt_userName = new DevExpress.XtraEditors.TextEdit(); + this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_tel.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit(); + this.SuspendLayout(); + // + // isLocked + // + this.isLocked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.isLocked.AppearanceCell.Options.UseFont = true; + this.isLocked.Caption = "浣跨敤鐘舵��"; + this.isLocked.FieldName = "isStatus"; + this.isLocked.MaxWidth = 50; + this.isLocked.MinWidth = 50; + this.isLocked.Name = "isLocked"; + this.isLocked.OptionsColumn.AllowEdit = false; + this.isLocked.Tag = "query_IS_STATUS"; + this.isLocked.UnboundDataType = typeof(bool); + this.isLocked.Visible = true; + this.isLocked.VisibleIndex = 0; + this.isLocked.Width = 50; + // + // toolBarMenu1 + // + this.toolBarMenu1.chkParameter = null; + this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.guidKey = null; + this.toolBarMenu1.isSetBtn = false; + this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Name = "toolBarMenu1"; + this.toolBarMenu1.rptParameter = "rpt_User{}"; + this.toolBarMenu1.Size = new System.Drawing.Size(1004, 80); + this.toolBarMenu1.TabIndex = 0; + this.toolBarMenu1.xlsInService = null; + this.toolBarMenu1.xlsOutParameter = null; + // + // 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemButtonEdit2, + this.repositoryItemButtonEdit3, + this.repositoryItemButtonEdit4}); + this.gcMain.Size = new System.Drawing.Size(1002, 531); + this.gcMain.TabIndex = 1; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.isLocked, + this.gridColumn2, + this.account, + this.userName, + this.colCreateBy, + this.createTime, + this.lastLoginTime, + this.loginCounter, + this.gridColumn3, + this.gridColumn4, + this.gridColumn1, + this.gridColumn5}); + gridFormatRule1.Column = this.isLocked; + gridFormatRule1.Name = "Format0"; + formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red; + formatConditionRuleExpression1.Appearance.Options.UseForeColor = true; + formatConditionRuleExpression1.Expression = "[isStatusTxt] = [绂佺敤]"; + formatConditionRuleExpression1.PredefinedName = "Red Text"; + gridFormatRule1.Rule = formatConditionRuleExpression1; + this.gridView1.FormatRules.Add(gridFormatRule1); + this.gridView1.GridControl = this.gcMain; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridColumn2 + // + this.gridColumn2.Caption = "鍦ㄧ嚎鐘舵��"; + this.gridColumn2.FieldName = "flagOnline"; + this.gridColumn2.MaxWidth = 50; + this.gridColumn2.MinWidth = 50; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.OptionsColumn.AllowEdit = false; + this.gridColumn2.Tag = "query_flag_Online"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.Width = 50; + // + // account + // + this.account.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.account.AppearanceCell.Options.UseFont = true; + this.account.Caption = "鐧诲綍璐﹀彿"; + this.account.FieldName = "account"; + this.account.MinWidth = 50; + this.account.Name = "account"; + this.account.OptionsColumn.AllowEdit = false; + this.account.Tag = "query_ACCOUNT"; + this.account.Visible = true; + this.account.VisibleIndex = 2; + this.account.Width = 94; + // + // userName + // + this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.userName.AppearanceCell.Options.UseFont = true; + this.userName.Caption = "鐧诲綍鍚嶇О"; + this.userName.FieldName = "userName"; + this.userName.MinWidth = 50; + this.userName.Name = "userName"; + this.userName.OptionsColumn.AllowEdit = false; + this.userName.Tag = "query_USER_NAME"; + this.userName.Visible = true; + this.userName.VisibleIndex = 3; + this.userName.Width = 94; + // + // colCreateBy + // + this.colCreateBy.Caption = "寤虹珛鑰�"; + this.colCreateBy.FieldName = "createBy"; + this.colCreateBy.MinWidth = 50; + this.colCreateBy.Name = "colCreateBy"; + this.colCreateBy.OptionsColumn.AllowEdit = false; + this.colCreateBy.Tag = "query_CREATE_BY"; + this.colCreateBy.Visible = true; + this.colCreateBy.VisibleIndex = 4; + this.colCreateBy.Width = 94; + // + // createTime + // + this.createTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.createTime.AppearanceCell.Options.UseFont = true; + this.createTime.Caption = "寤虹珛鏃堕棿"; + this.createTime.FieldName = "createTime"; + this.createTime.MinWidth = 50; + this.createTime.Name = "createTime"; + this.createTime.OptionsColumn.AllowEdit = false; + this.createTime.Tag = "query_CREATE_TIME"; + this.createTime.Visible = true; + this.createTime.VisibleIndex = 5; + this.createTime.Width = 180; + // + // lastLoginTime + // + this.lastLoginTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.lastLoginTime.AppearanceCell.Options.UseFont = true; + this.lastLoginTime.Caption = "鏈�杩戠櫥褰曟椂闂�"; + this.lastLoginTime.FieldName = "lastloginTime"; + this.lastLoginTime.MinWidth = 50; + this.lastLoginTime.Name = "lastLoginTime"; + this.lastLoginTime.OptionsColumn.AllowEdit = false; + this.lastLoginTime.Tag = "query_LASTLOGIN_TIME"; + this.lastLoginTime.Visible = true; + this.lastLoginTime.VisibleIndex = 6; + this.lastLoginTime.Width = 180; + // + // loginCounter + // + this.loginCounter.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.loginCounter.AppearanceCell.Options.UseFont = true; + this.loginCounter.Caption = "鐧诲綍娆℃暟"; + this.loginCounter.FieldName = "loginCounter"; + this.loginCounter.MinWidth = 25; + this.loginCounter.Name = "loginCounter"; + this.loginCounter.OptionsColumn.AllowEdit = false; + this.loginCounter.Tag = "query_LOGIN_COUNTER"; + this.loginCounter.Visible = true; + this.loginCounter.VisibleIndex = 7; + this.loginCounter.Width = 94; + // + // gridColumn3 + // + this.gridColumn3.Caption = "鍏宠仈鍛樺伐"; + this.gridColumn3.FieldName = "staffId"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 8; + this.gridColumn3.Width = 94; + // + // gridColumn4 + // + this.gridColumn4.Caption = "PDA椤甸潰"; + this.gridColumn4.ColumnEdit = this.repositoryItemButtonEdit2; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 9; + this.gridColumn4.Width = 94; + // + // repositoryItemButtonEdit3 + // + this.repositoryItemButtonEdit3.AutoHeight = false; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.projectfile_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浠撳簱", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; + this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick); + // + // gridColumn5 + // + this.gridColumn5.Caption = "浠撳簱"; + this.gridColumn5.ColumnEdit = this.repositoryItemButtonEdit4; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 11; + this.gridColumn5.Width = 94; + // + // repositoryItemButtonEdit4 + // + this.repositoryItemButtonEdit4.AutoHeight = false; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鎵撳嵃鏈�", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4"; + this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick); + // + // gridColumn1 + // + this.gridColumn1.Caption = "鎵撳嵃鏈�"; + this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit3; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.OptionsFilter.AllowAutoFilter = false; + this.gridColumn1.OptionsFilter.AllowFilter = false; + this.gridColumn1.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 10; + this.gridColumn1.Width = 94; + // + // repositoryItemButtonEdit2 + // + this.repositoryItemButtonEdit2.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "PDA椤甸潰", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; + this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); + // + // 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(1004, 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(1002, 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.Size = new System.Drawing.Size(1002, 39); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.panel1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.Size = new System.Drawing.Size(1002, 570); + this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_isStatus); + this.panel1.Controls.Add(this.txt_staffId); + this.panel1.Controls.Add(this.labelControl4); + this.panel1.Controls.Add(this.labelControl11); + this.panel1.Controls.Add(this.labelControl10); + this.panel1.Controls.Add(this.txt_account); + this.panel1.Controls.Add(this.labelControl8); + this.panel1.Controls.Add(this.txt_remark); + this.panel1.Controls.Add(this.labelControl7); + this.panel1.Controls.Add(this.txt_address); + this.panel1.Controls.Add(this.labelControl3); + this.panel1.Controls.Add(this.txt_tel); + this.panel1.Controls.Add(this.labelControl1); + this.panel1.Controls.Add(this.txt_email); + this.panel1.Controls.Add(this.lbGuid); + this.panel1.Controls.Add(this.tipPwd); + this.panel1.Controls.Add(this.labelControl9); + this.panel1.Controls.Add(this.labelControl6); + this.panel1.Controls.Add(this.labelControl5); + this.panel1.Controls.Add(this.txt_password); + this.panel1.Controls.Add(this.lbPwd); + this.panel1.Controls.Add(this.txt_userName); + this.panel1.Controls.Add(this.labelControl2); + 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(795, 426); + this.panel1.TabIndex = 1; + // + // txt_isStatus + // + this.txt_isStatus.Location = new System.Drawing.Point(125, 286); + this.txt_isStatus.Name = "txt_isStatus"; + this.txt_isStatus.Properties.Caption = ""; + this.txt_isStatus.Size = new System.Drawing.Size(94, 24); + this.txt_isStatus.TabIndex = 227; + this.txt_isStatus.Tag = "moren.true"; + // + // txt_staffId + // + this.txt_staffId.IsReadly = false; + this.txt_staffId.Location = new System.Drawing.Point(473, 48); + this.txt_staffId.Name = "txt_staffId"; + this.txt_staffId.Size = new System.Drawing.Size(274, 30); + this.txt_staffId.TabIndex = 135; + // + // labelControl4 + // + this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl4.Appearance.Options.UseFont = true; + this.labelControl4.Location = new System.Drawing.Point(473, 20); + 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 = 134; + this.labelControl4.Text = "鍏宠仈鍛樺伐锛�"; + // + // 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 = "涓婚敭锛�"; + this.labelControl11.Visible = false; + // + // labelControl10 + // + this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red; + this.labelControl10.Appearance.Options.UseForeColor = true; + this.labelControl10.Location = new System.Drawing.Point(434, 29); + this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl10.Name = "labelControl10"; + this.labelControl10.Size = new System.Drawing.Size(8, 18); + this.labelControl10.TabIndex = 129; + this.labelControl10.Text = "*"; + // + // txt_account + // + this.txt_account.Location = new System.Drawing.Point(125, 16); + this.txt_account.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_account.Name = "txt_account"; + this.txt_account.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_account.Properties.Appearance.Options.UseFont = true; + this.txt_account.Size = new System.Drawing.Size(297, 28); + this.txt_account.TabIndex = 128; + // + // labelControl8 + // + this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl8.Appearance.Options.UseFont = true; + this.labelControl8.Location = new System.Drawing.Point(36, 20); + 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 = 127; + this.labelControl8.Text = "鐧诲綍璐﹀彿锛�"; + // + // txt_remark + // + this.txt_remark.Location = new System.Drawing.Point(125, 216); + this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_remark.Name = "txt_remark"; + this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_remark.Properties.Appearance.Options.UseFont = true; + this.txt_remark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.txt_remark.Size = new System.Drawing.Size(297, 68); + this.txt_remark.TabIndex = 126; + // + // labelControl7 + // + this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl7.Appearance.Options.UseFont = true; + this.labelControl7.Location = new System.Drawing.Point(70, 216); + this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl7.Name = "labelControl7"; + this.labelControl7.Size = new System.Drawing.Size(51, 21); + this.labelControl7.TabIndex = 125; + this.labelControl7.Text = "澶囨敞锛�"; + // + // txt_address + // + this.txt_address.Location = new System.Drawing.Point(125, 182); + this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_address.Name = "txt_address"; + this.txt_address.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_address.Properties.Appearance.Options.UseFont = true; + this.txt_address.Size = new System.Drawing.Size(297, 28); + this.txt_address.TabIndex = 124; + // + // labelControl3 + // + this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl3.Appearance.Options.UseFont = true; + this.labelControl3.Location = new System.Drawing.Point(36, 186); + this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl3.Name = "labelControl3"; + this.labelControl3.Size = new System.Drawing.Size(85, 21); + this.labelControl3.TabIndex = 123; + this.labelControl3.Text = "浣忓鍦板潃锛�"; + // + // txt_tel + // + this.txt_tel.Location = new System.Drawing.Point(125, 149); + this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_tel.Name = "txt_tel"; + this.txt_tel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_tel.Properties.Appearance.Options.UseFont = true; + this.txt_tel.Size = new System.Drawing.Size(297, 28); + this.txt_tel.TabIndex = 122; + // + // labelControl1 + // + this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl1.Appearance.Options.UseFont = true; + this.labelControl1.Location = new System.Drawing.Point(70, 153); + this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl1.Name = "labelControl1"; + this.labelControl1.Size = new System.Drawing.Size(51, 21); + this.labelControl1.TabIndex = 121; + this.labelControl1.Text = "鐢佃瘽锛�"; + // + // txt_email + // + this.txt_email.Location = new System.Drawing.Point(125, 115); + this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_email.Name = "txt_email"; + this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_email.Properties.Appearance.Options.UseFont = true; + this.txt_email.Size = new System.Drawing.Size(297, 28); + this.txt_email.TabIndex = 120; + // + // 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; + this.lbGuid.Visible = false; + // + // tipPwd + // + this.tipPwd.Appearance.ForeColor = System.Drawing.Color.Red; + this.tipPwd.Appearance.Options.UseForeColor = true; + this.tipPwd.Location = new System.Drawing.Point(434, 54); + this.tipPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tipPwd.Name = "tipPwd"; + this.tipPwd.Size = new System.Drawing.Size(8, 18); + this.tipPwd.TabIndex = 107; + this.tipPwd.Text = "*"; + // + // labelControl9 + // + this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red; + this.labelControl9.Appearance.Options.UseForeColor = true; + this.labelControl9.Location = new System.Drawing.Point(434, 82); + this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl9.Name = "labelControl9"; + this.labelControl9.Size = new System.Drawing.Size(8, 18); + this.labelControl9.TabIndex = 108; + this.labelControl9.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(70, 119); + this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl6.Name = "labelControl6"; + this.labelControl6.Size = new System.Drawing.Size(51, 21); + this.labelControl6.TabIndex = 103; + this.labelControl6.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(36, 288); + this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl5.Name = "labelControl5"; + this.labelControl5.Size = new System.Drawing.Size(85, 21); + this.labelControl5.TabIndex = 101; + this.labelControl5.Text = "鍚敤鐘舵�侊細"; + // + // txt_password + // + this.txt_password.Location = new System.Drawing.Point(125, 49); + this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txt_password.Name = "txt_password"; + this.txt_password.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_password.Properties.Appearance.Options.UseFont = true; + this.txt_password.Size = new System.Drawing.Size(297, 28); + this.txt_password.TabIndex = 99; + // + // lbPwd + // + this.lbPwd.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lbPwd.Appearance.Options.UseFont = true; + this.lbPwd.Location = new System.Drawing.Point(36, 53); + this.lbPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.lbPwd.Name = "lbPwd"; + this.lbPwd.Size = new System.Drawing.Size(85, 21); + this.lbPwd.TabIndex = 98; + this.lbPwd.Text = "鍒濆瀵嗙爜锛�"; + // + // txt_userName + // + this.txt_userName.Location = new System.Drawing.Point(125, 82); + this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + 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(297, 28); + this.txt_userName.TabIndex = 95; + // + // labelControl2 + // + this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.labelControl2.Appearance.Options.UseFont = true; + this.labelControl2.Location = new System.Drawing.Point(36, 86); + this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl2.Name = "labelControl2"; + this.labelControl2.Size = new System.Drawing.Size(85, 21); + this.labelControl2.TabIndex = 94; + this.labelControl2.Text = "璐﹀彿鍚嶇О锛�"; + // + // Frm_UserBind + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1004, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "Frm_UserBind"; + this.Text = "鐢ㄦ埛绠$悊"; + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).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_isStatus.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_tel.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn userName; + private DevExpress.XtraGrid.Columns.GridColumn createTime; + private DevExpress.XtraGrid.Columns.GridColumn lastLoginTime; + private DevExpress.XtraGrid.Columns.GridColumn isLocked; + private DevExpress.XtraGrid.Columns.GridColumn loginCounter; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private UserControls.Data.UcPageBar pageBar1; + private System.Windows.Forms.Panel panel1; + private DevExpress.XtraEditors.LabelControl labelControl10; + private DevExpress.XtraEditors.TextEdit txt_account; + private DevExpress.XtraEditors.LabelControl labelControl8; + private DevExpress.XtraEditors.MemoEdit txt_remark; + private DevExpress.XtraEditors.LabelControl labelControl7; + private DevExpress.XtraEditors.TextEdit txt_address; + private DevExpress.XtraEditors.LabelControl labelControl3; + private DevExpress.XtraEditors.TextEdit txt_tel; + private DevExpress.XtraEditors.LabelControl labelControl1; + private DevExpress.XtraEditors.TextEdit txt_email; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.LabelControl tipPwd; + private DevExpress.XtraEditors.LabelControl labelControl9; + private DevExpress.XtraEditors.LabelControl labelControl6; + private DevExpress.XtraEditors.TextEdit txt_password; + private DevExpress.XtraEditors.LabelControl lbPwd; + private DevExpress.XtraEditors.TextEdit txt_userName; + private DevExpress.XtraEditors.LabelControl labelControl2; + private DevExpress.XtraEditors.LabelControl labelControl11; + private DevExpress.XtraGrid.Columns.GridColumn account; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; + private DevExpress.XtraGrid.Columns.GridColumn colCreateBy; + private DevExpress.XtraEditors.LabelControl labelControl5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraEditors.LabelControl labelControl4; + private UserControl.UcLookStaff txt_staffId; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraEditors.CheckEdit txt_isStatus; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs new file mode 100644 index 0000000..16fe505 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs @@ -0,0 +1,410 @@ +锘縰sing DevExpress.XtraEditors; +using DevExpress.XtraEditors.Controls; +using Gs.DevApp.DevFrm.User; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +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.PDA +{ + public partial class Frm_UserBind : DevExpress.XtraEditors.XtraForm + { + private List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_UserBind() + { + InitializeComponent(); + toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + + toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gridView1); + Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }); + Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => + { + getModel(value); + }, (value) => + { + getPageList(this.pageBar1.CurrentPage); + }); + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + Task.Delay(100); + getPageList(1); + } + + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_userName, gridView1, "userName"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + var lst = new List<string>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + var strJson = UtilityHelper.HttpPost("", "User/DeleteModel", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 0) + { } + else + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); + getPageList(this.pageBar1.CurrentPage); + } + + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim()); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } + } + + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_userName, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); + UtilityHelper.ChangeEnableByControl(panel1.Controls, true); + } + + /// <summary> + /// 鏂板浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + lbGuid.Text = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); + UtilityHelper.CleanValueByControl(panel1.Controls, true); + txt_password.Visible = lbPwd.Visible = true; + txt_account.Enabled = txt_password.Enabled = true; + } + + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + if (string.IsNullOrEmpty(txt_account.Text.Trim())) + { + MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); + txt_account.Focus(); + return; + } + + if (string.IsNullOrEmpty(txt_password.Text.Trim())) + { + MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�"); + txt_password.Focus(); + return; + } + + if (string.IsNullOrEmpty(txt_userName.Text.Trim())) + { + MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�"); + txt_userName.Focus(); + return; + } + + var _obj = new + { + Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + account = txt_account.Text.Trim(), + password = txt_password.Text.Trim(), + userName = txt_userName.Text.Trim(), + address = txt_address.Text.Trim(), + tel = txt_tel.Text.Trim(), + email = txt_email.Text.Trim(), + isStatus = txt_isStatus.Checked, + remark = txt_remark.Text.Trim(), + isSys = 0, + staffId = txt_staffId.GetId() + }; + try + { + var strJson = UtilityHelper.HttpPost("", "User/EditModel", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(panel1.Controls, false); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.ACCOUNT asc ,a.CREATE_TIME", + "desc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = + UtilityHelper.HttpPost("", "User/GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + gridView1.BestFitColumns(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + + } + + private void getModel(string strGuid) + { + bool isEdit = false; + if (toolBarMenu1.currentAction == "add") return; + if (toolBarMenu1.currentAction == "edit") isEdit = true; + if (string.IsNullOrEmpty(strGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + var _obj = new + { + guid = strGuid //涓诲缓 + }; + try + { + var strJson = UtilityHelper.HttpPost("", "User/GetModel", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + var dy = _rtn.rtnData; + lbGuid.Text = strGuid; + UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit); + txt_account.Enabled = txt_password.Enabled = + txt_password.Visible = + lbPwd.Visible = tipPwd.Visible = false; + } + else + { + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + /// <summary> + /// 瑙掕壊 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repositoryItemButtonEdit1_ButtonClick(object sender, + ButtonPressedEventArgs e) + { + if (e.Button.Index == 0) + { + var rowhandle = gridView1.FocusedRowHandle; + var dr = gridView1.GetDataRow(rowhandle); + var userGuid = dr["guid"].ToString(); + var frm = new UserSelectRole(userGuid); + frm.ShowDialog(); + } + } + /// <summary> + /// pda椤甸潰 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repositoryItemButtonEdit2_ButtonClick(object sender, + ButtonPressedEventArgs e) + { + if (e.Button.Index == 0) + { + var rowhandle = gridView1.FocusedRowHandle; + var dr = gridView1.GetDataRow(rowhandle); + var userGuid = dr["guid"].ToString(); + var frm = new UserSetPwd(userGuid); + frm.ShowDialog(); + } + } + /// <summary> + /// 浠撳簱 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repositoryItemButtonEdit3_ButtonClick(object sender, ButtonPressedEventArgs e) + { + if (e.Button.Index == 0) + { + var rowhandle = gridView1.FocusedRowHandle; + var dr = gridView1.GetDataRow(rowhandle); + var userGuid = dr["guid"].ToString(); + var frm = new RoleSelectAction(userGuid); + frm.ShowDialog(); + } + } + + /// <summary> + /// 鎵撳嵃鏈� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repositoryItemButtonEdit4_ButtonClick(object sender, ButtonPressedEventArgs e) + { + if (e.Button.Index == 0) + { + var rowhandle = gridView1.FocusedRowHandle; + var dr = gridView1.GetDataRow(rowhandle); + var userGuid = dr["guid"].ToString(); + var frm = new ViewRole(userGuid); + frm.ShowDialog(); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx similarity index 100% copy from DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx copy to DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs new file mode 100644 index 0000000..35e0a9f --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs @@ -0,0 +1,38 @@ +锘縩amespace Gs.DevApp.DevFrm.PDA +{ + partial class SelectCk + { + /// <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.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "SelectCk"; + } + + #endregion + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs new file mode 100644 index 0000000..51ad6eb --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +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.PDA +{ + public partial class SelectCk : DevExpress.XtraEditors.XtraForm + { + public SelectCk() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs new file mode 100644 index 0000000..23a8585 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs @@ -0,0 +1,46 @@ +锘縩amespace Gs.DevApp.DevFrm.PDA +{ + partial class SelectPage + { + /// <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.SuspendLayout(); + // + // SelectPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(426, 438); + this.Name = "SelectPage"; + this.Text = "SelectPage"; + this.ResumeLayout(false); + + } + + #endregion + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs new file mode 100644 index 0000000..b5abbf6 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +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.PDA +{ + public partial class SelectPage : DevExpress.XtraEditors.XtraForm + { + public SelectPage() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.resx similarity index 100% rename from DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx rename to DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.resx diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs new file mode 100644 index 0000000..c0af5cb --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs @@ -0,0 +1,38 @@ +锘縩amespace Gs.DevApp.DevFrm.PDA +{ + partial class SelectPrint + { + /// <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.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "SelectPrint"; + } + + #endregion + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs new file mode 100644 index 0000000..ee4a021 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +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.PDA +{ + public partial class SelectPrint : DevExpress.XtraEditors.XtraForm + { + public SelectPrint() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs index 2d3ecbc..3592c02 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs @@ -334,7 +334,7 @@ Memo = row["memo"].ToString(), FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()), FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()), - FqaType = this.strType, + }); } } @@ -344,7 +344,7 @@ ItemId = long.Parse(_ItemId), Memo = txt_memo.Text.Trim(), ItemNo = txt_itemNo.Text.Trim(), - Ftype = "1", + Ftype = this.strType, Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()), list = lst }; @@ -386,6 +386,7 @@ { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and b.guid is not null"; + _sbSqlWhere += " and a.FTYPE='" + this.strType + "'"; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs deleted file mode 100644 index 0ce6aec..0000000 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs +++ /dev/null @@ -1,107 +0,0 @@ -锘縩amespace Gs.DevApp.DevFrm.Rpt -{ - partial class CK - { - /// <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.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton(); - ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); - this.splitMx1.Panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit(); - this.splitMx1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // splitMx1 - // - this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitMx1.Horizontal = false; - this.splitMx1.Location = new System.Drawing.Point(0, 0); - this.splitMx1.Name = "splitMx1"; - // - // splitMx1.Panel1 - // - this.splitMx1.Panel1.Controls.Add(this.flowLayoutPanel1); - this.splitMx1.Panel1.Text = "Panel1"; - // - // splitMx1.Panel2 - // - this.splitMx1.Panel2.Text = "Panel2"; - this.splitMx1.Size = new System.Drawing.Size(924, 567); - this.splitMx1.SplitterPosition = 530; - this.splitMx1.TabIndex = 0; - // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Controls.Add(this.simpleButton2); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(100); - this.flowLayoutPanel1.Size = new System.Drawing.Size(924, 530); - this.flowLayoutPanel1.TabIndex = 2; - // - // simpleButton2 - // - this.simpleButton2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dclusteredcolumn_32x32; - this.simpleButton2.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter; - this.simpleButton2.Location = new System.Drawing.Point(103, 103); - this.simpleButton2.Name = "simpleButton2"; - this.simpleButton2.Size = new System.Drawing.Size(145, 128); - this.simpleButton2.TabIndex = 1; - this.simpleButton2.Text = "鏉$爜搴撳瓨鏄庣粏琛�"; - this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click); - // - // CK - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(924, 567); - this.Controls.Add(this.splitMx1); - this.Name = "CK"; - this.Text = "CK"; - ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); - this.splitMx1.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit(); - this.splitMx1.ResumeLayout(false); - this.flowLayoutPanel1.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private DevExpress.XtraEditors.SplitContainerControl splitMx1; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private DevExpress.XtraEditors.SimpleButton simpleButton2; - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs deleted file mode 100644 index 329e59d..0000000 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs +++ /dev/null @@ -1,54 +0,0 @@ -锘縰sing DevExpress.XtraEditors; -using Gs.DevApp.ToolBox; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Gs.DevApp.DevFrm.Rpt -{ - public partial class CK : DevExpress.XtraEditors.XtraForm - { - public CK() - { - InitializeComponent(); - } - - private void simpleButton2_Click(object sender, EventArgs e) - { - openFrm("CKTmkc", "Gs.DevApp.DevFrm.CKTmkc"); - } - - /// <summary> - /// 鎵撳紑绐椾綋 - /// </summary> - /// <param name="frmName"></param> - /// <param name="asm"></param> - private void openFrm(string frmName, string asm) - { - Form _frm = Application.OpenForms[frmName]; //鏌ユ壘鏄惁鎵撳紑杩囩獥浣� - if ((_frm == null) || (_frm.IsDisposed)) //濡傛灉娌℃湁鎵撳紑杩� - { - var newForm = (Form)Assembly.GetExecutingAssembly() - .CreateInstance(asm); - if (newForm == null) - { - MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒"); - return; - } - newForm.Show(); - } - else - { - _frm.Activate(); - _frm.WindowState = FormWindowState.Normal; - } - } - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs index 5dc1a1c..13166a6 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs @@ -78,7 +78,7 @@ this.gv_indepUserCode.OptionsColumn.AllowEdit = false; this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE"; this.gv_indepUserCode.Visible = true; - this.gv_indepUserCode.VisibleIndex = 36; + this.gv_indepUserCode.VisibleIndex = 24; this.gv_indepUserCode.Width = 94; // // gv_stockOrgId @@ -92,7 +92,7 @@ this.gv_stockOrgId.OptionsColumn.AllowEdit = false; this.gv_stockOrgId.Tag = "query_a.Stock_Org_Id"; this.gv_stockOrgId.Visible = true; - this.gv_stockOrgId.VisibleIndex = 35; + this.gv_stockOrgId.VisibleIndex = 23; this.gv_stockOrgId.Width = 94; // // gv_ownerType @@ -106,7 +106,7 @@ this.gv_ownerType.OptionsColumn.AllowEdit = false; this.gv_ownerType.Tag = "query_a.Owner_Type"; this.gv_ownerType.Visible = true; - this.gv_ownerType.VisibleIndex = 34; + this.gv_ownerType.VisibleIndex = 22; this.gv_ownerType.Width = 94; // // gv_ownerId @@ -120,7 +120,7 @@ this.gv_ownerId.OptionsColumn.AllowEdit = false; this.gv_ownerId.Tag = "query_a.Owner_Id"; this.gv_ownerId.Visible = true; - this.gv_ownerId.VisibleIndex = 33; + this.gv_ownerId.VisibleIndex = 21; this.gv_ownerId.Width = 94; // // gv_depotId @@ -134,7 +134,7 @@ this.gv_depotId.OptionsColumn.AllowEdit = false; this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; - this.gv_depotId.VisibleIndex = 32; + this.gv_depotId.VisibleIndex = 20; this.gv_depotId.Width = 94; // // gv_suppId @@ -148,7 +148,7 @@ this.gv_suppId.OptionsColumn.AllowEdit = false; this.gv_suppId.Tag = "query_a.SUPP_ID"; this.gv_suppId.Visible = true; - this.gv_suppId.VisibleIndex = 31; + this.gv_suppId.VisibleIndex = 19; this.gv_suppId.Width = 94; // // gv_itemId @@ -162,7 +162,7 @@ this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; - this.gv_itemId.VisibleIndex = 30; + this.gv_itemId.VisibleIndex = 18; this.gv_itemId.Width = 94; // // gv_lineK3id @@ -176,7 +176,7 @@ this.gv_lineK3id.OptionsColumn.AllowEdit = false; this.gv_lineK3id.Tag = "query_a.LINE_K3ID"; this.gv_lineK3id.Visible = true; - this.gv_lineK3id.VisibleIndex = 29; + this.gv_lineK3id.VisibleIndex = 17; this.gv_lineK3id.Width = 94; // // gv_ebelnK3id @@ -190,7 +190,7 @@ this.gv_ebelnK3id.OptionsColumn.AllowEdit = false; this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID"; this.gv_ebelnK3id.Visible = true; - this.gv_ebelnK3id.VisibleIndex = 28; + this.gv_ebelnK3id.VisibleIndex = 16; this.gv_ebelnK3id.Width = 94; // // gv_billNo @@ -204,7 +204,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 27; + this.gv_billNo.VisibleIndex = 15; this.gv_billNo.Width = 94; // // gv_lineNo @@ -218,7 +218,7 @@ this.gv_lineNo.OptionsColumn.AllowEdit = false; this.gv_lineNo.Tag = "query_a.LINE_NO"; this.gv_lineNo.Visible = true; - this.gv_lineNo.VisibleIndex = 26; + this.gv_lineNo.VisibleIndex = 14; this.gv_lineNo.Width = 94; // // gv_suppNo @@ -232,7 +232,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.SUPP_NO"; this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 25; + this.gv_suppNo.VisibleIndex = 13; this.gv_suppNo.Width = 94; // // gv_iqcStatus @@ -246,7 +246,7 @@ this.gv_iqcStatus.OptionsColumn.AllowEdit = false; this.gv_iqcStatus.Tag = "query_a.IQC_STATUS"; this.gv_iqcStatus.Visible = true; - this.gv_iqcStatus.VisibleIndex = 17; + this.gv_iqcStatus.VisibleIndex = 12; this.gv_iqcStatus.Width = 94; // // gv_indepDate @@ -260,7 +260,7 @@ this.gv_indepDate.OptionsColumn.AllowEdit = false; this.gv_indepDate.Tag = "query_a.INDEP_DATE"; this.gv_indepDate.Visible = true; - this.gv_indepDate.VisibleIndex = 14; + this.gv_indepDate.VisibleIndex = 11; this.gv_indepDate.Width = 94; // // gv_itemType @@ -274,7 +274,7 @@ this.gv_itemType.OptionsColumn.AllowEdit = false; this.gv_itemType.Tag = "query_a.ITEM_TYPE"; this.gv_itemType.Visible = true; - this.gv_itemType.VisibleIndex = 13; + this.gv_itemType.VisibleIndex = 10; this.gv_itemType.Width = 94; // // gv_checkDate @@ -288,7 +288,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.CHECK_DATE"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 12; + this.gv_checkDate.VisibleIndex = 9; this.gv_checkDate.Width = 94; // // gv_depotSectionsCode @@ -302,7 +302,7 @@ this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false; this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE"; this.gv_depotSectionsCode.Visible = true; - this.gv_depotSectionsCode.VisibleIndex = 11; + this.gv_depotSectionsCode.VisibleIndex = 8; this.gv_depotSectionsCode.Width = 94; // // gv_depotsCode @@ -316,7 +316,7 @@ this.gv_depotsCode.OptionsColumn.AllowEdit = false; this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE"; this.gv_depotsCode.Visible = true; - this.gv_depotsCode.VisibleIndex = 10; + this.gv_depotsCode.VisibleIndex = 7; this.gv_depotsCode.Width = 94; // // gv_quantity @@ -523,7 +523,6 @@ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; this.Name = "CKTmkc"; this.Text = "鏉$爜搴撳瓨"; - this.WindowState = System.Windows.Forms.FormWindowState.Maximized; ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs index af7e808..c073715 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs @@ -22,7 +22,7 @@ this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) => { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 6e86e4b..187657e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -315,6 +315,12 @@ <Compile Include="DevFrm\IPQC\Frm_XunJian.Designer.cs"> <DependentUpon>Frm_XunJian.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\PDA\Frm_UserBind.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\Frm_UserBind.Designer.cs"> + <DependentUpon>Frm_UserBind.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\QC\Frm_IQCLookups.cs"> <SubType>Form</SubType> </Compile> @@ -391,12 +397,6 @@ <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" /> - <Compile Include="DevFrm\Rpt\CK.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\Rpt\CK.Designer.cs"> - <DependentUpon>CK.cs</DependentUpon> - </Compile> <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs"> <SubType>Form</SubType> </Compile> @@ -1060,6 +1060,12 @@ <Compile Include="UserControl\UCUpFile.Designer.cs"> <DependentUpon>UCUpFile.cs</DependentUpon> </Compile> + <Compile Include="XtraForm1.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="XtraForm1.Designer.cs"> + <DependentUpon>XtraForm1.cs</DependentUpon> + </Compile> <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx"> <DependentUpon>Frm_Customer.cs</DependentUpon> </EmbeddedResource> @@ -1132,6 +1138,9 @@ <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJian.resx"> <DependentUpon>Frm_ShouJian.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx"> + <DependentUpon>Frm_UserBind.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> </EmbeddedResource> @@ -1170,9 +1179,6 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx"> <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="DevFrm\Rpt\CK.resx"> - <DependentUpon>CK.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx"> <DependentUpon>CKTmkc.cs</DependentUpon> @@ -1481,6 +1487,9 @@ <EmbeddedResource Include="UserControl\UCUpFile.resx"> <DependentUpon>UCUpFile.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="XtraForm1.resx"> + <DependentUpon>XtraForm1.cs</DependentUpon> + </EmbeddedResource> <None Include="App.config" /> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> @@ -1687,6 +1696,10 @@ <None Include="Resources\printarea_32x32.png" /> <None Include="Resources\defaultprinter.svg" /> <None Include="Resources\3dclusteredcolumn_32x32.png" /> + <None Include="Resources\pie3_32x32.png" /> + <None Include="Resources\bo_dashboard.svg" /> + <None Include="Resources\column2_32x32.png" /> + <None Include="Resources\projectfile_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index 0b31481..ea5f2b7 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -211,6 +211,16 @@ } /// <summary> + /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static DevExpress.Utils.Svg.SvgImage bo_dashboard { + get { + object obj = ResourceManager.GetObject("bo_dashboard", resourceCulture); + return ((DevExpress.Utils.Svg.SvgImage)(obj)); + } + } + + /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> internal static System.Drawing.Bitmap bodepartment_16x16 { @@ -516,6 +526,16 @@ internal static System.Drawing.Bitmap close_16x16 { get { object obj = ResourceManager.GetObject("close_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap column2_32x32 { + get { + object obj = ResourceManager.GetObject("column2_32x32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1413,6 +1433,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap pie3_32x32 { + get { + object obj = ResourceManager.GetObject("pie3_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap printarea_32x32 { get { object obj = ResourceManager.GetObject("printarea_32x32", resourceCulture); @@ -1463,6 +1493,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap projectfile_16x16 { + get { + object obj = ResourceManager.GetObject("projectfile_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap properties_16x16 { get { object obj = ResourceManager.GetObject("properties_16x16", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 6cb99b5..9bb619d 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -127,6 +127,9 @@ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> + </data> <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, @@ -148,6 +151,11 @@ </data> <data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -206,9 +214,6 @@ <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -338,6 +343,9 @@ </data> <data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> @@ -492,11 +500,6 @@ </data> <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -663,8 +666,10 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> + <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, @@ -755,10 +760,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -814,6 +817,9 @@ <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, @@ -890,6 +896,9 @@ <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -938,12 +947,15 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\projectfile_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/Resources/bo_dashboard.svg b/DevApp/Gs.DevApp/Resources/bo_dashboard.svg new file mode 100644 index 0000000..709c4d7 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/bo_dashboard.svg @@ -0,0 +1,27 @@ +锘�<?xml version='1.0' encoding='UTF-8'?> +<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32"> + <style type="text/css"> + .Blue{fill:#1177D7;} + .Yellow{fill:#FFB115;} + .Red{fill:#D11C1C;} + .Green{fill:#039C23;} + .Black{fill:#727272;} + .White{fill:#FFFFFF;} + .st0{opacity:0.5;} + .st1{opacity:0.75;} + .st2{display:none;} + .st3{display:inline;fill:#FFB115;} + .st4{display:inline;} + .st5{display:inline;opacity:0.75;} + .st6{display:inline;opacity:0.5;} + .st7{display:inline;fill:#039C23;} + .st8{display:inline;fill:#D11C1C;} + .st9{display:inline;fill:#1177D7;} + .st10{display:inline;fill:#FFFFFF;} +</style> + <g id="Dashboard"> + <path d="M26.3,5.1L16.4,15l9.9,9.9c2.3-2.6,3.7-6.1,3.7-9.9S28.6,7.8,26.3,5.1z" class="Blue" /> + <path d="M14,16v-1v-0.4L24.9,3.7C22.2,1.4,18.8,0,15,0C6.7,0,0,6.7,0,15c0,7.9,6.2,14.4,14,14.9V16z" class="Red" /> + <path d="M16,29.9c3.4-0.2,6.5-1.6,8.9-3.7L16,17.4V29.9z" class="Yellow" /> + </g> +</svg> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Resources/column2_32x32.png b/DevApp/Gs.DevApp/Resources/column2_32x32.png new file mode 100644 index 0000000..9a2b136 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/column2_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/pie3_32x32.png b/DevApp/Gs.DevApp/Resources/pie3_32x32.png new file mode 100644 index 0000000..96f43e4 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/pie3_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/projectfile_16x16.png b/DevApp/Gs.DevApp/Resources/projectfile_16x16.png new file mode 100644 index 0000000..e3f5365 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/projectfile_16x16.png Binary files differ diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs new file mode 100644 index 0000000..8fe6c76 --- /dev/null +++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs @@ -0,0 +1,59 @@ +锘縩amespace Gs.DevApp +{ + partial class XtraForm1 + { + /// <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.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); + this.SuspendLayout(); + // + // simpleButton1 + // + this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.column2_32x32; + this.simpleButton1.Location = new System.Drawing.Point(343, 110); + this.simpleButton1.Name = "simpleButton1"; + this.simpleButton1.Size = new System.Drawing.Size(94, 29); + this.simpleButton1.TabIndex = 0; + this.simpleButton1.Text = "simpleButton1"; + // + // XtraForm1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(767, 418); + this.Controls.Add(this.simpleButton1); + this.Name = "XtraForm1"; + this.Text = "XtraForm1"; + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraEditors.SimpleButton simpleButton1; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs new file mode 100644 index 0000000..bf6b785 --- /dev/null +++ b/DevApp/Gs.DevApp/XtraForm1.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +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 +{ + public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm + { + public XtraForm1() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx b/DevApp/Gs.DevApp/XtraForm1.resx similarity index 100% copy from DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx copy to DevApp/Gs.DevApp/XtraForm1.resx -- Gitblit v1.9.3