From 2066a7e10e20433f7445431d6d34a9026c29f663 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 23 十二月 2024 08:43:43 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs |  137 ++++++++++++++++++++++++++++-----------------
 1 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 320eea2..2d3a139 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using DevExpress.XtraEditors;
@@ -30,44 +28,30 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            gridView1.FocusedRowChanged += (s, e) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
-                UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
-            };
-            gridView1.CustomDrawRowIndicator +=
-                GridView1_CustomDrawRowIndicator;
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+
         }
 
-        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
-            await Task.Delay(100);
+            Task.Delay(100);
             getPageList(1);
         }
 
-        private void GridView1_CustomDrawRowIndicator(object sender,
-            RowIndicatorCustomDrawEventArgs e)
-        {
-            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                e.Info.DisplayText = (e.RowHandle + 1).ToString();
-        }
-
-        /// <summary>
-        ///     鍙屽嚮浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            var rowGuid =
-                UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
-            if (!string.IsNullOrEmpty(rowGuid))
-                getModel(rowGuid, false, 999);
-        }
 
         /// <summary>
         ///     鍒嗛〉浜嬩欢
@@ -113,7 +97,7 @@
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
             if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), false, 999);
+                getModel(lbGuid.Text.Trim());
             else
             {
                 _filterList.Clear();
@@ -131,17 +115,15 @@
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private async void getPageList(int curPage)
+        private void getPageList(int curPage)
         {
-
-            UcLoading _loading = new UcLoading();
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
             "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
-                var strReturn = await UtilityHelper.HttpPostAsync("",
+                var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 if (dd.rtnCode > 0)
@@ -170,18 +152,18 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-            _loading.Stop();
-        }
 
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
+        }
+        private void getModel(string strGuid)
         {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
             var _obj = new
             {
                 guid = strGuid //涓诲缓
@@ -237,11 +219,7 @@
         /// <exception cref="NotImplementedException"></exception>
         private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_departmentname, gridView1, "departmentcode");
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(0);
         }
         /// <summary>
         ///     鍙栨秷浜嬩欢
@@ -259,11 +237,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_departmentname, gridView1, "departmentcode");
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(1);
         }
         /// <summary>
         ///     淇敼浜嬩欢
@@ -280,8 +254,10 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
-            getModel(rowGuid, true, 1);
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+            gvList.Add(gvMx1);
+            UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
         }
 
         /// <summary>
@@ -371,7 +347,7 @@
                         _webServiceName + "DeleteModelMx",
                         JsonConvert.SerializeObject(lst));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
@@ -380,5 +356,60 @@
                 }
             }
         }
+
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_departmentname, gridView1, "departmentname");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "SYS_DEPARTMENT,check_date,check_status,check_by"
+            };
+            try
+            {
+                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);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3