From 3f999d90566425842a4b4285730a2f3686b12e27 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 10 三月 2025 14:09:59 +0800
Subject: [PATCH] 版面
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 2829c7c..6de94da 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -31,13 +31,14 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -132,24 +133,31 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
+ string _fmrmode = txt_fmrmode.Text.Trim();
toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_fngHandle.Text.Trim()))
+ if ((txt_fngHandle.SelectedIndex <= 0))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊鏂瑰紡锛�");
- txt_fngDesc.Focus();
+ txt_fngHandle.Focus();
return;
}
- if (string.IsNullOrEmpty(txt_fmrmode.Text.Trim()))
+ if (txt_fngHandle.SelectedIndex == 1)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
- txt_fmrmode.Focus();
- return;
+ if ((txt_fmrmode.SelectedIndex <= 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+ txt_fmrmode.Focus();
+ return;
+ }
}
+ else
+ _fmrmode = "";
+
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngHandle = txt_fngHandle.Text.Trim(),
- fmrmode = txt_fmrmode.Text.Trim(),
+ fmrmode = _fmrmode,
};
try
{
@@ -160,7 +168,7 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
}
}
catch (Exception ex)
@@ -194,7 +202,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
@@ -289,16 +297,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns();
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -339,7 +347,7 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list5"])
@@ -580,13 +588,6 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- //if (_rtn.rtnCode > 0)
- //{
- // if (xtraTabControl1.SelectedTabPageIndex == 1)
- // getModel(lbGuid.Text.Trim());
- // else
- // getPageList(this.pageBar1.CurrentPage);
- //}
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (_inFieldValue >= 0)
@@ -601,10 +602,12 @@
}
else
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ //if (xtraTabControl1.SelectedTabPageIndex == 1)
+ // getModel(lbGuid.Text.Trim());
+ //else
+ // getPageList(this.pageBar1.CurrentPage);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
}
--
Gitblit v1.9.3