From adc3fd8af6ff791cd3f924890419cd0cba385f51 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:48:34 +0800
Subject: [PATCH] 调整审核的文字提示
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index e5d074d..5b5cde9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraGrid.Columns;
+using DevExpress.XtraLayout.Utils;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -33,15 +34,23 @@
public Frm_Work01(string _fGx, string _fBc, string _strinOther)
{
InitializeComponent();
+ gvMx1.IndicatorWidth = 60;
+ gvMx1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
txt_gx.Text = _fGx;
txt_bc.Text = _fBc;
txt_dianJianPath.Text = _strinOther;
dianJianPath = _strinOther;
this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
+ label8.Text = _fGx + "鏁伴噺";
addColumn();
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { addModel(goodTag); };
+ if (e.KeyCode == Keys.Enter) { addModel(goodTag); }
+ ;
};
btnGood.Click += (s, e) =>
{
@@ -49,6 +58,13 @@
};
btnBad.Click += (s, e) =>
{
+ string _barCode = txt_barCode.Text.Trim();
+ if (string.IsNullOrEmpty(_barCode))
+ {
+ Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+ vm.Show();
+ return;
+ }
UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
frm.UpdateParent += (ss, ee) =>
{
@@ -169,7 +185,6 @@
// _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
return _obj;
}
-
if (txt_gx.Text.Trim() == fGxZhongJian)
{
return _obj;
@@ -192,12 +207,6 @@
return;
}
dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
- //if (_obj == null)
- //{
- // Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
- // vm.Show();
- // return;
- //}
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -257,7 +266,8 @@
{
Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
vm.Show();
- };
+ }
+ ;
}
else
{
@@ -277,6 +287,17 @@
/// </summary>
public void addColumn()
{
+ //鍙湁鐢垫鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxDianJian)
+ layDianJian.Visibility = LayoutVisibility.Always;
+ else
+ layDianJian.Visibility = LayoutVisibility.Never;
+ //鍙湁姘存鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxShouJian)
+ layShuiJian.Visibility = LayoutVisibility.Always;
+ else
+ layShuiJian.Visibility = LayoutVisibility.Never;
+
List<dynamic> _lst = new List<dynamic>();
if (txt_gx.Text.Trim() == fGxDianJian)
{
@@ -329,7 +350,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t011",
@@ -396,7 +416,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t010",
--
Gitblit v1.9.3