From dd7c9629d16d81bde03e42b3e9e984088f3e4d2c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 21 一月 2025 17:28:47 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs |   57 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 693ef48..eeb81f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -23,8 +22,9 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status2", "", (value) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
             });
@@ -38,11 +38,9 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
-
-
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -80,7 +78,19 @@
             _filterList = e.FilterList;
             getPageList(1);
         }
-
+        /// <summary>
+        /// 鏃ュ織
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
         /// <summary>
         ///     瀹℃牳浜嬩欢
         /// </summary>
@@ -88,7 +98,7 @@
         /// <param name="e"></param>
         private   void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
-            _toolCk("EditModelSubmit");
+            _toolCk(1);
         }
 
         /// <summary>
@@ -99,7 +109,7 @@
         /// <exception cref="NotImplementedException"></exception>
         private   void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            _toolCk("DeApprove");
+            _toolCk(-1);
           
         }
 
@@ -114,14 +124,15 @@
                 getModel(lbGuid.Text.Trim());
             else
             {
-                _filterList.Clear();
-                if (gridView1.ActiveFilter.Count > 0)
-                {
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    gridView1.ActiveFilter.Clear();
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                }
-                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);
             }
         }
         /// <summary>
@@ -148,6 +159,7 @@
                     {
                         gcMain.DataSource = dt;
                         gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -205,6 +217,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                     }
                     else
                     {
@@ -222,6 +235,7 @@
                         gcMx2.BindingContext = new BindingContext();
                         gcMx2.DataSource = dt2;
                         gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
                     }
                     else
                     {
@@ -238,12 +252,11 @@
             
         }
 
-
         /// <summary>
         /// 
         /// </summary>
         /// <param name="inFieldValue"></param>
-        private void _toolCk(string _meth)
+        private void _toolCk(int _inFieldValue)
         {
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
@@ -260,14 +273,13 @@
             var _obj = new
             {
                 guid = rowGuid,
+                inFieldValue= _inFieldValue
             };
             try
             {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + _meth,
-                    JsonConvert.SerializeObject(_obj));
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
@@ -281,6 +293,5 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3