From 5c66ff724a6ab1bef5fe7877821ec91997151484 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 20 二月 2025 11:05:40 +0800
Subject: [PATCH] 委外

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index aba77c5..90d8b13 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,4 @@
+using DevExpress.RichEdit.Export;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -28,6 +29,7 @@
             this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
             this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gvList.Add(gridView1);
             Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
@@ -46,7 +48,7 @@
             });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            txt_sjXt.getSuppler("");
+          
             this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -62,7 +64,16 @@
             Task.Delay(100);
             getPageList(1);
         }
-
+        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);
+            gvList.Add(gvMx1);
+            gvList.Add(gvMx2);
+            Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
+            DevFrm.ShowDialog();
+        }
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -223,7 +234,10 @@
                 {
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+                    toolBarMenu1.currentAction = "";
                 }
             }
             catch (Exception ex)
@@ -300,12 +314,14 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    string cjId = dy.daa013;
+                    string xjxt = dy.sjXt;
+                    txt_sjXt.getSuppler(cjId, xjxt);
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     gvList.Add(gvMx2);
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
-                    // txt_sjXt.getSuppler(txt_daa013.Text);
+                   UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -411,12 +427,18 @@
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0)
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
                         getModel(lbGuid.Text.Trim());
-                    else
+                    }
+                    else {
+                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                         getPageList(this.pageBar1.CurrentPage);
+                        gridView1.FocusedRowHandle = rowHandle;
+                    }
                 }
             }
             catch (Exception ex)

--
Gitblit v1.9.3