DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -470,7 +470,7 @@ this.gv_pbillNo.AppearanceCell.Options.UseFont = true; this.gv_pbillNo.Caption = "工单单号"; this.gv_pbillNo.FieldName = "pbillNo"; this.gv_pbillNo.MinWidth = 50; this.gv_pbillNo.MinWidth = 25; this.gv_pbillNo.Name = "gv_pbillNo"; this.gv_pbillNo.OptionsColumn.AllowEdit = false; this.gv_pbillNo.Tag = "query_a.pbill_no"; @@ -484,7 +484,7 @@ this.gv_boardItem.AppearanceCell.Options.UseFont = true; this.gv_boardItem.Caption = "产品编码"; this.gv_boardItem.FieldName = "itemNo"; this.gv_boardItem.MinWidth = 50; this.gv_boardItem.MinWidth = 25; this.gv_boardItem.Name = "gv_boardItem"; this.gv_boardItem.OptionsColumn.AllowEdit = false; this.gv_boardItem.Tag = "query_a.board_item"; @@ -517,7 +517,7 @@ this.gv_outType.AppearanceCell.Options.UseFont = true; this.gv_outType.Caption = "出库类别 "; this.gv_outType.FieldName = "outType"; this.gv_outType.MinWidth = 50; this.gv_outType.MinWidth = 25; this.gv_outType.Name = "gv_outType"; this.gv_outType.OptionsColumn.AllowEdit = false; this.gv_outType.Tag = "query_a.out_type"; @@ -550,7 +550,7 @@ this.gv_workNo.AppearanceCell.Options.UseFont = true; this.gv_workNo.Caption = "投料单号"; this.gv_workNo.FieldName = "workNo"; this.gv_workNo.MinWidth = 100; this.gv_workNo.MinWidth = 25; this.gv_workNo.Name = "gv_workNo"; this.gv_workNo.OptionsColumn.AllowEdit = false; this.gv_workNo.Tag = "query_a.work_no"; @@ -564,7 +564,7 @@ this.gv_receiver.AppearanceCell.Options.UseFont = true; this.gv_receiver.Caption = "领料人"; this.gv_receiver.FieldName = "receiver"; this.gv_receiver.MinWidth = 50; this.gv_receiver.MinWidth = 25; this.gv_receiver.Name = "gv_receiver"; this.gv_receiver.OptionsColumn.AllowEdit = false; this.gv_receiver.Tag = "query_a.receiver"; @@ -588,7 +588,7 @@ this.gv_outPart.AppearanceCell.Options.UseFont = true; this.gv_outPart.Caption = "领料部门 "; this.gv_outPart.FieldName = "outPart"; this.gv_outPart.MinWidth = 50; this.gv_outPart.MinWidth = 25; this.gv_outPart.Name = "gv_outPart"; this.gv_outPart.OptionsColumn.AllowEdit = false; this.gv_outPart.Tag = "query_a.out_part"; @@ -602,7 +602,7 @@ this.gv_outDate.AppearanceCell.Options.UseFont = true; this.gv_outDate.Caption = "出库日期 "; this.gv_outDate.FieldName = "outDate"; this.gv_outDate.MinWidth = 120; this.gv_outDate.MinWidth = 25; this.gv_outDate.Name = "gv_outDate"; this.gv_outDate.OptionsColumn.AllowEdit = false; this.gv_outDate.Tag = "query_a.out_date"; @@ -635,7 +635,7 @@ this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "审核日期 "; this.gv_checkDate.FieldName = "checkDate"; this.gv_checkDate.MinWidth = 120; this.gv_checkDate.MinWidth = 25; this.gv_checkDate.Name = "gv_checkDate"; this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; @@ -668,7 +668,7 @@ this.gv_checkUser.AppearanceCell.Options.UseFont = true; this.gv_checkUser.Caption = "审核人 "; this.gv_checkUser.FieldName = "checkUser"; this.gv_checkUser.MinWidth = 50; this.gv_checkUser.MinWidth = 25; this.gv_checkUser.Name = "gv_checkUser"; this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; @@ -682,7 +682,7 @@ this.gv_reason.AppearanceCell.Options.UseFont = true; this.gv_reason.Caption = "出库原因 "; this.gv_reason.FieldName = "reason"; this.gv_reason.MinWidth = 50; this.gv_reason.MinWidth = 25; this.gv_reason.Name = "gv_reason"; this.gv_reason.OptionsColumn.AllowEdit = false; this.gv_reason.Tag = "query_a.reason"; @@ -715,7 +715,7 @@ this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "备注信息 "; this.gv_remark.FieldName = "remark"; this.gv_remark.MinWidth = 50; this.gv_remark.MinWidth = 25; this.gv_remark.Name = "gv_remark"; this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; @@ -748,7 +748,7 @@ this.gv_createDate.AppearanceCell.Options.UseFont = true; this.gv_createDate.Caption = "创建时间"; this.gv_createDate.FieldName = "createDate"; this.gv_createDate.MinWidth = 50; this.gv_createDate.MinWidth = 25; this.gv_createDate.Name = "gv_createDate"; this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; @@ -781,7 +781,7 @@ this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "创建人"; this.gv_createBy.FieldName = "createBy"; this.gv_createBy.MinWidth = 50; this.gv_createBy.MinWidth = 25; this.gv_createBy.Name = "gv_createBy"; this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; @@ -857,7 +857,7 @@ this.gv_itemOutNo.AppearanceCell.Options.UseFont = true; this.gv_itemOutNo.Caption = "出库单号"; this.gv_itemOutNo.FieldName = "itemOutNo"; this.gv_itemOutNo.MinWidth = 100; this.gv_itemOutNo.MinWidth = 25; this.gv_itemOutNo.Name = "gv_itemOutNo"; this.gv_itemOutNo.OptionsColumn.AllowEdit = false; this.gv_itemOutNo.Tag = "query_a.item_out_no"; @@ -924,7 +924,7 @@ // this.gridColumn1.Caption = "产品名称"; this.gridColumn1.FieldName = "itemName"; this.gridColumn1.MinWidth = 120; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 5; DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -341,12 +341,15 @@ JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0) if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); } int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -179,6 +179,8 @@ this.labelControl12 = new DevExpress.XtraEditors.LabelControl(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -895,7 +897,7 @@ this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa014.Properties.Appearance.Options.UseFont = true; this.txt_daa014.Size = new System.Drawing.Size(167, 28); this.txt_daa014.Size = new System.Drawing.Size(173, 28); this.txt_daa014.TabIndex = 327; this.txt_daa014.Tag = "readonly"; // @@ -999,7 +1001,7 @@ // this.lb_daa015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_daa015.Appearance.Options.UseFont = true; this.lb_daa015.Location = new System.Drawing.Point(263, 115); this.lb_daa015.Location = new System.Drawing.Point(269, 115); this.lb_daa015.Name = "lb_daa015"; this.lb_daa015.Size = new System.Drawing.Size(68, 21); this.lb_daa015.TabIndex = 267; @@ -1007,7 +1009,7 @@ // // txt_daa015 // this.txt_daa015.Location = new System.Drawing.Point(337, 111); this.txt_daa015.Location = new System.Drawing.Point(343, 111); this.txt_daa015.Name = "txt_daa015"; this.txt_daa015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa015.Properties.Appearance.Options.UseFont = true; @@ -1033,7 +1035,7 @@ // this.lb_daa013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_daa013.Appearance.Options.UseFont = true; this.lb_daa013.Location = new System.Drawing.Point(263, 179); this.lb_daa013.Location = new System.Drawing.Point(269, 179); this.lb_daa013.Name = "lb_daa013"; this.lb_daa013.Size = new System.Drawing.Size(68, 21); this.lb_daa013.TabIndex = 258; @@ -1041,7 +1043,7 @@ // // txt_dptName // this.txt_dptName.Location = new System.Drawing.Point(337, 175); this.txt_dptName.Location = new System.Drawing.Point(343, 175); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_dptName.Properties.Appearance.Options.UseFont = true; @@ -1123,7 +1125,7 @@ // this.lb_daa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_daa009.Appearance.Options.UseFont = true; this.lb_daa009.Location = new System.Drawing.Point(263, 211); this.lb_daa009.Location = new System.Drawing.Point(269, 211); this.lb_daa009.Name = "lb_daa009"; this.lb_daa009.Size = new System.Drawing.Size(68, 21); this.lb_daa009.TabIndex = 240; @@ -1131,7 +1133,7 @@ // // txt_daa009 // this.txt_daa009.Location = new System.Drawing.Point(337, 207); this.txt_daa009.Location = new System.Drawing.Point(343, 207); this.txt_daa009.Name = "txt_daa009"; this.txt_daa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa009.Properties.Appearance.Options.UseFont = true; @@ -1239,7 +1241,7 @@ this.txt_daa004.Name = "txt_daa004"; this.txt_daa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa004.Properties.Appearance.Options.UseFont = true; this.txt_daa004.Size = new System.Drawing.Size(167, 28); this.txt_daa004.Size = new System.Drawing.Size(173, 28); this.txt_daa004.TabIndex = 222; this.txt_daa004.Tag = "readonly"; // @@ -1273,7 +1275,7 @@ this.txt_daa003.Name = "txt_daa003"; this.txt_daa003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa003.Properties.Appearance.Options.UseFont = true; this.txt_daa003.Size = new System.Drawing.Size(167, 28); this.txt_daa003.Size = new System.Drawing.Size(173, 28); this.txt_daa003.TabIndex = 219; this.txt_daa003.Tag = "readonly"; // @@ -1307,7 +1309,7 @@ this.txt_daa029.Name = "txt_daa029"; this.txt_daa029.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa029.Properties.Appearance.Options.UseFont = true; this.txt_daa029.Size = new System.Drawing.Size(167, 28); this.txt_daa029.Size = new System.Drawing.Size(173, 28); this.txt_daa029.TabIndex = 217; this.txt_daa029.Tag = "readonly"; // @@ -1327,7 +1329,7 @@ this.txt_daa001.Name = "txt_daa001"; this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa001.Properties.Appearance.Options.UseFont = true; this.txt_daa001.Size = new System.Drawing.Size(167, 28); this.txt_daa001.Size = new System.Drawing.Size(173, 28); this.txt_daa001.TabIndex = 216; this.txt_daa001.Tag = "readonly"; // @@ -1411,7 +1413,9 @@ this.gv_daa016, this.gv_daa017, this.gv_mesStartProd, this.gv_mesEndProd}); this.gv_mesEndProd, this.gridColumn21, this.gridColumn22}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1688,7 +1692,7 @@ // this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl9.Appearance.Options.UseFont = true; this.labelControl9.Location = new System.Drawing.Point(263, 147); this.labelControl9.Location = new System.Drawing.Point(269, 147); this.labelControl9.Name = "labelControl9"; this.labelControl9.Size = new System.Drawing.Size(68, 21); this.labelControl9.TabIndex = 473; @@ -1696,7 +1700,7 @@ // // txt_daa013 // this.txt_daa013.Location = new System.Drawing.Point(337, 143); this.txt_daa013.Location = new System.Drawing.Point(343, 143); this.txt_daa013.Name = "txt_daa013"; this.txt_daa013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa013.Properties.Appearance.Options.UseFont = true; @@ -1744,7 +1748,7 @@ // // textEdit1 // this.textEdit1.Location = new System.Drawing.Point(338, 16); this.textEdit1.Location = new System.Drawing.Point(344, 16); this.textEdit1.Name = "textEdit1"; this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.textEdit1.Properties.Appearance.Options.UseFont = true; @@ -1756,7 +1760,7 @@ // this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl7.Appearance.Options.UseFont = true; this.labelControl7.Location = new System.Drawing.Point(265, 20); this.labelControl7.Location = new System.Drawing.Point(271, 20); this.labelControl7.Name = "labelControl7"; this.labelControl7.Size = new System.Drawing.Size(68, 21); this.labelControl7.TabIndex = 466; @@ -1778,7 +1782,7 @@ this.txt_saleOrderNo.Name = "txt_saleOrderNo"; this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true; this.txt_saleOrderNo.Size = new System.Drawing.Size(167, 28); this.txt_saleOrderNo.Size = new System.Drawing.Size(173, 28); this.txt_saleOrderNo.TabIndex = 465; this.txt_saleOrderNo.Tag = "readonly"; // @@ -1793,7 +1797,7 @@ // // txt_daa022 // this.txt_daa022.Location = new System.Drawing.Point(338, 48); this.txt_daa022.Location = new System.Drawing.Point(344, 48); this.txt_daa022.Name = "txt_daa022"; this.txt_daa022.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa022.Properties.Appearance.Options.UseFont = true; @@ -1805,7 +1809,7 @@ // this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_tbl013.Appearance.Options.UseFont = true; this.lb_tbl013.Location = new System.Drawing.Point(263, 52); this.lb_tbl013.Location = new System.Drawing.Point(269, 52); this.lb_tbl013.Name = "lb_tbl013"; this.lb_tbl013.Size = new System.Drawing.Size(68, 21); this.lb_tbl013.TabIndex = 461; @@ -1813,7 +1817,7 @@ // // txt_daa028 // this.txt_daa028.Location = new System.Drawing.Point(338, 80); this.txt_daa028.Location = new System.Drawing.Point(344, 80); this.txt_daa028.Name = "txt_daa028"; this.txt_daa028.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_daa028.Properties.Appearance.Options.UseFont = true; @@ -1825,7 +1829,7 @@ // this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl5.Appearance.Options.UseFont = true; this.labelControl5.Location = new System.Drawing.Point(263, 84); this.labelControl5.Location = new System.Drawing.Point(269, 84); this.labelControl5.Name = "labelControl5"; this.labelControl5.Size = new System.Drawing.Size(68, 21); this.labelControl5.TabIndex = 340; @@ -1886,7 +1890,7 @@ this.txt_sjXt.IsReadly = false; this.txt_sjXt.Location = new System.Drawing.Point(90, 207); this.txt_sjXt.Name = "txt_sjXt"; this.txt_sjXt.Size = new System.Drawing.Size(167, 28); this.txt_sjXt.Size = new System.Drawing.Size(173, 28); this.txt_sjXt.TabIndex = 334; // // labelControl1 @@ -1963,6 +1967,26 @@ this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // gridColumn21 // this.gridColumn21.Caption = "排产人"; this.gridColumn21.FieldName = "pcUser"; this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 32; this.gridColumn21.Width = 94; // // gridColumn22 // this.gridColumn22.Caption = "排产时间"; this.gridColumn22.FieldName = "pcDate"; this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; this.gridColumn22.VisibleIndex = 33; this.gridColumn22.Width = 94; // // Frm_Womdaa // @@ -2179,5 +2203,7 @@ private DevExpress.XtraEditors.TextEdit txt_daa013; private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -175,6 +175,7 @@ /// <param name="e"></param> private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { toolBarMenu1.currentAction = "edit"; string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1); if (string.IsNullOrEmpty(rowGuid)) @@ -183,9 +184,17 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(rowGuid); } else { List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(panel1.Controls, true); gvList.Add(gvMx2); UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList); } } /// <summary> @@ -228,7 +237,7 @@ private void getPageList(int curPage) { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { @@ -265,11 +274,13 @@ private void getModel(string strGuid) { bool isEdit = false; if (toolBarMenu1.currentAction == "add") if (toolBarMenu1.currentAction == "add") return; if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); MsgHelper.Warning("请先选择你要操作的行!"); return; }; } if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行!"); DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -116,9 +116,13 @@ /// <param name="e"></param> private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) { Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList); gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; var frm = new ShowFilter(gridView1.Columns, _filterList); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } /// <summary> /// 查询回调 @@ -127,32 +131,8 @@ /// <param name="e"></param> private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) { gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; var frm = new ShowFilter(gridView1.Columns, _filterList); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } /// <summary> /// 审核事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { _toolCk(1, "EditModelSubmit"); } /// <summary> /// 反审核 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { _toolCk(0, "EditModelSubmitFSH"); _filterList = e.FilterList; getPageList(1); } /// <summary> @@ -208,7 +188,6 @@ MsgHelper.Warning("提示:" + ex.Message); } } /// <summary> /// 刷新事件 /// </summary> @@ -231,6 +210,28 @@ getPageList(this.pageBar1.CurrentPage); } } /// <summary> /// 审核事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { _toolCk(1, "EditModelSubmit"); } /// <summary> /// 反审核 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { _toolCk(0, "EditModelSubmitFSH"); } /// <summary> /// 修改事件 /// </summary> @@ -271,7 +272,6 @@ gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } /// <summary> /// 保存事件 @@ -378,7 +378,8 @@ ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { lbGuid.Text = _rtn.rtnData; lbGuid.Text = _rtn.rtnData.outGuid; txt_hNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); @@ -438,15 +439,11 @@ private void getModel(string strGuid) { bool isEdit = false; if (toolBarMenu1.currentAction == "add") { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); return; }; if (toolBarMenu1.currentAction == "add") return; if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行!"); MsgHelper.Warning("请先选择你要操作的行!"); return; } var _obj = new @@ -608,8 +605,7 @@ }; try { var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth, var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth, JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -6,11 +6,7 @@ using Newtonsoft.Json.Linq; 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; DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -483,6 +483,10 @@ lst.Add(btnPiZhun.Name); lst.Add(btnHelp.Name); lst.Add(btnBoHui.Name); lst.Add(btnTzbl.Name); lst.Add(btnKg.Name); lst.Add(btnWg.Name); lst.Add(btnZhongTai.Name); _enabledBtn(lst); this.currentAction = "esc"; if (btnEscClick != null) btnEscClick(this, e); @@ -520,6 +524,7 @@ lst.Add(btnZhongTai.Name); lst.Add(btnHelp.Name); lst.Add(btnLoad.Name); lst.Add(btnTzbl.Name); _enabledBtn(lst); } }