| DevApp/Gs.DevApp/DevFrm/FrmMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookItems.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -24,6 +24,7 @@ { private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>(); private string OldorgFids = ""; public FrmMain() { InitializeComponent(); @@ -74,6 +75,8 @@ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请选择你需要的组织！"); return; } if (OldorgFids == _val) return; var _obj = new { edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid, @@ -423,6 +426,7 @@ repositoryItemCheckedComboBoxEdit1.ValueMember = "fid"; var _obj = UtilityHelper.ReturnToDynamic(strReturn); barOrg.EditValue = _obj.rtnData.extendText; OldorgFids = _obj.rtnData.extendText; } catch (Exception ex) { DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -139,10 +139,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -159,16 +159,16 @@ // this.lb_lookupTypeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lookupTypeName.Appearance.Options.UseFont = true; this.lb_lookupTypeName.Location = new System.Drawing.Point(414, 18); this.lb_lookupTypeName.Location = new System.Drawing.Point(284, 18); this.lb_lookupTypeName.Name = "lb_lookupTypeName"; this.lb_lookupTypeName.Size = new System.Drawing.Size(141, 21); this.lb_lookupTypeName.Size = new System.Drawing.Size(73, 21); this.lb_lookupTypeName.TabIndex = 213; this.lb_lookupTypeName.Text = "系统快码类型名称 "; this.lb_lookupTypeName.Text = "类型名称 "; // // txt_lookupTypeName // this.txt_lookupTypeName.Enabled = false; this.txt_lookupTypeName.Location = new System.Drawing.Point(561, 15); this.txt_lookupTypeName.Location = new System.Drawing.Point(363, 14); this.txt_lookupTypeName.Name = "txt_lookupTypeName"; this.txt_lookupTypeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lookupTypeName.Properties.Appearance.Options.UseFont = true; @@ -195,14 +195,14 @@ this.lb_lookupTypeCode.Appearance.Options.UseFont = true; this.lb_lookupTypeCode.Location = new System.Drawing.Point(26, 18); this.lb_lookupTypeCode.Name = "lb_lookupTypeCode"; this.lb_lookupTypeCode.Size = new System.Drawing.Size(141, 21); this.lb_lookupTypeCode.Size = new System.Drawing.Size(73, 21); this.lb_lookupTypeCode.TabIndex = 211; this.lb_lookupTypeCode.Text = "系统快码类型编码 "; this.lb_lookupTypeCode.Text = "类型编码 "; // // txt_lookupTypeCode // this.txt_lookupTypeCode.Enabled = false; this.txt_lookupTypeCode.Location = new System.Drawing.Point(173, 15); this.txt_lookupTypeCode.Location = new System.Drawing.Point(105, 14); this.txt_lookupTypeCode.Name = "txt_lookupTypeCode"; this.txt_lookupTypeCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lookupTypeCode.Properties.Appearance.Options.UseFont = true; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -59,6 +59,8 @@ this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.txt_OrgName = new Gs.DevApp.UserControl.UcLookOrg(); this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.txtGysNo = new DevExpress.XtraEditors.TextEdit(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier(); @@ -91,7 +93,7 @@ // 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(27, 88); this.lb_suppNo.Location = new System.Drawing.Point(27, 112); this.lb_suppNo.Name = "lb_suppNo"; this.lb_suppNo.Size = new System.Drawing.Size(68, 21); this.lb_suppNo.TabIndex = 235; @@ -115,7 +117,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(27, 12); this.lb_itemId.Location = new System.Drawing.Point(27, 48); this.lb_itemId.Name = "lb_itemId"; this.lb_itemId.Size = new System.Drawing.Size(68, 21); this.lb_itemId.TabIndex = 231; @@ -137,7 +139,7 @@ // 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(358, 88); this.lb_status.Location = new System.Drawing.Point(390, 144); this.lb_status.Name = "lb_status"; this.lb_status.Size = new System.Drawing.Size(68, 21); this.lb_status.TabIndex = 228; @@ -162,7 +164,7 @@ // 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(358, 50); this.lb_checkDate.Location = new System.Drawing.Point(390, 112); this.lb_checkDate.Name = "lb_checkDate"; this.lb_checkDate.Size = new System.Drawing.Size(68, 21); this.lb_checkDate.TabIndex = 226; @@ -170,11 +172,11 @@ // // txt_checkDate // this.txt_checkDate.Location = new System.Drawing.Point(431, 46); this.txt_checkDate.Location = new System.Drawing.Point(462, 108); 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(157, 28); this.txt_checkDate.Size = new System.Drawing.Size(165, 28); this.txt_checkDate.TabIndex = 226; this.txt_checkDate.Tag = "readOnly"; // @@ -196,7 +198,7 @@ // 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(375, 12); this.lb_checkUser.Location = new System.Drawing.Point(407, 79); this.lb_checkUser.Name = "lb_checkUser"; this.lb_checkUser.Size = new System.Drawing.Size(51, 21); this.lb_checkUser.TabIndex = 222; @@ -204,11 +206,11 @@ // // txt_checkUser // this.txt_checkUser.Location = new System.Drawing.Point(431, 8); this.txt_checkUser.Location = new System.Drawing.Point(462, 75); 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(157, 28); this.txt_checkUser.Size = new System.Drawing.Size(165, 28); this.txt_checkUser.TabIndex = 222; this.txt_checkUser.Tag = "readOnly"; // @@ -286,7 +288,7 @@ // 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(27, 50); this.lb_itemNo.Location = new System.Drawing.Point(27, 79); this.lb_itemNo.Name = "lb_itemNo"; this.lb_itemNo.Size = new System.Drawing.Size(68, 21); this.lb_itemNo.TabIndex = 211; @@ -294,11 +296,11 @@ // // txt_itemNo // this.txt_itemNo.Location = new System.Drawing.Point(100, 46); this.txt_itemNo.Location = new System.Drawing.Point(100, 75); 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; this.txt_itemNo.Size = new System.Drawing.Size(239, 28); this.txt_itemNo.Size = new System.Drawing.Size(281, 28); this.txt_itemNo.TabIndex = 211; this.txt_itemNo.Tag = "readOnly"; // @@ -446,6 +448,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.txt_OrgName); this.panel1.Controls.Add(this.labelControl2); this.panel1.Controls.Add(this.labelControl1); this.panel1.Controls.Add(this.txtGysNo); this.panel1.Controls.Add(this.txt_suppId); @@ -468,14 +472,32 @@ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(23, 20); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(897, 213); this.panel1.Size = new System.Drawing.Size(668, 213); this.panel1.TabIndex = 1; // // txt_OrgName // this.txt_OrgName.IsReadly = false; this.txt_OrgName.Location = new System.Drawing.Point(100, 11); this.txt_OrgName.Name = "txt_OrgName"; this.txt_OrgName.Size = new System.Drawing.Size(281, 30); this.txt_OrgName.TabIndex = 242; // // labelControl2 // this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl2.Appearance.Options.UseFont = true; this.labelControl2.Location = new System.Drawing.Point(27, 16); this.labelControl2.Name = "labelControl2"; this.labelControl2.Size = new System.Drawing.Size(68, 21); this.labelControl2.TabIndex = 241; this.labelControl2.Text = "选择组织"; // // labelControl1 // this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl1.Appearance.Options.UseFont = true; this.labelControl1.Location = new System.Drawing.Point(10, 126); this.labelControl1.Location = new System.Drawing.Point(10, 144); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(85, 21); this.labelControl1.TabIndex = 239; @@ -483,36 +505,36 @@ // // txtGysNo // this.txtGysNo.Location = new System.Drawing.Point(100, 122); this.txtGysNo.Location = new System.Drawing.Point(100, 140); 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.Size = new System.Drawing.Size(281, 28); this.txtGysNo.TabIndex = 240; this.txtGysNo.Tag = "readOnly"; // // txt_suppId // this.txt_suppId.IsReadly = false; this.txt_suppId.Location = new System.Drawing.Point(100, 83); this.txt_suppId.Location = new System.Drawing.Point(100, 107); 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); this.txt_suppId.Size = new System.Drawing.Size(281, 30); this.txt_suppId.TabIndex = 238; // // txt_itemId // this.txt_itemId.IsReadly = false; this.txt_itemId.Location = new System.Drawing.Point(100, 6); this.txt_itemId.Location = new System.Drawing.Point(100, 43); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(239, 33); this.txt_itemId.Size = new System.Drawing.Size(281, 30); this.txt_itemId.TabIndex = 237; this.txt_itemId.Tag = "no"; // // txt_status // this.txt_status.Enabled = false; this.txt_status.Location = new System.Drawing.Point(431, 86); this.txt_status.Location = new System.Drawing.Point(461, 142); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = ""; this.txt_status.Size = new System.Drawing.Size(94, 24); @@ -521,7 +543,7 @@ // lbGuid // this.lbGuid.AutoSize = true; this.lbGuid.Location = new System.Drawing.Point(29, 110); this.lbGuid.Location = new System.Drawing.Point(29, 128); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; @@ -531,7 +553,7 @@ // 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(622, 50); this.lb_lastupdateDate.Location = new System.Drawing.Point(390, 48); this.lb_lastupdateDate.Name = "lb_lastupdateDate"; this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21); this.lb_lastupdateDate.TabIndex = 219; @@ -539,11 +561,11 @@ // // txt_lastupdateDate // this.txt_lastupdateDate.Location = new System.Drawing.Point(695, 46); this.txt_lastupdateDate.Location = new System.Drawing.Point(462, 44); 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(157, 28); this.txt_lastupdateDate.Size = new System.Drawing.Size(165, 28); this.txt_lastupdateDate.TabIndex = 219; this.txt_lastupdateDate.Tag = "readOnly"; // @@ -551,7 +573,7 @@ // 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(639, 12); this.lb_lastupdateBy.Location = new System.Drawing.Point(407, 16); this.lb_lastupdateBy.Name = "lb_lastupdateBy"; this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21); this.lb_lastupdateBy.TabIndex = 217; @@ -559,11 +581,11 @@ // // txt_lastupdateBy // this.txt_lastupdateBy.Location = new System.Drawing.Point(695, 8); this.txt_lastupdateBy.Location = new System.Drawing.Point(462, 12); 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(157, 28); this.txt_lastupdateBy.Size = new System.Drawing.Size(165, 28); this.txt_lastupdateBy.TabIndex = 217; this.txt_lastupdateBy.Tag = "readOnly"; // @@ -655,5 +677,7 @@ private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; private DevExpress.XtraEditors.LabelControl lb_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; private UserControl.UcLookOrg txt_OrgName; private DevExpress.XtraEditors.LabelControl labelControl2; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -41,11 +41,17 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; this.txt_OrgName.EditChanged += (s, e) => { string _orgId = txt_OrgName.GetId(); if (string.IsNullOrEmpty(_orgId)) return; txt_suppId.getSuppler(_orgId); txt_itemId.getSuppler(_orgId); }; txt_itemId.EditChanged += (s, e) => { txt_itemNo.Text = this.txt_itemId.GetCode(); }; txt_suppId.getSuppler(""); txt_suppId.EditChanged += (s, e) => { txtGysNo.Text = this.txt_suppId.GetCode(); @@ -202,6 +208,13 @@ toolBarMenu1.isSetBtn = false; string _ItemId = txt_itemId.GetId(); string _suppNo = txt_suppId.GetId(); string _orgId = txt_OrgName.GetId(); //if (string.IsNullOrEmpty(_orgId)) //{ // Gs.DevApp.ToolBox.MsgHelper.Warning("请选择组织！"); // txt_OrgName.Focus(); // return; //} if (string.IsNullOrEmpty(_ItemId)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择物料！"); @@ -248,7 +261,7 @@ { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and b.guid is not null"; PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { @@ -263,6 +276,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); gridView1.BestFitColumns(); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); @@ -389,6 +403,7 @@ getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -184,7 +184,7 @@ this.gvMx1facLevel.Name = "gvMx1facLevel"; this.gvMx1facLevel.Tag = "edit"; this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 8; this.gvMx1facLevel.VisibleIndex = 7; this.gvMx1facLevel.Width = 150; // // rptJSSP @@ -205,7 +205,7 @@ this.gvMx1fstand.Name = "gvMx1fstand"; this.gvMx1fstand.Tag = "yz_quantity_edit"; this.gvMx1fstand.Visible = true; this.gvMx1fstand.VisibleIndex = 10; this.gvMx1fstand.VisibleIndex = 9; this.gvMx1fstand.Width = 60; // // gvMx1fcheckLevel @@ -219,7 +219,7 @@ this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel"; this.gvMx1fcheckLevel.Tag = "edit"; this.gvMx1fcheckLevel.Visible = true; this.gvMx1fcheckLevel.VisibleIndex = 7; this.gvMx1fcheckLevel.VisibleIndex = 6; this.gvMx1fcheckLevel.Width = 200; // // rptJYSP @@ -240,7 +240,7 @@ this.gvMx1fdownAllow.Name = "gvMx1fdownAllow"; this.gvMx1fdownAllow.Tag = "yz_quantity_edit"; this.gvMx1fdownAllow.Visible = true; this.gvMx1fdownAllow.VisibleIndex = 11; this.gvMx1fdownAllow.VisibleIndex = 10; this.gvMx1fdownAllow.Width = 60; // // gvMx1fcheckTool @@ -254,7 +254,7 @@ this.gvMx1fcheckTool.Name = "gvMx1fcheckTool"; this.gvMx1fcheckTool.Tag = "edit"; this.gvMx1fcheckTool.Visible = true; this.gvMx1fcheckTool.VisibleIndex = 4; this.gvMx1fcheckTool.VisibleIndex = 3; this.gvMx1fcheckTool.Width = 150; // // rptJYGJ @@ -276,7 +276,7 @@ this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo"; this.gvMx1sampleSizeNo.Tag = "edit"; this.gvMx1sampleSizeNo.Visible = true; this.gvMx1sampleSizeNo.VisibleIndex = 5; this.gvMx1sampleSizeNo.VisibleIndex = 4; this.gvMx1sampleSizeNo.Width = 150; // // rptJYBZ @@ -299,7 +299,7 @@ this.gvMx1fcheckItem.Name = "gvMx1fcheckItem"; this.gvMx1fcheckItem.Tag = "edit"; this.gvMx1fcheckItem.Visible = true; this.gvMx1fcheckItem.VisibleIndex = 1; this.gvMx1fcheckItem.VisibleIndex = 0; this.gvMx1fcheckItem.Width = 150; // // rptJYXM @@ -320,7 +320,7 @@ this.gvMx1fupAllow.Name = "gvMx1fupAllow"; this.gvMx1fupAllow.Tag = "yz_quantity_edit"; this.gvMx1fupAllow.Visible = true; this.gvMx1fupAllow.VisibleIndex = 9; this.gvMx1fupAllow.VisibleIndex = 8; this.gvMx1fupAllow.Width = 60; // // gvMx1forder @@ -332,8 +332,6 @@ this.gvMx1forder.MinWidth = 50; this.gvMx1forder.Name = "gvMx1forder"; this.gvMx1forder.Tag = "yz_quantity_edit"; this.gvMx1forder.Visible = true; this.gvMx1forder.VisibleIndex = 0; this.gvMx1forder.Width = 50; // // gvMx1memo @@ -346,7 +344,7 @@ this.gvMx1memo.Name = "gvMx1memo"; this.gvMx1memo.Tag = "edit"; this.gvMx1memo.Visible = true; this.gvMx1memo.VisibleIndex = 3; this.gvMx1memo.VisibleIndex = 2; this.gvMx1memo.Width = 150; // // gvMx1guid @@ -418,7 +416,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Tag = "edit"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 2; this.gridColumn5.VisibleIndex = 1; this.gridColumn5.Width = 150; // // sampleSizeName @@ -430,7 +428,7 @@ this.sampleSizeName.OptionsColumn.ReadOnly = true; this.sampleSizeName.Tag = "edit"; this.sampleSizeName.Visible = true; this.sampleSizeName.VisibleIndex = 6; this.sampleSizeName.VisibleIndex = 5; this.sampleSizeName.Width = 150; // // gvMxDel @@ -440,7 +438,7 @@ this.gvMxDel.MinWidth = 50; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 12; this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 100; // // repositoryItemButtonEdit1 @@ -570,7 +568,7 @@ this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true; this.gv_ftwoCheckor.Caption = "批准人"; this.gv_ftwoCheckor.FieldName = "ftwoCheckor"; this.gv_ftwoCheckor.MinWidth = 80; this.gv_ftwoCheckor.MinWidth = 50; this.gv_ftwoCheckor.Name = "gv_ftwoCheckor"; this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false; this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR"; @@ -630,7 +628,7 @@ this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true; this.gv_foneCheckdate.Caption = "审核时间"; this.gv_foneCheckdate.FieldName = "foneCheckdate"; this.gv_foneCheckdate.MinWidth = 120; this.gv_foneCheckdate.MinWidth = 50; this.gv_foneCheckdate.Name = "gv_foneCheckdate"; this.gv_foneCheckdate.OptionsColumn.AllowEdit = false; this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE"; @@ -664,7 +662,7 @@ this.gv_foneCheckor.AppearanceCell.Options.UseFont = true; this.gv_foneCheckor.Caption = "审核人"; this.gv_foneCheckor.FieldName = "foneCheckor"; this.gv_foneCheckor.MinWidth = 80; this.gv_foneCheckor.MinWidth = 50; this.gv_foneCheckor.Name = "gv_foneCheckor"; this.gv_foneCheckor.OptionsColumn.AllowEdit = false; this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR"; @@ -714,7 +712,7 @@ this.gv_itemNo.AppearanceCell.Options.UseFont = true; this.gv_itemNo.Caption = "物料产品编码"; this.gv_itemNo.FieldName = "itemNo"; this.gv_itemNo.MinWidth = 150; this.gv_itemNo.MinWidth = 50; this.gv_itemNo.Name = "gv_itemNo"; this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_b.item_no"; @@ -747,7 +745,7 @@ this.gv_memo.AppearanceCell.Options.UseFont = true; this.gv_memo.Caption = "备注"; this.gv_memo.FieldName = "memo"; this.gv_memo.MinWidth = 150; this.gv_memo.MinWidth = 50; this.gv_memo.Name = "gv_memo"; this.gv_memo.OptionsColumn.AllowEdit = false; this.gv_memo.Tag = "query_a.MEMO"; @@ -816,7 +814,7 @@ // this.gridColumn8.Caption = "使用组织"; this.gridColumn8.FieldName = "fSubsidiary"; this.gridColumn8.MinWidth = 250; this.gridColumn8.MinWidth = 50; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.OptionsColumn.AllowEdit = false; this.gridColumn8.Tag = "org.fnumber"; @@ -828,7 +826,7 @@ // this.gridColumn7.Caption = "物料ID"; this.gridColumn7.FieldName = "itemId"; this.gridColumn7.MinWidth = 80; this.gridColumn7.MinWidth = 50; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.AllowEdit = false; this.gridColumn7.Tag = "query_a.ITEM_ID"; @@ -838,7 +836,7 @@ // this.gridColumn3.Caption = "物料名称"; this.gridColumn3.FieldName = "mc"; this.gridColumn3.MinWidth = 250; this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.AllowEdit = false; this.gridColumn3.Tag = "query_b.item_name"; @@ -850,7 +848,7 @@ // this.gridColumn2.Caption = "物料规格"; this.gridColumn2.FieldName = "gg"; this.gridColumn2.MinWidth = 100; this.gridColumn2.MinWidth = 50; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Tag = "query_b.item_model"; @@ -862,7 +860,7 @@ // this.gridColumn1.Caption = "制作人"; this.gridColumn1.FieldName = "createBy"; this.gridColumn1.MinWidth = 80; this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Tag = "query_a.CREATE_BY"; @@ -874,7 +872,7 @@ // this.gridColumn4.Caption = "制作时间"; this.gridColumn4.FieldName = "createDate"; this.gridColumn4.MinWidth = 180; this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Tag = "query_a.CREATE_DATE"; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -67,6 +67,8 @@ frm.ShowDialog(); }; btnSave.Click += BtnSave_Click; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -244,7 +246,8 @@ lst.Add(new MesQmCheckitemDt { Guid = UtilityHelper.ToGuid(row["guid"].ToString()), Forder = int.Parse(row["forder"].ToString()), // Forder = int.Parse(row["forder"].ToString()), Forder = 0, FcheckItem = row["FcheckItem"].ToString(), SampleSizeNo = row["SampleSizeNo"].ToString(), FcheckTool = row["FcheckTool"].ToString(), @@ -306,7 +309,7 @@ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and b.guid is not null"; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try { @@ -323,6 +326,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); gridView1.BestFitColumns(); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); @@ -340,7 +344,6 @@ { MsgHelper.Warning("提示：" + ex.Message); } } private void getModel(string strGuid) @@ -385,6 +388,7 @@ gcMx1.BindingContext = new BindingContext(); gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); } else { @@ -432,7 +436,6 @@ } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？")) return; var _obj = new { guid = rowGuid, @@ -451,15 +454,14 @@ getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } } #region 以下为种种下拉 private void _setIno() @@ -710,6 +712,5 @@ MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
@@ -1,16 +1,8 @@ using DevExpress.Utils.DirectXPaint; using DevExpress.XtraEditors; using Gs.DevApp.Properties; using Gs.DevApp.Properties; 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.User @@ -49,57 +41,32 @@ var drGrp = dt.Select("upGuid='' or upGuid is null"); foreach (var _dy in drGrp) { var _orgGuid = _dy["guid"] + "&"; var node = new TreeNode(); //定义结点 node.Text = _dy["name"].ToString(); //为结点赋值 node.Name = _dy["guid"].ToString(); node.ImageIndex = 0; node.Checked = _dy["isCk"].ToString() == "1" ? true : false; var drItem = dt.Select("upGuid='" + _dy["guid"] + "' and orgGuid='" + _dy["guid"] + "'"); var drItem = dt.Select("upGuid='" + _dy["guid"] +"'"); foreach (var _dy2 in drItem) { var node22 = new TreeNode(); //定义结点 node22.Text = _dy2["name"].ToString(); //为结点赋值 node22.Name = _orgGuid + _dy2["guid"]; node22.Name = _dy2["guid"].ToString(); node22.ImageIndex = 1; node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false; var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "' and orgGuid='" + _dy["guid"] + "'"); node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false; var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +"'"); foreach (var _dy3 in drItem33) { var node33 = new TreeNode(); //定义结点 node33.Text = _dy3["name"].ToString(); //为结点赋值 node33.Name = _orgGuid + _dy3["guid"]; node33.Name =_dy3["guid"].ToString(); node33.ImageIndex = 2; node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false; var drItem44 = dt.Select("upGuid='" + _dy3["guid"] + "' and orgGuid='" + _dy["guid"] + "'"); foreach (var _dy4 in drItem44) { var node44 = new TreeNode(); //定义结点 node44.Text = _dy4["name"].ToString(); //为结点赋值 node44.Name = _orgGuid + _dy4["guid"]; node44.ImageIndex = 3; node44.Checked = _dy4["isCk"].ToString() == "1" ? true : false; node33.Nodes.Add(node44); } node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false; node22.Nodes.Add(node33); } node22.Expand(); //node22.Expand() ; node.Nodes.Add(node22); } node.Expand(); trv.Nodes.Add(node); } @@ -147,7 +114,6 @@ MsgHelper.Warning("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("确定设置权限吗？")) return; _actionLst = new StringBuilder(); DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.Designer.cs
@@ -45,6 +45,7 @@ // // ckList // this.ckList.CheckOnClick = true; this.ckList.Dock = System.Windows.Forms.DockStyle.Fill; this.ckList.FormattingEnabled = true; this.ckList.Location = new System.Drawing.Point(10, 10); DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -22,7 +22,7 @@ lookSearchSupplier.Properties.NullText = "请选择"; lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged; getSuppler(); // getSuppler(""); } public bool IsReadly { get; set; } @@ -37,14 +37,17 @@ if (EditChanged != null) EditChanged(this, e); } private void getSuppler() 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 = "", keyWhere = _keyWhere, }; var json = JsonConvert.SerializeObject(_obj); try @@ -56,7 +59,6 @@ lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "itemName"; lookSearchSupplier.Properties.ValueMember = "id"; } catch (Exception ex) {
