From 0dcc33644c822962063832bfc5cd4d28118de781 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 17:01:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 9e6d33a..02ce5dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,14 +1,12 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Columns;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -25,18 +23,18 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },this.GetType().FullName);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
getTree();
@@ -51,8 +49,6 @@
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
}
-
-
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -60,16 +56,9 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(1);
+ getPageList(curPage);
}
- private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
- {
- string _formNamespace=this.GetType().FullName;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
- DevFrm.ShowDialog();
- }
+
/// <summary>
/// 鍙嶅鏍�
/// </summary>
@@ -185,7 +174,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
@@ -263,6 +252,8 @@
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -287,13 +278,13 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.BindingContext = new BindingContext();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
- gridView1.BestFitColumns();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
{
@@ -363,6 +354,7 @@
dataTable.Columns.Add("docCode", typeof(string));
dataTable.Rows.Add("CGDH(閲囪喘鍒拌揣)");
dataTable.Rows.Add("CGJY(閲囪喘妫�楠�)");
+ dataTable.Rows.Add("RKJY(鍏ュ簱妫�楠�)");
dataTable.Rows.Add("CGRK(閲囪喘鍏ュ簱)");
dataTable.Rows.Add("CGTHSQ(閲囪喘閫�璐х敵璇�)");
dataTable.Rows.Add("CGTHJ(閲囪喘妫�楠岄��)");
@@ -378,6 +370,8 @@
dataTable.Rows.Add("SCCL(鐢熶骇瓒呴)");
dataTable.Rows.Add("BG(鎶ュ伐)");
dataTable.Rows.Add("SCRK(鐢熶骇鍏ュ簱)");
+ dataTable.Rows.Add("SCTKSQ(鐢熶骇閫�搴撶敵璇�)");
+ dataTable.Rows.Add("SCTK(鐢熶骇閫�搴�)");
dataTable.Rows.Add("QTCKSQ(鍏朵粬鍑哄簱鐢宠)");
dataTable.Rows.Add("QTCK(鍏朵粬鍑哄簱)");
dataTable.Rows.Add("QTRKSQ(鍏朵粬鍏ュ簱鐢宠)");
@@ -388,11 +382,12 @@
dataTable.Rows.Add("XSCK(閿�鍞嚭搴�)");
dataTable.Rows.Add("XSTH(閿�鍞��璐�)");
dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");
+ dataTable.Rows.Add("WWLL(濮斿棰嗘枡)");
dataTable.Rows.Add("WWTLSQ(濮斿閫�鏂欑敵璇�)");
dataTable.Rows.Add("WWTL(濮斿閫�鏂�)");
- dataTable.Rows.Add("WWCLSQ(鐢熶骇瓒呴鐢宠)");
+ dataTable.Rows.Add("WWCLSQ(濮斿瓒呴鐢宠)");
dataTable.Rows.Add("WWCL(濮斿瓒呴)");
- dataTable.Rows.Add("WWBLSQ(鐢熶骇琛ユ枡鐢宠)");
+ dataTable.Rows.Add("WWBLSQ(濮斿琛ユ枡鐢宠)");
dataTable.Rows.Add("WWBL(濮斿琛ユ枡)");
dataTable.Rows.Add("SJJYSQ(棣栨鐢宠)");
dataTable.Rows.Add("SJJY(棣栨妫�楠�)");
@@ -403,6 +398,20 @@
dataTable.Rows.Add("OQCSQ(鍑哄簱妫�楠岀敵璇�)");
dataTable.Rows.Add("OQC(鍑哄簱妫�楠�)");
dataTable.Rows.Add("TM(鏉＄爜)");
+ dataTable.Rows.Add("FHTZSQ(鍙戣揣閫氱煡鐢宠)");
+ dataTable.Rows.Add("FHTZ(鍙戣揣閫氱煡)");
+ dataTable.Rows.Add("XSTHSQ(閿�鍞��璐х敵璇�)");
+ dataTable.Rows.Add("STRKSQ(鍙楁墭鍏ュ簱鐢宠)");
+ dataTable.Rows.Add("STRK(鍙楁墭鍏ュ簱)");
+ dataTable.Rows.Add("STTLSQ(鍙楁墭閫�鏂欑敵璇�)");
+ dataTable.Rows.Add("STTL(鍙楁墭閫�鏂�)");
+ dataTable.Rows.Add("IQCYC(IQC寮傚父)");
+ dataTable.Rows.Add("IPQCYC(IPQC寮傚父)");
+ dataTable.Rows.Add("FQCYC(FQC寮傚父)");
+ dataTable.Rows.Add("ZSM(杩芥函鐮�)");
+ dataTable.Rows.Add("TB(鎵樻澘鐮�)");
+ dataTable.Rows.Add("JYSQ(妫�楠岀敵璇�)");
+ dataTable.Rows.Add("JYFA(妫�楠屾柟妗�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
@@ -496,6 +505,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3