From 4ac983a733e4493756f4e20801bacae5e7f96552 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 二月 2025 16:25:55 +0800
Subject: [PATCH] 各种细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 17 ++++++-----------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 16 ++++++++++------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 2829c7c..0f67dc0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -580,13 +580,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 +594,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);
}
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index f01da9c..d3589d4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -67,13 +67,18 @@
if (Parent != null) getNamespace();
}
- private bool _isCk(int _type) {
+ private bool _isCk(int _type)
+ {
Form parentForm = this.FindForm();
if (parentForm != null)
{
+ PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+ if (specificControl== null)
+ return false;
+ if (specificControl.Tag == null)
+ return false;
if (_type == 1)
{
- PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
if (specificControl != null)
{
if (specificControl.Tag.ToString() == "宸插鏍�")
@@ -85,7 +90,6 @@
}
if (_type == 0)
{
- PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
if (specificControl != null)
{
if (specificControl.Tag.ToString() == "鏈鏍�")
@@ -541,7 +545,7 @@
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
-
+
}
private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
@@ -550,7 +554,7 @@
if (bl) return;
if (btnDelClick != null) btnDelClick(this, e);
- // btnEsc.Enabled = false;
+ // btnEsc.Enabled = false;
this.currentAction = "";
}
@@ -570,7 +574,7 @@
Form parentForm = this.FindForm();
if (parentForm != null)
{
- PictureBox specificControl =(PictureBox) parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+ PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
if (specificControl != null)
{
specificControl.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
--
Gitblit v1.9.3