From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 9f90aff..b31ad45 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -23,6 +23,7 @@
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -46,6 +47,7 @@
             txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
             txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
             txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
+           
         }
 
         /// <summary>
@@ -55,9 +57,9 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(1);
+            getPageList(curPage);
         }
-
+      
         /// <summary>
         ///     鍙嶅鏍�
         /// </summary>
@@ -171,7 +173,7 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-           if (xtraTabControl1.SelectedTabPageIndex == 1)
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
             {
                 getModel(lbGuid.Text.Trim());
             }
@@ -251,6 +253,7 @@
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
                     UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
+                    toolBarMenu1.currentAction = "";
                 }
             }
             catch (Exception ex)
@@ -275,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
                 {
@@ -330,7 +333,7 @@
                         txxtItem3.Text = "<" + _ary[2];
                     if (_ary.Length > 3)
                         txxtItem4.Text = "<" + _ary[3];
-                    if (_ary.Length >4)
+                    if (_ary.Length > 4)
                         txxtItem5.Text = "<" + _ary[4];
                     txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = false;
                 }
@@ -376,11 +379,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(棣栨妫�楠�)");
@@ -390,12 +394,24 @@
             dataTable.Rows.Add("FQC(鍏ュ簱妫�楠�)");
             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(杩芥函鐮�)");
             txt_docCode.Properties.DataSource = dataTable;
             txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
             txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
             txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
         }
-    
+
         private void DoPreviewCode()
         {
             if (txt_docCode.Enabled == false
@@ -483,5 +499,6 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3