DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -21,8 +21,6 @@ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator; getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); @@ -32,13 +30,6 @@ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); Task.Delay(100); getPageList(1); } private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.Info.IsRowIndicator && e.RowHandle >= 0) { e.Info.DisplayText = (e.RowHandle + 1).ToString(); } } /// <summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -36,14 +36,7 @@ getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; } private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.Info.IsRowIndicator && e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); } /// <summary> /// åå®¡æ ¸ /// </summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -31,29 +31,16 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; gridView1.FocusedRowChanged += (s, e) => { UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", ""); }; gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator; getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", ""); } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); Task.Delay(100); Task.Delay(100); getPageList(1); } private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.Info.IsRowIndicator && e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); } /// <summary> @@ -131,10 +118,10 @@ /// </summary> /// <param name="curPage">第å 页</param> /// <param name="pageSize">æ¯é¡µå æ¡</param> private void getPageList(int curPage) private void getPageList(int curPage) { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); @@ -170,7 +157,7 @@ { MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } private void getModel(string strGuid, bool isEdit, int tabIdx) DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -517,7 +517,6 @@ this.Name = "FrmMain"; this.NavigationControl = this.acrd; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.TopMost = true; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.fluentDesignFormContainer1.ResumeLayout(false); this.fluentDesignFormContainer1.PerformLayout(); DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -47,11 +47,7 @@ this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit(); this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createDate = new DevExpress.XtraEditors.LabelControl(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createBy = new DevExpress.XtraEditors.LabelControl(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_itemNo = new DevExpress.XtraEditors.LabelControl(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); @@ -67,6 +63,8 @@ this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.txtGysNo = new DevExpress.XtraEditors.TextEdit(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier(); this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems(); this.txt_status = new DevExpress.XtraEditors.CheckEdit(); @@ -76,8 +74,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); @@ -86,6 +82,7 @@ this.xtraTabPage1.SuspendLayout(); this.xtraTabPage2.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); @@ -94,11 +91,11 @@ // this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_suppNo.Appearance.Options.UseFont = true; this.lb_suppNo.Location = new System.Drawing.Point(11, 89); this.lb_suppNo.Location = new System.Drawing.Point(358, 12); this.lb_suppNo.Name = "lb_suppNo"; this.lb_suppNo.Size = new System.Drawing.Size(85, 21); this.lb_suppNo.Size = new System.Drawing.Size(68, 21); this.lb_suppNo.TabIndex = 235; this.lb_suppNo.Text = "éæ©ä¾åºå"; this.lb_suppNo.Text = "éä¾åºå"; // // gv_suppNo // @@ -118,7 +115,7 @@ // this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_itemId.Appearance.Options.UseFont = true; this.lb_itemId.Location = new System.Drawing.Point(28, 13); this.lb_itemId.Location = new System.Drawing.Point(12, 12); this.lb_itemId.Name = "lb_itemId"; this.lb_itemId.Size = new System.Drawing.Size(68, 21); this.lb_itemId.TabIndex = 231; @@ -142,11 +139,11 @@ // this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_status.Appearance.Options.UseFont = true; this.lb_status.Location = new System.Drawing.Point(348, 89); this.lb_status.Location = new System.Drawing.Point(681, 87); this.lb_status.Name = "lb_status"; this.lb_status.Size = new System.Drawing.Size(73, 21); this.lb_status.Size = new System.Drawing.Size(68, 21); this.lb_status.TabIndex = 228; this.lb_status.Text = "å®¡æ ¸æ è¯ "; this.lb_status.Text = "å®¡æ ¸æ è¯"; // // gv_status // @@ -167,20 +164,20 @@ // this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_checkDate.Appearance.Options.UseFont = true; this.lb_checkDate.Location = new System.Drawing.Point(595, 51); this.lb_checkDate.Location = new System.Drawing.Point(681, 50); this.lb_checkDate.Name = "lb_checkDate"; this.lb_checkDate.Size = new System.Drawing.Size(73, 21); this.lb_checkDate.Size = new System.Drawing.Size(68, 21); this.lb_checkDate.TabIndex = 226; this.lb_checkDate.Text = "å®¡æ ¸æ¶é´ "; this.lb_checkDate.Text = "å®¡æ ¸æ¶é´"; // // txt_checkDate // this.txt_checkDate.Enabled = false; this.txt_checkDate.Location = new System.Drawing.Point(673, 47); this.txt_checkDate.Location = new System.Drawing.Point(754, 46); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkDate.Properties.Appearance.Options.UseFont = true; this.txt_checkDate.Size = new System.Drawing.Size(176, 28); this.txt_checkDate.Size = new System.Drawing.Size(157, 28); this.txt_checkDate.TabIndex = 226; // // gv_checkDate @@ -201,20 +198,20 @@ // this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_checkUser.Appearance.Options.UseFont = true; this.lb_checkUser.Location = new System.Drawing.Point(612, 13); this.lb_checkUser.Location = new System.Drawing.Point(698, 12); this.lb_checkUser.Name = "lb_checkUser"; this.lb_checkUser.Size = new System.Drawing.Size(56, 21); this.lb_checkUser.Size = new System.Drawing.Size(51, 21); this.lb_checkUser.TabIndex = 222; this.lb_checkUser.Text = "å®¡æ ¸äºº "; this.lb_checkUser.Text = "å®¡æ ¸äºº"; // // txt_checkUser // this.txt_checkUser.Enabled = false; this.txt_checkUser.Location = new System.Drawing.Point(673, 9); this.txt_checkUser.Location = new System.Drawing.Point(754, 8); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkUser.Properties.Appearance.Options.UseFont = true; this.txt_checkUser.Size = new System.Drawing.Size(176, 28); this.txt_checkUser.Size = new System.Drawing.Size(157, 28); this.txt_checkUser.TabIndex = 222; // // gv_checkUser @@ -235,20 +232,20 @@ // this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateDate.Appearance.Options.UseFont = true; this.lb_lastupdateDate.Location = new System.Drawing.Point(852, 51); this.lb_lastupdateDate.Location = new System.Drawing.Point(922, 50); this.lb_lastupdateDate.Name = "lb_lastupdateDate"; this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21); this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21); this.lb_lastupdateDate.TabIndex = 219; this.lb_lastupdateDate.Text = "æåæ´æ°æ¶é´ "; this.lb_lastupdateDate.Text = "æ´æ°æ¶é´"; // // txt_lastupdateDate // this.txt_lastupdateDate.Enabled = false; this.txt_lastupdateDate.Location = new System.Drawing.Point(965, 47); this.txt_lastupdateDate.Location = new System.Drawing.Point(995, 46); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateDate.Size = new System.Drawing.Size(166, 28); this.txt_lastupdateDate.Size = new System.Drawing.Size(157, 28); this.txt_lastupdateDate.TabIndex = 219; // // gv_lastupdateDate @@ -269,20 +266,20 @@ // this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateBy.Appearance.Options.UseFont = true; this.lb_lastupdateBy.Location = new System.Drawing.Point(869, 13); this.lb_lastupdateBy.Location = new System.Drawing.Point(939, 12); this.lb_lastupdateBy.Name = "lb_lastupdateBy"; this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21); this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21); this.lb_lastupdateBy.TabIndex = 217; this.lb_lastupdateBy.Text = "æåæ´æ°äºº "; this.lb_lastupdateBy.Text = "æ´æ°äºº"; // // txt_lastupdateBy // this.txt_lastupdateBy.Enabled = false; this.txt_lastupdateBy.Location = new System.Drawing.Point(965, 9); this.txt_lastupdateBy.Location = new System.Drawing.Point(995, 8); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateBy.Size = new System.Drawing.Size(166, 28); this.txt_lastupdateBy.Size = new System.Drawing.Size(157, 28); this.txt_lastupdateBy.TabIndex = 217; // // gv_lastupdateBy @@ -299,26 +296,6 @@ this.gv_lastupdateBy.VisibleIndex = 8; this.gv_lastupdateBy.Width = 94; // // lb_createDate // this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createDate.Appearance.Options.UseFont = true; this.lb_createDate.Location = new System.Drawing.Point(348, 51); this.lb_createDate.Name = "lb_createDate"; this.lb_createDate.Size = new System.Drawing.Size(73, 21); this.lb_createDate.TabIndex = 216; this.lb_createDate.Text = "å建æ¶é´ "; // // txt_createDate // this.txt_createDate.Enabled = false; this.txt_createDate.Location = new System.Drawing.Point(427, 47); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; this.txt_createDate.Size = new System.Drawing.Size(166, 28); this.txt_createDate.TabIndex = 216; // // gv_createDate // this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -332,26 +309,6 @@ this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 7; this.gv_createDate.Width = 120; // // lb_createBy // this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createBy.Appearance.Options.UseFont = true; this.lb_createBy.Location = new System.Drawing.Point(365, 13); this.lb_createBy.Name = "lb_createBy"; this.lb_createBy.Size = new System.Drawing.Size(56, 21); this.lb_createBy.TabIndex = 213; this.lb_createBy.Text = "å建人 "; // // txt_createBy // this.txt_createBy.Enabled = false; this.txt_createBy.Location = new System.Drawing.Point(427, 9); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createBy.Properties.Appearance.Options.UseFont = true; this.txt_createBy.Size = new System.Drawing.Size(166, 28); this.txt_createBy.TabIndex = 213; // // gv_createBy // @@ -371,16 +328,16 @@ // this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_itemNo.Appearance.Options.UseFont = true; this.lb_itemNo.Location = new System.Drawing.Point(23, 51); this.lb_itemNo.Location = new System.Drawing.Point(12, 50); this.lb_itemNo.Name = "lb_itemNo"; this.lb_itemNo.Size = new System.Drawing.Size(73, 21); this.lb_itemNo.Size = new System.Drawing.Size(68, 21); this.lb_itemNo.TabIndex = 211; this.lb_itemNo.Text = "ç©æç¼ç "; this.lb_itemNo.Text = "ç©æç¼ç "; // // txt_itemNo // this.txt_itemNo.Enabled = false; this.txt_itemNo.Location = new System.Drawing.Point(106, 47); this.txt_itemNo.Location = new System.Drawing.Point(90, 46); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemNo.Properties.Appearance.Options.UseFont = true; @@ -422,7 +379,7 @@ this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(1126, 531); this.gcMain.Size = new System.Drawing.Size(1213, 531); this.gcMain.TabIndex = 1; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -505,7 +462,7 @@ this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.pageBar1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); this.xtraTabPage1.Size = new System.Drawing.Size(1213, 570); this.xtraTabPage1.Text = "æ°æ®æ¥è¯¢"; // // pageBar1 @@ -516,7 +473,7 @@ 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(1126, 39); this.pageBar1.Size = new System.Drawing.Size(1213, 39); this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // @@ -531,6 +488,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.labelControl1); this.panel1.Controls.Add(this.txtGysNo); this.panel1.Controls.Add(this.txt_suppId); this.panel1.Controls.Add(this.txt_itemId); this.panel1.Controls.Add(this.txt_status); @@ -546,10 +505,6 @@ this.panel1.Controls.Add(this.txt_lastupdateDate); this.panel1.Controls.Add(this.lb_lastupdateBy); this.panel1.Controls.Add(this.txt_lastupdateBy); this.panel1.Controls.Add(this.lb_createDate); this.panel1.Controls.Add(this.txt_createDate); this.panel1.Controls.Add(this.lb_createBy); this.panel1.Controls.Add(this.txt_createBy); this.panel1.Controls.Add(this.lb_itemNo); this.panel1.Controls.Add(this.txt_itemNo); this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); @@ -558,10 +513,30 @@ this.panel1.Size = new System.Drawing.Size(1163, 196); this.panel1.TabIndex = 1; // // labelControl1 // this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl1.Appearance.Options.UseFont = true; this.labelControl1.Location = new System.Drawing.Point(341, 50); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(85, 21); this.labelControl1.TabIndex = 239; this.labelControl1.Text = "ä¾åºåç¼ç "; // // txtGysNo // this.txtGysNo.Enabled = false; this.txtGysNo.Location = new System.Drawing.Point(429, 46); this.txtGysNo.Name = "txtGysNo"; this.txtGysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txtGysNo.Properties.Appearance.Options.UseFont = true; this.txtGysNo.Size = new System.Drawing.Size(239, 28); this.txtGysNo.TabIndex = 240; // // txt_suppId // this.txt_suppId.IsReadly = false; this.txt_suppId.Location = new System.Drawing.Point(106, 90); this.txt_suppId.Location = new System.Drawing.Point(429, 7); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; this.txt_suppId.Size = new System.Drawing.Size(239, 30); @@ -570,7 +545,7 @@ // txt_itemId // this.txt_itemId.IsReadly = false; this.txt_itemId.Location = new System.Drawing.Point(106, 12); this.txt_itemId.Location = new System.Drawing.Point(90, 6); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(239, 33); this.txt_itemId.TabIndex = 237; @@ -579,7 +554,7 @@ // txt_status // this.txt_status.Enabled = false; this.txt_status.Location = new System.Drawing.Point(426, 87); this.txt_status.Location = new System.Drawing.Point(754, 85); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = ""; this.txt_status.Size = new System.Drawing.Size(94, 24); @@ -618,8 +593,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); @@ -629,6 +602,7 @@ this.xtraTabPage2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -669,13 +643,7 @@ private DevExpress.XtraEditors.LabelControl lb_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; private DevExpress.XtraEditors.LabelControl lb_createDate; private DevExpress.XtraEditors.TextEdit txt_createDate; private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; private DevExpress.XtraEditors.LabelControl lb_createBy; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraEditors.LabelControl lb_itemNo; @@ -688,5 +656,7 @@ private System.Windows.Forms.PictureBox picCheckBox; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraEditors.LabelControl labelControl1; private DevExpress.XtraEditors.TextEdit txtGysNo; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -29,45 +29,26 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; gridView1.FocusedRowChanged += (s, e) => { UtilityHelper.SetCheckIco(s, picCheckBox, this, "status", ""); }; getPageList(1); Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "status", ""); pageBar1.PagerEvent += PageBar1_PagerEvent; gridView1.CustomDrawRowIndicator += (s, e) => { if (e.Info.IsRowIndicator && e.RowHandle >= 0) { e.Info.DisplayText = (e.RowHandle + 1).ToString(); } }; gridView1.CustomDrawEmptyForeground += (s, e) => { string str = "ææªæ¥æ¾å°å¹é çæ°æ®!"; Font f = new Font("微软é é»", 16); Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; _setIno(); } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); Task.Delay(100); getPageList(1); } private void _setIno() { txt_itemId.EditChanged += (s, e) => { txt_itemNo.Text = this.txt_itemId.GetCode(); //var ItemId = this.txt_itemId.GetId(); //var ItemName = this.txt_itemId.GetName(); //GetCount(ItemId, ItemName); }; txt_suppId.getSuppler(""); txt_suppId.EditChanged += (s, e) => { txtGysNo.Text = this.txt_suppId.GetCode(); }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); Task.Delay(100); getPageList(1); } /// <summary> /// åå»äºä»¶ /// </summary> @@ -207,13 +188,6 @@ UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; UtilityHelper.CleanValueByControl(this.panel1.Controls, true); txt_createBy.Enabled = false; txt_createDate.Enabled = false; txt_lastupdateBy.Enabled = false; txt_lastupdateDate.Enabled = false; txt_checkUser.Enabled = false; txt_checkDate.Enabled = false; txt_status.Enabled = false; } /// <summary> /// ä¿åäºä»¶ @@ -267,9 +241,9 @@ /// </summary> /// <param name="curPage">第å 页</param> /// <param name="pageSize">æ¯é¡µå æ¡</param> private void getPageList(int curPage) private void getPageList(int curPage) { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); @@ -303,7 +277,7 @@ { ToolBox.MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } /// <summary> /// DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.Designer.cs
@@ -30,14 +30,14 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoleSelectAction)); this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.trv = new System.Windows.Forms.TreeView(); this.panel2 = new System.Windows.Forms.Panel(); this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); this.btnSave = new DevExpress.XtraEditors.SimpleButton(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.panel2.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -48,16 +48,6 @@ this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(468, 643); this.panel1.TabIndex = 0; // // panel2 // this.panel2.Controls.Add(this.btnCancel); this.panel2.Controls.Add(this.btnSave); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel2.Location = new System.Drawing.Point(0, 579); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(468, 64); this.panel2.TabIndex = 1; // // groupBox1 // @@ -79,6 +69,16 @@ this.trv.Name = "trv"; this.trv.Size = new System.Drawing.Size(462, 618); this.trv.TabIndex = 2; // // panel2 // this.panel2.Controls.Add(this.btnCancel); this.panel2.Controls.Add(this.btnSave); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel2.Location = new System.Drawing.Point(0, 579); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(468, 64); this.panel2.TabIndex = 1; // // btnCancel // @@ -122,9 +122,10 @@ this.Name = "RoleSelectAction"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "设置è§è²æé"; this.TopMost = true; this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.panel2.ResumeLayout(false); this.ResumeLayout(false); } DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs
@@ -119,6 +119,7 @@ this.Name = "UserSelectRole"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©è§è²"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.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/UserSetPwd.Designer.cs
@@ -155,6 +155,7 @@ this.Name = "UserSetPwd"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "ä¿®æ¹å¯ç "; this.TopMost = true; this.panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtNewPwd2.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.resx
@@ -1,159 +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 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> <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> </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
@@ -642,12 +642,6 @@ <Compile Include="UserControl\UcPageBar.Designer.cs"> <DependentUpon>UcPageBar.cs</DependentUpon> </Compile> <Compile Include="UserControl\ShowDialogForm.cs"> <SubType>Form</SubType> </Compile> <Compile Include="UserControl\ShowDialogForm.designer.cs"> <DependentUpon>ShowDialogForm.cs</DependentUpon> </Compile> <Compile Include="UserControl\ShowFilter.cs"> <SubType>Form</SubType> </Compile> @@ -885,9 +879,6 @@ </EmbeddedResource> <EmbeddedResource Include="UserControl\UcPageBar.resx"> <DependentUpon>UcPageBar.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\ShowDialogForm.resx"> <DependentUpon>ShowDialogForm.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\ShowFilter.resx"> <DependentUpon>ShowFilter.cs</DependentUpon> DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -13,6 +13,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.RichEdit.Export; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid; @@ -104,7 +105,7 @@ /// <returns></returns> public static string HttpPost(string url, string meth, string param) { DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("æ¼å½å è½½ä¸ï¼è¯·ç¨å..."+ meth, "åæ æç¤º"); DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("æ¼å½å è½½ä¸ï¼è¯·ç¨å..." + meth, "åæ æç¤º"); HttpWebRequest request = null; StreamWriter requestStream = null; WebResponse response = null; @@ -312,10 +313,10 @@ { // colmn.Visible = !isEdt; // break; colmn.OptionsColumn.AllowEdit =true; colmn.OptionsColumn.AllowEdit = true; } else colmn.OptionsColumn.AllowEdit = !isEdt; colmn.OptionsColumn.AllowEdit = !isEdt; } //gv.OptionsBehavior.Editable = !isEdt; } @@ -1343,16 +1344,20 @@ return _sbSqlWhere.ToString(); } /// <summary> /// åå§ågridview /// /// </summary> /// <param name="gridView1"></param> public static void SetGridSear(GridView gridView1) /// <param name="gridView1">gridview</param> /// <param name="btnChkIco">徿 æé®</param> /// <param name="fm">å½åçªä½</param> /// <param name="fileName">åæ®µ</param> /// <param name="icoName">徿 è·¯å¾</param> public static void SetGridSear(GridView gridView1, PictureBox btnChkIco = null, Form fm = null, string fileName = "checkStatus", string icoName = "") { foreach (GridColumn column in gridView1.Columns) { column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains; column.OptionsFilter.ImmediateUpdateAutoFilter = false; column.OptionsColumn.AllowEdit = false; // column.OptionsColumn.AllowEdit = false; if (column.Tag == null || column.Tag.ToString().Length <= 0) column.OptionsFilter.AllowAutoFilter = false; } @@ -1377,10 +1382,15 @@ e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; if (btnChkIco != null) { gridView1.FocusedRowChanged += (s, e) => { UtilityHelper.SetCheckIco(s, btnChkIco, fm, fileName, icoName); }; } } #endregion public static bool IsNumeric(string str) { DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -382,6 +382,7 @@ this.Name = "SelectCgMx"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©éè¦å ¥åºçæç»"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
@@ -229,6 +229,7 @@ this.Name = "SelectCheckDt"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©éè¦å ¥å¯¼å ¥çæ°æ®"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs
@@ -37,6 +37,8 @@ this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -44,13 +46,11 @@ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -181,6 +181,31 @@ this.gridColumn3.VisibleIndex = 3; this.gridColumn3.Width = 125; // // gv_purchaseUnit // this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true; this.gv_purchaseUnit.Caption = "车é´ID"; this.gv_purchaseUnit.FieldName = "daa015"; this.gv_purchaseUnit.MinWidth = 100; this.gv_purchaseUnit.Name = "gv_purchaseUnit"; this.gv_purchaseUnit.OptionsColumn.AllowEdit = false; this.gv_purchaseUnit.OptionsColumn.ReadOnly = true; this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gv_purchaseUnit.Visible = true; this.gv_purchaseUnit.VisibleIndex = 4; this.gv_purchaseUnit.Width = 100; // // gridColumn2 // this.gridColumn2.Caption = "产线"; this.gridColumn2.FieldName = "daa015"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 94; // // gridColumn1 // this.gridColumn1.Caption = "ç©æID"; @@ -266,32 +291,6 @@ this.gridColumn7.VisibleIndex = 12; this.gridColumn7.Width = 100; // // gridColumn9 // this.gridColumn9.Caption = "夿³¨"; this.gridColumn9.FieldName = "daa009"; this.gridColumn9.MinWidth = 100; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 14; this.gridColumn9.Width = 100; // // gv_purchaseUnit // this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true; this.gv_purchaseUnit.Caption = "车é´ID"; this.gv_purchaseUnit.FieldName = "daa015"; this.gv_purchaseUnit.MinWidth = 100; this.gv_purchaseUnit.Name = "gv_purchaseUnit"; this.gv_purchaseUnit.OptionsColumn.AllowEdit = false; this.gv_purchaseUnit.OptionsColumn.ReadOnly = true; this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gv_purchaseUnit.Visible = true; this.gv_purchaseUnit.VisibleIndex = 4; this.gv_purchaseUnit.Width = 100; // // gv_remarks // this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -306,6 +305,17 @@ this.gv_remarks.Visible = true; this.gv_remarks.VisibleIndex = 13; this.gv_remarks.Width = 100; // // gridColumn9 // this.gridColumn9.Caption = "夿³¨"; this.gridColumn9.FieldName = "daa009"; this.gridColumn9.MinWidth = 100; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 14; this.gridColumn9.Width = 100; // // panelControl1 // @@ -339,16 +349,6 @@ this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // // gridColumn2 // this.gridColumn2.Caption = "产线"; this.gridColumn2.FieldName = "daa015"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 94; // // SelectWomdaahb // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -360,6 +360,7 @@ this.Name = "SelectWomdaahb"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "SelectWomdaahb"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -408,6 +408,7 @@ this.Name = "SelectWompba"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©ç产任å¡å"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); this.panelControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/UserControl/ShowDialogForm.resx
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
@@ -67,6 +67,7 @@ this.Name = "ShowFile"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "æä»¶é¢è§"; this.TopMost = true; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; ((System.ComponentModel.ISupportInitialize)(this.pane1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit(); DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -155,6 +155,7 @@ this.Name = "ShowFilter"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "请å¢å æ¥è¯¢æ¡ä»¶"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); DevApp/Gs.DevApp/UserControl/ShowFilter.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/UserControl/ShowLogcs.Designer.cs
@@ -147,6 +147,7 @@ this.Name = "ShowLogcs"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "å ³èæ¥å¿"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); this.ResumeLayout(false); DevApp/Gs.DevApp/UserControl/ShowRptWizard.Designer.cs
@@ -110,6 +110,7 @@ this.Name = "ShowRptWizard"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "设计å导"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit(); this.wizardControl1.ResumeLayout(false); this.wizardPage1.ResumeLayout(false); DevApp/Gs.DevApp/UserControl/ShowRptWizard.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/UserControl/UcLookSupplier.cs
@@ -34,12 +34,15 @@ public void getSuppler(string orgId) { string _keyWhere = ""; if (!string.IsNullOrEmpty(orgId)) _keyWhere = " and a.FSubsidiary ='" + orgId + "'"; var _obj = new { currentPage = 1, everyPageSize = 999999, sortName = "", keyWhere = " and a.FSubsidiary ='" + orgId + "'", keyWhere = _keyWhere, }; var json = JsonConvert.SerializeObject(_obj); try @@ -95,6 +98,6 @@ // lookSearchSupplier.EditValue = ((Code.ToString().Trim())); lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim())); } } }