From aef15a6e8acc366ff60e428a347d7f7fe8f9cadc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 07 六月 2025 11:32:03 +0800
Subject: [PATCH] 报表

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 9b96ef2..ec270ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -23,14 +23,16 @@
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+            }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 txt_barCode.Text = "";
-                getModel(value, "", "","","");
+                getModel(value, "", "", "", "");
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
@@ -39,17 +41,22 @@
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             txt_barCode.KeyDown += (s, e) =>
             {
-                if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "","","",""); };
+                if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
             };
             btnGood.Click += (s, e) =>
             {
-                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
+                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
             };
-            btnBad.Click += (s, e) => {
-                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt,badTag);
+            btnBad.Click += (s, e) =>
+            {
+                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
             };
         }
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -99,7 +106,7 @@
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
             if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), "", "","","");
+                getModel(lbGuid.Text.Trim(), "", "", "", "");
             else
             {
                 //_filterList.Clear();
@@ -122,7 +129,7 @@
         private void getPageList(int curPage)
         {
             txt_barCode.Text = "";
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -158,7 +165,7 @@
             }
         }
         /// <summary>
-        /// 
+        /// 璇诲彇瀹炰綋
         /// </summary>
         /// <param name="strGuid"></param>
         /// <param name="_badXx"></param>
@@ -191,6 +198,8 @@
                     lbSum3.Text = dy.lbSum3;
                     prog1.Position = dy.jd;
                     txt_barCode.ReadOnly = false;
+                    txt_badReson.IsReadly = false;
+                    txt_repairMethd.IsReadly = false;
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -243,6 +252,5 @@
                 ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
- 
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3