From c0aa9538d0c080a0ede4fe80b61bb3901db82621 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 二月 2025 09:45:35 +0800
Subject: [PATCH] 细节修改
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 183 ++++++++++++++++++++++++---------------------
1 files changed, 98 insertions(+), 85 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 0cb3b02..02ba6f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -37,18 +37,16 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
getTree();
- txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
- txxtItem1.EditValueChanged += TxxtItem1_EditValueChanged;
- txxtItem2.EditValueChanged += TxxtItem1_EditValueChanged;
- txxtItem3.EditValueChanged += TxxtItem1_EditValueChanged;
- txxtItem4.EditValueChanged += TxxtItem1_EditValueChanged;
- txt_noLength.ValueChanged += Txt_noLength_ValueChanged;
- txt_isIncludeDoc.CheckedChanged +=
- Txt_flagIncludeDocCode_CheckedChanged;
- txt_isSpilit.CheckedChanged +=
- Txt_flagIncludeDocCode_CheckedChanged;
+ txt_docCode.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem1.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem2.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem3.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem4.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem5.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
+ txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
+ txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
}
-
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -121,9 +119,10 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 0)
- getPageList(this.pageBar1.CurrentPage);
+ { }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -144,8 +143,15 @@
getModel(lbGuid.Text.Trim());
else
{
-
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
@@ -165,8 +171,15 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
- txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled =txxtItem4.Enabled = panelControl1.Enabled = true;
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true;
}
/// <summary>
@@ -180,9 +193,10 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(panel1.Controls, true);
txxtItem1.SelectedIndex = txxtItem2.SelectedIndex =
- txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0;
+ txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = txxtItem5.SelectedIndex = 0;
txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled =
- txxtItem4.Enabled = panelControl1.Enabled = true;
+ txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true;
+ txt_docCode.EditValue = null;
}
/// <summary>
@@ -218,7 +232,7 @@
var _obj = new
{
- guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //涓诲缓
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
docCode = txt_docCode.EditValue.ToString(),
docFormat = txt_docFormat.Text,
noLength = txt_noLength.Value.ToString(),
@@ -264,11 +278,10 @@
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ gridView1.BestFitColumns();
}
else
{
@@ -317,6 +330,8 @@
txxtItem3.Text = "<" + _ary[2];
if (_ary.Length > 3)
txxtItem4.Text = "<" + _ary[3];
+ if (_ary.Length >4)
+ txxtItem5.Text = "<" + _ary[4];
txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = false;
}
else
@@ -334,76 +349,72 @@
{
var dataTable = new DataTable();
dataTable.Columns.Add("docCode", typeof(string));
- dataTable.Rows.Add("CGDH(鍒拌揣鍗�)");//V
- dataTable.Rows.Add("CGJY(妫�楠屽崟)");//V
- dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠鍗�)");//V
- dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");//V
- dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");//V
- dataTable.Rows.Add("TL(閫�鏂欏崟)");
- dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
- dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
- dataTable.Rows.Add("OUT(鍑哄簱鍗�)");
- dataTable.Rows.Add("HB(鐗╂枡鍚堝苟)");
- dataTable.Rows.Add("QTSQ(鍏朵粬鍏ュ簱鐢宠)");
+ dataTable.Rows.Add("BG(鎶ュ伐缂栧彿)");
+ dataTable.Rows.Add("CGDH(鍒拌揣)");
+ dataTable.Rows.Add("CGJY(閲囪喘妫�楠�)");
+ dataTable.Rows.Add("CGRK(閲囪喘鍏ュ簱)");
+ dataTable.Rows.Add("CGTHSQ(閲囪喘閫�璐х敵璇�)");
+ dataTable.Rows.Add("CGTH(閲囪喘閫�璐�)");
+ dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠)");
+ dataTable.Rows.Add("DB(璋冩嫧鍗�)");
+ dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");
+ dataTable.Rows.Add("QTCKSQ(鍏朵粬鍑哄簱鐢宠)");
+ dataTable.Rows.Add("QTCK(鍏朵粬鍑哄簱)");
+ dataTable.Rows.Add("QTRKSQ(鍏朵粬鍏ュ簱鐢宠)");
+ dataTable.Rows.Add("QTRK(鍏朵粬鍏ュ簱)");
+ dataTable.Rows.Add("SCLL(鐢熶骇棰嗘枡)");
+ dataTable.Rows.Add("SCRK(鐢熶骇鍏ュ簱)");
+ dataTable.Rows.Add("SCTLSQ(鐢熶骇閫�鏂欑敵璇�)");
+ dataTable.Rows.Add("SCTL(鐢熶骇閫�鏂�)");
+ dataTable.Rows.Add("SCCLSQ(鐢熶骇瓒呴鐢宠)");
+ dataTable.Rows.Add("SCCL(鐢熶骇瓒呴)");
+ dataTable.Rows.Add("SCBLSQ(鐢熶骇琛ユ枡鐢宠)");
+ dataTable.Rows.Add("SCBL(鐢熶骇琛ユ枡)");
+ dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");
+ dataTable.Rows.Add("WWTLSQ(濮斿閫�鏂欑敵璇�)");
+ dataTable.Rows.Add("WWTL(濮斿閫�鏂�)");
+ dataTable.Rows.Add("WWCLSQ(濮斿瓒呴鐢宠)");
+ dataTable.Rows.Add("WWCL(濮斿瓒呴)");
+ dataTable.Rows.Add("WWBLSQ(濮斿琛ユ枡鐢宠)");
+ dataTable.Rows.Add("WWBL(濮斿琛ユ枡)");
+ dataTable.Rows.Add("XSCK(閿�鍞嚭搴�)");
+ dataTable.Rows.Add("XSTH(閿�鍞��璐�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
- txt_docCode.Properties.TextEditStyle =TextEditStyles.DisableTextEditor;
+ txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
}
- private void Txt_flagIncludeDocCode_CheckedChanged(object sender,
- EventArgs e)
- {
- DoPreviewCode();
- }
-
- private void Txt_noLength_ValueChanged(object sender, EventArgs e)
- {
- DoPreviewCode();
- }
-
- private void TxxtItem1_EditValueChanged(object sender, EventArgs e)
- {
- DoPreviewCode();
- }
-
+
private void DoPreviewCode()
{
if (txt_docCode.Enabled == false
|| txxtItem1.Enabled == false
|| txxtItem2.Enabled == false
|| txxtItem3.Enabled == false
- || txxtItem4.Enabled == false)
+ || txxtItem4.Enabled == false
+ || txxtItem5.Enabled == false)
return;
- var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text +
- txxtItem4.Text;
+ var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text + txxtItem5.Text; ;
txt_docFormat.Text = text;
- if (txt_docFormat.Text == "")
- {
- lblPreview.Text = "璇峰畾涔夎鍒�.";
- }
- else
- {
- // txtRuleFormat="<骞村勾>", "<骞村勾骞村勾>", "<鏈堟湀>", "<鏃ユ棩>" });
- var preview = txt_docFormat.Text;
- var length = int.Parse(txt_noLength.Value.ToString());
- var docCode = "";
- if (txt_isIncludeDoc.Checked)
- docCode = txt_docCode.EditValue.ToString();
- preview = docCode + preview;
- preview = preview.Replace("<鏃�>", "");
- preview = preview.Replace("<骞村勾骞村勾>", "2024");
- preview = preview.Replace("<骞村勾>", "24");
- preview = preview.Replace("<鏈堟湀>", "06");
- preview = preview.Replace("<鏃ユ棩>", "18");
- preview = preview + (txt_isSpilit.Checked ? "-" : "") +
- "8".PadLeft(length, '0');
- lblPreview.Text = "鐢熸垚缂栧彿锛�" + preview;
- }
- }
-
- private void Txt_docCode_EditValueChanged(object sender, EventArgs e)
- {
- DoPreviewCode();
+ //if (txt_docFormat.Text == "")
+ //{
+ // lblPreview.Text = "璇峰畾涔夎鍒�.";
+ //}
+ //else
+ //{
+ // var preview = txt_docFormat.Text;
+ // var length = int.Parse(txt_noLength.Value.ToString());
+ // var docCode = "";
+ // if (txt_isIncludeDoc.Checked)
+ // docCode = (txt_docCode.EditValue==null?"": txt_docCode.EditValue.ToString());
+ // preview = docCode + preview;
+ // preview = preview.Replace("鏃�", "");
+ // preview = preview.Replace("骞村勾骞村勾", "2025");
+ // preview = preview.Replace("骞村勾", "25");
+ // preview = preview.Replace("鏈堟湀", "06");
+ // preview = preview.Replace("鏃ユ棩", "18");
+ // preview = preview + (txt_isSpilit.Checked ? "-" : "") + "8".PadLeft(length, '0');
+ //}
}
/// <summary>
@@ -441,23 +452,25 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("","General/GeneralCheck",
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
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);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3