DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
@@ -70,6 +70,7 @@ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.ååºGuid = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); @@ -107,7 +108,6 @@ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn(); this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.ååºGuid = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -309,7 +309,7 @@ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bodetails_16x161; 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, "ç»å®ç¨æ·", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "ç»å®Mesè´¦å·", -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); @@ -334,6 +334,14 @@ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick); // // ååºGuid // this.ååºGuid.Caption = "gridColumn11"; this.ååºGuid.FieldName = "guid"; this.ååºGuid.MinWidth = 25; this.ååºGuid.Name = "ååºGuid"; this.ååºGuid.Width = 94; // // xtraTabPage2 // @@ -739,14 +747,6 @@ this.lastLoginTime.OptionsColumn.AllowEdit = false; this.lastLoginTime.Tag = "query_LASTLOGIN_TIME"; this.lastLoginTime.Width = 180; // // ååºGuid // this.ååºGuid.Caption = "gridColumn11"; this.ååºGuid.FieldName = "guid"; this.ååºGuid.MinWidth = 25; this.ååºGuid.Name = "ååºGuid"; this.ååºGuid.Width = 94; // // Frm_AreaBind // DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -22,21 +22,21 @@ { if (string.IsNullOrEmpty(txtNewPwd.Text.Trim())) { MsgHelper.Warning("æ°å¯ç ä¸è½ä¸ºç©ºï¼"); MsgHelper.ShowError("æ°å¯ç ä¸è½ä¸ºç©ºï¼"); txtNewPwd.Focus(); return; } if (string.IsNullOrEmpty(txtNewPwd2.Text.Trim())) { MsgHelper.Warning("å¯ç ä¸è½ä¸ºç©ºï¼"); MsgHelper.ShowError("å¯ç ä¸è½ä¸ºç©ºï¼"); txtNewPwd2.Focus(); return; } if (txtNewPwd.Text != txtNewPwd2.Text) { MsgHelper.Warning("ä½ ç两次å¯ç ä¸ä¸è´ï¼"); MsgHelper.ShowError("ä½ ç两次å¯ç ä¸ä¸è´ï¼"); txtNewPwd2.Focus(); return; } @@ -65,7 +65,7 @@ catch (Exception ex) { DialogResult = DialogResult.Cancel; MsgHelper.Warning("æç¤ºï¼" + ex.Message); MsgHelper.ShowError("æç¤ºï¼" + ex.Message); } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -66,6 +66,12 @@ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa)); 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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -327,6 +333,8 @@ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage(); this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -491,6 +499,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); this.xtraTabPage5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -2553,11 +2562,11 @@ // this.layShuLiang.Controls.Add(this.txt_iCount_1); this.layShuLiang.Controls.Add(this.txt_yuliang_1); this.layShuLiang.Location = new System.Drawing.Point(662, 44); this.layShuLiang.Location = new System.Drawing.Point(654, 44); this.layShuLiang.Name = "layShuLiang"; this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500); this.layShuLiang.Root = this.layoutControlGroup3; this.layShuLiang.Size = new System.Drawing.Size(321, 28); this.layShuLiang.Size = new System.Drawing.Size(317, 28); this.layShuLiang.TabIndex = 475; this.layShuLiang.Text = "dataLayoutControl1"; // @@ -2566,16 +2575,16 @@ this.txt_iCount_1.Location = new System.Drawing.Point(89, 2); this.txt_iCount_1.Name = "txt_iCount_1"; this.txt_iCount_1.Properties.ReadOnly = true; this.txt_iCount_1.Size = new System.Drawing.Size(69, 24); this.txt_iCount_1.Size = new System.Drawing.Size(67, 24); this.txt_iCount_1.StyleController = this.layShuLiang; this.txt_iCount_1.TabIndex = 5; // // txt_yuliang_1 // this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2); this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2); this.txt_yuliang_1.Name = "txt_yuliang_1"; this.txt_yuliang_1.Properties.ReadOnly = true; this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24); this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24); this.txt_yuliang_1.StyleController = this.layShuLiang; this.txt_yuliang_1.TabIndex = 6; // @@ -2600,7 +2609,7 @@ this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7}); this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28); this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28); this.layoutControlGroup3.TextVisible = false; // // layoutControlItem25 @@ -2608,7 +2617,7 @@ this.layoutControlItem25.Control = this.txt_iCount_1; this.layoutControlItem25.Location = new System.Drawing.Point(0, 0); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.Size = new System.Drawing.Size(160, 28); this.layoutControlItem25.Size = new System.Drawing.Size(158, 28); this.layoutControlItem25.Text = "æå°æ´å¼ æ°"; this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18); // @@ -2616,16 +2625,16 @@ // this.layoutControlItem39.Control = this.txt_yuliang_1; this.layoutControlItem39.CustomizationFormText = "æå°ä½æ°"; this.layoutControlItem39.Location = new System.Drawing.Point(160, 0); this.layoutControlItem39.Location = new System.Drawing.Point(158, 0); this.layoutControlItem39.Name = "layoutControlItem39"; this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem39.Size = new System.Drawing.Size(161, 28); this.layoutControlItem39.Size = new System.Drawing.Size(159, 28); this.layoutControlItem39.Text = "æå°ä½æ°"; this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18); // // radOut // this.radOut.Location = new System.Drawing.Point(985, 10); this.radOut.Location = new System.Drawing.Point(973, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -2634,7 +2643,7 @@ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "åªææ´å¼ "), new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "æå¨æ")}); this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0); this.radOut.Size = new System.Drawing.Size(325, 32); this.radOut.Size = new System.Drawing.Size(321, 32); this.radOut.StyleController = this.layoutMx99; this.radOut.TabIndex = 473; // @@ -2642,29 +2651,29 @@ // this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42); this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32); this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32); this.ucBtnPrint1.TabIndex = 464; // // txt_psnQty_1 // this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12); this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24); this.txt_psnQty_1.StyleController = this.layoutMx99; this.txt_psnQty_1.TabIndex = 330; this.txt_psnQty_1.Tag = "readOnly-1"; // // txt_printRemark // this.txt_printRemark.Location = new System.Drawing.Point(424, 44); this.txt_printRemark.Location = new System.Drawing.Point(420, 44); this.txt_printRemark.Name = "txt_printRemark"; this.txt_printRemark.Properties.Appearance.Options.UseFont = true; this.txt_printRemark.Size = new System.Drawing.Size(234, 24); this.txt_printRemark.Size = new System.Drawing.Size(230, 24); this.txt_printRemark.StyleController = this.layoutMx99; this.txt_printRemark.TabIndex = 334; this.txt_printRemark.Tag = "readOnly-1"; @@ -2672,11 +2681,11 @@ // txt_kQty // this.txt_kQty.EditValue = ""; this.txt_kQty.Location = new System.Drawing.Point(424, 12); this.txt_kQty.Location = new System.Drawing.Point(420, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.ReadOnly = true; this.txt_kQty.Size = new System.Drawing.Size(234, 24); this.txt_kQty.Size = new System.Drawing.Size(230, 24); this.txt_kQty.StyleController = this.layoutMx99; this.txt_kQty.TabIndex = 472; this.txt_kQty.Tag = "readonly"; @@ -2687,7 +2696,7 @@ this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; this.txt_yQty.Size = new System.Drawing.Size(234, 24); this.txt_yQty.Size = new System.Drawing.Size(230, 24); this.txt_yQty.StyleController = this.layoutMx99; this.txt_yQty.TabIndex = 470; this.txt_yQty.Tag = "readonly"; @@ -2697,7 +2706,7 @@ this.txt_zQty.Location = new System.Drawing.Point(99, 12); this.txt_zQty.Name = "txt_zQty"; this.txt_zQty.Properties.ReadOnly = true; this.txt_zQty.Size = new System.Drawing.Size(234, 24); this.txt_zQty.Size = new System.Drawing.Size(230, 24); this.txt_zQty.StyleController = this.layoutMx99; this.txt_zQty.TabIndex = 474; // @@ -2725,7 +2734,7 @@ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition10.Width = 100D; columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize; columnDefinition11.Width = 328D; columnDefinition11.Width = 323D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition7, columnDefinition8, @@ -2739,7 +2748,7 @@ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition8, rowDefinition9}); this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84); this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem23 @@ -2747,21 +2756,21 @@ this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem23.Control = this.txt_kQty; this.layoutControlItem23.Location = new System.Drawing.Point(325, 0); this.layoutControlItem23.Location = new System.Drawing.Point(321, 0); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem23.Size = new System.Drawing.Size(325, 32); this.layoutControlItem23.Size = new System.Drawing.Size(321, 32); this.layoutControlItem23.Text = "坿尿°é"; this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.radOut; this.layoutControlItem35.Location = new System.Drawing.Point(975, 0); this.layoutControlItem35.Location = new System.Drawing.Point(963, 0); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlItem35.Size = new System.Drawing.Size(325, 32); this.layoutControlItem35.Size = new System.Drawing.Size(321, 32); this.layoutControlItem35.Text = "èªå¨è®¡ç®"; this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem35.TextVisible = false; @@ -2771,12 +2780,12 @@ this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem26.Control = this.ucBtnPrint1; this.layoutControlItem26.Location = new System.Drawing.Point(975, 32); this.layoutControlItem26.Location = new System.Drawing.Point(963, 32); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlItem26.Size = new System.Drawing.Size(325, 32); this.layoutControlItem26.Size = new System.Drawing.Size(321, 32); this.layoutControlItem26.Text = "ææ¿æå°"; this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem26.TextVisible = false; @@ -2789,18 +2798,18 @@ this.layoutControlItem22.Location = new System.Drawing.Point(0, 32); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem22.Size = new System.Drawing.Size(325, 32); this.layoutControlItem22.Size = new System.Drawing.Size(321, 32); this.layoutControlItem22.Text = "å·²æå°æ°é"; this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_printRemark; this.layoutControlItem21.Location = new System.Drawing.Point(325, 32); this.layoutControlItem21.Location = new System.Drawing.Point(321, 32); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem21.Size = new System.Drawing.Size(325, 32); this.layoutControlItem21.Size = new System.Drawing.Size(321, 32); this.layoutControlItem21.Text = "æå°å¤æ³¨"; this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // @@ -2810,21 +2819,21 @@ this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem24.Control = this.txt_psnQty_1; this.layoutControlItem24.CustomizationFormText = "å å è£ æ°é"; this.layoutControlItem24.Location = new System.Drawing.Point(650, 0); this.layoutControlItem24.Location = new System.Drawing.Point(642, 0); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem24.Size = new System.Drawing.Size(325, 32); this.layoutControlItem24.Size = new System.Drawing.Size(321, 32); this.layoutControlItem24.Text = "å å è£ æ°é"; this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem38 // this.layoutControlItem38.Control = this.layShuLiang; this.layoutControlItem38.Location = new System.Drawing.Point(650, 32); this.layoutControlItem38.Location = new System.Drawing.Point(642, 32); this.layoutControlItem38.Name = "layoutControlItem38"; this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem38.Size = new System.Drawing.Size(325, 32); this.layoutControlItem38.Size = new System.Drawing.Size(321, 32); this.layoutControlItem38.Text = "æå°æ°é"; this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem38.TextVisible = false; @@ -2834,7 +2843,7 @@ this.layoutControlItem36.Control = this.txt_zQty; this.layoutControlItem36.Location = new System.Drawing.Point(0, 0); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.Size = new System.Drawing.Size(325, 32); this.layoutControlItem36.Size = new System.Drawing.Size(321, 32); this.layoutControlItem36.Text = "工忻é"; this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18); // @@ -2844,6 +2853,8 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.rptTuoBanNbz}); this.gcMx2.Size = new System.Drawing.Size(1648, 377); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -2868,7 +2879,8 @@ this.gvMx2createDate, this.gridColumn30, this.gridColumn31, this.gridColumn32}); this.gridColumn32, this.gridColumn54}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -3733,6 +3745,27 @@ this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32); this.ucBtnPrint101.TabIndex = 0; // // gridColumn54 // this.gridColumn54.Caption = "åæ´å å è£ æ°é"; this.gridColumn54.ColumnEdit = this.rptTuoBanNbz; this.gridColumn54.MinWidth = 25; this.gridColumn54.Name = "gridColumn54"; this.gridColumn54.Visible = true; this.gridColumn54.VisibleIndex = 12; this.gridColumn54.Width = 94; // // rptTuoBanNbz // this.rptTuoBanNbz.AutoHeight = false; editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image"))); editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptTuoBanNbz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "åæ´å å è£ æ°é", -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.rptTuoBanNbz.Name = "rptTuoBanNbz"; this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick); // // Frm_Womdaa // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -3906,6 +3939,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); this.xtraTabPage5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit(); this.ResumeLayout(false); } @@ -4171,5 +4205,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn63; private DevExpress.XtraGrid.Columns.GridColumn gridColumn64; private DevExpress.XtraGrid.Columns.GridColumn gridColumn65; private DevExpress.XtraGrid.Columns.GridColumn gridColumn54; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1007,5 +1007,26 @@ + "}"; } #endregion /// <summary> /// åæ´å å è£ æ°é /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx2.FocusedRowHandle; if (rowhandle < 0) return; if (e.Button.Index == 0) { var dr = gvMx2.GetDataRow(rowhandle); var mxGuid = dr["guid"].ToString(); if (!MsgHelper.AskQuestion("ä½ éæ©äº1æ¡æ°æ®ï¼ç¡®å®åæ´å å è£ æ°éåï¼")) return; var frm = new Frm_WomdaaNbz(mxGuid); frm.ShowDialog(); } } } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
@@ -117,6 +117,27 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBPcGVuO0nJ d5IAAAMUSURBVDhPdZNrUIxRGMefaskSw4xvfPEF0UwUJdKmi9wiMTVF1i0l5V5TmmGY0LjFaFzL6qLI CmEqlyIl7WaKdkt80U1bre5Lbe3797yKwfDO/Oac95z/8ztnnndeAvBfxMc5nCzdY+jYomhqdd9PrS4R dNx6KUl5y5wx+2fhT8SAaxRFy/aQJ88ljtvIZX44tTkG02mHEBIDErKysjJnLIaRDI/i2g/BX0jsN1Pc nK0EHkXBSKpK9irUKrygvTaEJskLZYnuAaKEA7QggmjeDiZUfKMRYqGdnGC74acgaTGEwYZh6mHs1aJK 4aNPCJ09iSUjf0cqlY6SSCRjzMzMRnOxJWNOlRc9IPRrIfTmw9SdC6H7IYztT1B5ZSXKz7mi/Kwr1Aky qM/IUHbaFcXxsiKWjfjVpzfn3SD0vYPQlQOhIxtCexZM+lsw9RSwuJqp4X0+oK8Kpm+VKDm2ECwYVRzn TEVHnIlEs/CtAsIXLmxJwUDTJQzUn8dAXQKMn07B+PE4+mvjmMPof38IeXvtRMFEZjRjSaXxLDCoMPg5 CbqC7XifvgY1qWtQfX01NAofaJJXoerqSry9vAKVF5fj2QFHPI1xxJNoB+RHzm0VrwFD4wO0q2NRmxkE k0ED4StfnUdTbwX3RY3BjhIM6Ath1OWhv/E++upuofllPO5FzFJTYawTmlWJqEnzR0PhUQ6/Qk/5QXSr YtH1OgZdpVHoLNmPjpe70fE8Au0FYdA/DeHmLsV1uc1hehzlAM3tfdxhT3RWp8NQc/mPoD4/GG25W9D2 SI7WB0HQ5QRAd9cfeTvtEekxxZYe7bJD0YnVUCV4w/AhhYvC0MLBlpxA6O75oVm5Fp+VvmjK8kHTTW80 3liG2gtuyAiaoeUmjiVlsA0e7nWCViHHlxfRHFyFpsyhYEPaEsYT9SkeqFMsYmSoS3ZBcawdEn2nnhQ/ J6UGTlcpN81E9hYbZG+2wR2e39k4E0r5DNwWCRoiaz2zzho3A62R5je9IcRpsjULzMWfScqMY8b/gwl/ Ia6NYSwy/KZRht80+g5HViqSsBpE9wAAAABJRU5ErkJggg== </value> </data> <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.Designer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,108 @@ namespace Gs.DevApp.DevFrm.WOM { partial class Frm_WomdaaNbz { /// <summary> /// Required designer variable. /// </summary> private System.ComponentModel.IContainer components = null; /// <summary> /// Clean up any resources being used. /// </summary> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> protected override void Dispose(bool disposing) { if (disposing && (components != null)) { components.Dispose(); } base.Dispose(disposing); } #region Windows Form Designer generated code /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WomdaaNbz)); this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); this.btnSave = new DevExpress.XtraEditors.SimpleButton(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.txtSl = new DevExpress.XtraEditors.TextEdit(); ((System.ComponentModel.ISupportInitialize)(this.txtSl.Properties)).BeginInit(); this.SuspendLayout(); // // btnCancel // this.btnCancel.Appearance.Options.UseFont = true; this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image"))); this.btnCancel.Location = new System.Drawing.Point(171, 193); this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(87, 37); this.btnCancel.TabIndex = 240; this.btnCancel.Text = "åæ¶ (&C)"; // // btnSave // this.btnSave.Appearance.Options.UseFont = true; this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image"))); this.btnSave.Location = new System.Drawing.Point(50, 193); this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(87, 37); this.btnSave.TabIndex = 239; this.btnSave.Text = "ç¡®å® (&L)"; // // labelControl1 // this.labelControl1.Location = new System.Drawing.Point(50, 81); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(90, 18); this.labelControl1.TabIndex = 241; this.labelControl1.Text = "å å è£ æ°éï¼"; // // txtSl // this.txtSl.Location = new System.Drawing.Point(147, 78); this.txtSl.Name = "txtSl"; this.txtSl.Size = new System.Drawing.Size(125, 24); this.txtSl.TabIndex = 242; // // Frm_WomdaaNbz // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(298, 260); this.Controls.Add(this.txtSl); this.Controls.Add(this.labelControl1); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Frm_WomdaaNbz"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "åæ´å å è£ æ°é"; ((System.ComponentModel.ISupportInitialize)(this.txtSl.Properties)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } #endregion private DevExpress.XtraEditors.SimpleButton btnCancel; private DevExpress.XtraEditors.SimpleButton btnSave; private DevExpress.XtraEditors.LabelControl labelControl1; private DevExpress.XtraEditors.TextEdit txtSl; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,76 @@ using DevExpress.Utils.DirectXPaint; using DevExpress.XtraEditors; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; namespace Gs.DevApp.DevFrm.WOM { public partial class Frm_WomdaaNbz : DevExpress.XtraEditors.XtraForm { /// <summary> /// ææ¿guid /// </summary> private string guid = ""; public Frm_WomdaaNbz(string _guid) { InitializeComponent(); guid = _guid; this.Text ="åæ´å å è£ æ°éï¼"+ guid; btnCancel.Click += BtnCancel_Click; btnSave.Click += BtnSave_Click; } /// <summary> /// æåå å è£ æ°é /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void BtnSave_Click(object sender, EventArgs e) { if (!MsgHelper.AskQuestion("ç¡®å®åæ´å å è£ æ°éåï¼")) return; if (string.IsNullOrEmpty(txtSl.Text.Trim())) { MsgHelper.ShowError("请å å¡«åå å è£ æ°éï¼"); txtSl.Focus(); return; } var _obj = new { guid = this.guid, sl = txtSl.Text.Trim(), }; try { var strJson = UtilityHelper.HttpPost("", "WomdaaManager/EditTb", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { MsgHelper.ShowInformation("æç¤ºï¼" + _rtn.rtnMsg); this.Close(); } else MsgHelper.ShowError("æç¤ºï¼" + _rtn.rtnMsg); } catch (Exception ex) { MsgHelper.ShowError("æç¤ºï¼" + ex.Message); } } private void BtnCancel_Click(object sender, EventArgs e) { this.Close(); } } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomdaaNbz.resx
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,140 @@ <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="assembly"> <xsd:complexType> <xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0 bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA 9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg== </value> </data> <data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0 bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c 0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg== </value> </data> </root> DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1032,6 +1032,12 @@ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </Compile> <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.Designer.cs"> <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon> </Compile> <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs"> <SubType>Form</SubType> </Compile> @@ -1895,6 +1901,9 @@ <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_WomdaaNbz.resx"> <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx"> <DependentUpon>Frm_WomFanGong.cs</DependentUpon> </EmbeddedResource>