DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -645,6 +645,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -744,7 +745,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(1219, 570); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -818,6 +818,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Customer"; this.Text = "客æ·ä¿¡æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -472,6 +472,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -558,7 +559,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(928, 424); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -622,6 +622,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Department"; this.Text = "é¨é¨ä¿¡æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -554,6 +554,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -638,7 +639,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(936, 369); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -706,6 +706,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesItemType"; this.Text = "ç©æç±»å«"; ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -15,7 +15,6 @@ { private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesItemTypeManager/"; public Frm_MesItemType() { InitializeComponent(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -841,6 +841,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -953,7 +954,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(1158, 570); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -1132,6 +1132,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesItems"; this.Text = "ç©æä¿¡æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Drawing; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -64,6 +64,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.picCheckBox = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).BeginInit(); @@ -79,6 +80,7 @@ this.xtraTabPage1.SuspendLayout(); this.xtraTabPage2.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // // lb_fforbidstatus @@ -362,6 +364,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -442,7 +445,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(912, 357); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -492,11 +494,23 @@ this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; this.picCheckBox.Location = new System.Drawing.Point(814, 55); this.picCheckBox.Name = "picCheckBox"; this.picCheckBox.Size = new System.Drawing.Size(100, 50); this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // Frm_MesPosition // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(914, 469); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesPosition"; @@ -516,6 +530,7 @@ this.xtraTabPage2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); } @@ -563,6 +578,6 @@ private DevExpress.XtraEditors.TextEdit txt_positionId; private DevExpress.XtraGrid.Columns.GridColumn gv_positionId; private DevExpress.XtraGrid.Columns.GridColumn gv_id; private System.Windows.Forms.PictureBox picCheckBox; } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -21,7 +21,7 @@ InitializeComponent(); toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -508,6 +508,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -694,6 +695,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesUnit"; this.Text = "åä½ä¿¡æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -3,13 +3,12 @@ using System.Data; using System.Threading.Tasks; using System.Windows.Forms; using CefSharp.DevTools.CSS; using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; using static Gs.DevApp.ToolBox.UtilityHelper; namespace Gs.DevApp.DevFrm { DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -267,6 +267,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = "SYS_DEPARTMENT,check_date,check_status,check_by"; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -505,7 +506,6 @@ this.xtraTabPage2.Controls.Add(this.tabMx); this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(1281, 570); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -724,6 +724,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesWorkshop"; this.Text = "线ä½ä¿¡æ¯"; this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Drawing; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; @@ -30,11 +28,21 @@ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", ""); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (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) @@ -44,18 +52,6 @@ getPageList(1); } /// <summary> /// åå»äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) { var rowGuid = UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); if (!string.IsNullOrEmpty(rowGuid)) getModel(rowGuid, false, 999); } /// <summary> /// å页äºä»¶ @@ -101,7 +97,7 @@ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); getModel(lbGuid.Text.Trim()); else { _filterList.Clear(); @@ -158,15 +154,16 @@ } } private void getModel(string strGuid, bool isEdit, int tabIdx) 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; } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); var _obj = new { guid = strGuid //主建 @@ -257,7 +254,10 @@ MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } getModel(rowGuid, true, 1); Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); } /// <summary> @@ -347,7 +347,7 @@ _webServiceName + "DeleteModelMx", JsonConvert.SerializeObject(lst)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1); if (_rtn.rtnCode > 0) getModel(lbGuid.Text); MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg); } catch (Exception ex) @@ -400,9 +400,9 @@ if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); getModel(lbGuid.Text.Trim()); else getPageList(1); getPageList(this.pageBar1.CurrentPage); } } catch (Exception ex) DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -819,6 +819,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Staff"; this.Text = "å工信æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workMk.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -1,11 +1,9 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -717,6 +717,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Supplier"; this.Text = "ä¾åºåä¿¡æ¯"; ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -670,6 +670,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "DocNoRule"; this.Text = "ç¼ç è§å"; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -23,7 +23,7 @@ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); }); DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -416,6 +416,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesSysPageview"; this.Text = "PDA页é¢ç»´æ¤"; ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -325,6 +325,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_PrintInfo"; this.Text = "æå°æºç»´æ¤"; ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_port.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ip.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
@@ -332,6 +332,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_PrintUser"; this.Text = "æå°æºç»å®"; ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -71,6 +71,7 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = "SYS_ORGANIZATION,check_date,check_status,check_by"; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -378,7 +379,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Organization"; this.Text = "Organization"; this.Text = "ç»ç»æºæ"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -17,14 +17,6 @@ { InitializeComponent(); //toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; //toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; //toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; //toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; //toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; //toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; tlMenu.DoubleClick += TlMenu_DoubleClick; @@ -39,17 +31,6 @@ { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该çªä½ä¸æ¯ææ¥è¯¢ï¼è¥æ³æ´æ°é¡µé¢ï¼è¯·ç¹å» å·æ°"); } /// <summary> /// æ¥è¯¢åè° /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) { _filterList = e.FilterList; getTree(); } /// <summary> /// å·æ°äºä»¶ /// </summary> @@ -72,188 +53,6 @@ getModel(rowGuid, false, 999); } } /// <summary> /// åå®¡æ ¸ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// å®¡æ ¸äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// åæ¶äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); } /// <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_name, tlMenu); 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("", "Organization/DeleteModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getTree(); } MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg); } catch (Exception ex) { MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } /// <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_name, tlMenu); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } getModel(rowGuid, true, 1); } /// <summary> /// æ°å¢äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; UtilityHelper.CleanValueByControl(panel1.Controls, 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_fNumber.Text.Trim())) { MsgHelper.Warning("ç¼å·ä¸è½ä¸ºç©ºï¼"); txt_fNumber.Focus(); return; } if (string.IsNullOrEmpty(txt_name.Text.Trim())) { MsgHelper.Warning("åç§°ä¸è½ä¸ºç©ºï¼"); txt_name.Focus(); return; } if (string.IsNullOrEmpty(txt_conPeople.Text.Trim())) { MsgHelper.Warning("è系人ä¸è½ä¸ºç©ºï¼"); txt_conPeople.Focus(); return; } if (string.IsNullOrEmpty(txt_conTel.Text.Trim())) { MsgHelper.Warning("èç³»çµè¯ä¸è½ä¸ºç©ºï¼"); txt_conTel.Focus(); return; } var _upGuid = txt_upGuid.Text.Trim().Length > 0 ? txt_upGuid.SelectedValue.ToString() : ""; var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 upGuid = _upGuid, //ä¸çº§ç主建 name = txt_name.Text.Trim(), //åç§° conPeople = txt_conPeople.Text, //è系人 conTel = txt_conPeople.Text, //èç³»çµè¯ isStatus = txt_isStatus.Checked, //ç¶æ factory = txt_fNumber.Text //ç»ç»ç¼å· }; try { var strJson = UtilityHelper.HttpPost("", "Organization/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); } } private void getTree() { tlMenu.Nodes.Clear(); @@ -305,7 +104,6 @@ MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } private void getModel(string strGuid, bool isEdit, int tabIdx) { if (string.IsNullOrEmpty(strGuid)) @@ -340,7 +138,5 @@ MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -183,6 +183,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "SysLog"; this.Text = "ç³»ç»æ¥å¿"; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
@@ -83,16 +83,17 @@ // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = 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 = null; this.toolBarMenu1.Size = new System.Drawing.Size(794, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; // // xtraTabControl1 // @@ -201,7 +202,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(792, 475); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -507,7 +507,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "SysMenu"; this.Text = "SysMenu"; this.Text = "åè½èå"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -113,7 +113,6 @@ MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } if (!MsgHelper.AskQuestion("ä½ éæ©äºã" + rowName + "ãï¼ç¡®å®å é¤åï¼")) return; var lst = new List<string>(); lst.Add(rowGuid); @@ -221,7 +220,6 @@ txt_upGuid.Focus(); return; } var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 @@ -287,7 +285,6 @@ MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); var _obj = new { DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <!-- 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: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: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: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> </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> DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -367,7 +367,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Role"; this.Text = "Role"; this.Text = "è§è²ç®¡ç"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -373,7 +373,6 @@ // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(736, 570); this.xtraTabPage2.Text = "æ°æ®è¯¦ç»"; // @@ -635,7 +634,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "User"; this.Text = "User"; this.Text = "ç¨æ·ç®¡ç"; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.resx
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -504,10 +504,10 @@ <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.Designer.cs"> <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Warehouse\Frm_MesDepot.cs"> <Compile Include="DevFrm\BasicData\Frm_MesDepot.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\Warehouse\Frm_MesDepot.Designer.cs"> <Compile Include="DevFrm\BasicData\Frm_MesDepot.Designer.cs"> <DependentUpon>Frm_MesDepot.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.cs"> @@ -939,7 +939,7 @@ <EmbeddedResource Include="DevFrm\Warehouse\Frm_ArrivalBarcode.resx"> <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx"> <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepot.resx"> <DependentUpon>Frm_MesDepot.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemArn.resx"> DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -90,6 +90,7 @@ lookSearchSupplier.EditValue = null; return; } if(!string.IsNullOrEmpty(Code)) lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim()))); }