From fbc8b8a3017797ca625669a1b57e5e8fee8c17c0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 18 四月 2025 17:01:17 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 6 +++
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs | 75 +++++++++++++++++++++++++++++--------
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs | 28 +++++++++----
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 1
4 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index e8647bb..253ba12 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -1131,6 +1131,7 @@
this.gridColumn5.FieldName = "tld014";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "edit";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 94;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index b1e1994..4066744 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -77,6 +77,8 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
@@ -497,6 +499,8 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -514,6 +518,8 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
index ba54d33..23be08a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
@@ -30,14 +30,17 @@
{
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
@@ -66,14 +69,17 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_chk,
+ this.colChkInt,
this.gv_guid,
this.gridColumn1,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
this.gridColumn6,
+ this.gridColumn9,
this.gridColumn4,
+ this.gridColumn7,
+ this.gridColumn8,
this.gridColumn3,
this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
@@ -83,17 +89,17 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_chk
+ // colChkInt
//
- this.gv_chk.Caption = "閫夋嫨";
- this.gv_chk.FieldName = "gvChk";
- this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_chk.MaxWidth = 40;
- this.gv_chk.MinWidth = 40;
- this.gv_chk.Name = "gv_chk";
- this.gv_chk.Visible = true;
- this.gv_chk.VisibleIndex = 0;
- this.gv_chk.Width = 40;
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.MaxWidth = 40;
+ this.colChkInt.MinWidth = 40;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 40;
//
// gv_guid
//
@@ -111,6 +117,7 @@
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "itemId";
+ this.gridColumn1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
@@ -123,6 +130,7 @@
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "itemNo";
+ this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_supplierItemCode.MinWidth = 100;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
@@ -169,16 +177,46 @@
this.gridColumn6.VisibleIndex = 5;
this.gridColumn6.Width = 60;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "闇�棰嗘暟閲�";
+ this.gridColumn9.FieldName = "sumXlyl";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 94;
+ //
// gridColumn4
//
this.gridColumn4.Caption = "宸查鏁伴噺";
- this.gridColumn4.FieldName = "dab007";
+ this.gridColumn4.FieldName = "ylsl";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 50;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鎬婚��鏁伴噺";
+ this.gridColumn7.FieldName = "ytsl";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 8;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍙��鏁伴噺";
+ this.gridColumn8.FieldName = "ktsl";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.Width = 94;
//
// gridColumn3
//
@@ -187,7 +225,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.VisibleIndex = 10;
this.gridColumn3.Width = 94;
//
// gridColumn2
@@ -197,7 +235,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 11;
this.gridColumn2.Width = 94;
//
// panelControl1
@@ -242,7 +280,7 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
@@ -254,5 +292,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
index 8b89ee7..50a6efc 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -15,25 +16,34 @@
public SelectWwTbl(string _daaGuid)
{
InitializeComponent();
+
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
this.daaGuid = _daaGuid;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
btnIn.Click += (s, e) =>
{
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
var list = new List<string>();
- for (var i = 0; i < gridView1.DataRowCount; i++)
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
- if (checkBox == "Checked")
+ foreach (DataRow dr in dt.Rows)
{
- var _guid = gridView1.GetRowCellValue(i, "dabGuid")
- .ToString();
- list.Add(_guid);
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["dabGuid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(_guid);
+ }
}
}
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
- Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
};
}
--
Gitblit v1.9.3