From 342b5740dded9d8bdb4a6bc5917d79b724b59aec Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期五, 12 十二月 2025 17:05:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 7fb26ec..f621762 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -27,7 +27,7 @@
public Frm_MesInvItemArn()
{
InitializeComponent();
- this.chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
+ this.txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -174,9 +174,9 @@
private void ChkAllUrgent_CheckedChanged(object sender, EventArgs e)
{
if (gvMx1.DataRowCount == 0) return;
- if (chkAllUrgent.Properties.ReadOnly) return;
+ if (txt_chkAllUrgent.Properties.ReadOnly) return;
- bool isUrgent = chkAllUrgent.Checked;
+ bool isUrgent = txt_chkAllUrgent.Checked;
string targetTxt = isUrgent ? "1:鎬ユ枡" : "0:鏅��";
gvMx1.BeginDataUpdate();
@@ -373,11 +373,11 @@
setSrm();
txt_receiveOrgId.IsReadly = true;
txt_suppId.IsReadly = true;
- if (chkAllUrgent != null)
+ if (txt_chkAllUrgent != null)
{
// 1. 纭繚鎺т欢鍚敤
- chkAllUrgent.Enabled = true;
- chkAllUrgent.Properties.ReadOnly = false;
+ txt_chkAllUrgent.Enabled = true;
+ txt_chkAllUrgent.Properties.ReadOnly = false;
}
}
@@ -584,9 +584,9 @@
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- if (chkAllUrgent != null)
+ if (txt_chkAllUrgent != null)
{
- chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
+ txt_chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
bool allUrgent = true;
foreach (DataRow dr in dt.Rows)
{
@@ -599,12 +599,12 @@
}
}
// 3. 璁剧疆寮�鍏崇姸鎬�
- chkAllUrgent.Checked = allUrgent;
- // 4. 鏍规嵁褰撳墠妯″紡锛堢紪杈�/鏌ョ湅锛夊喅瀹氭槸鍚﹀彲鐢�
- // 濡傛灉鏄� add 鎴� edit 妯″紡锛屼笖鏈夋潈闄愶紝鍒欏厑璁哥偣鍑�
- chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
- chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
- chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
+ txt_chkAllUrgent.Checked = allUrgent;
+ //4.鏍规嵁褰撳墠妯″紡锛堢紪杈� / 鏌ョ湅锛夊喅瀹氭槸鍚﹀彲鐢�
+ //濡傛灉鏄� add 鎴� edit 妯″紡锛屼笖鏈夋潈闄愶紝鍒欏厑璁哥偣鍑�
+ txt_chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
+ txt_chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
+ txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
}
}
else
--
Gitblit v1.9.3