lu
2025-02-07 4ac983a733e4493756f4e20801bacae5e7f96552
各种细节
已修改2个文件
33 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                    }
                }
            }
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;