From f7289e89b6293e92271ad0673ba6abf36604ef4c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 17 七月 2025 16:12:06 +0800
Subject: [PATCH] 采购计划表
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 11
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.cs | 10 +
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs | 243 +++++++++++++++++++++++++-----
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs | 35 +++-
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.Designer.cs | 16 +
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.resx | 120 +++++++++++++++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 3
8 files changed, 379 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index 34e2189..924dd6a 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -425,11 +425,14 @@
{
toolBarMenu1.isSetBtn = false;
string rkckid = txt_rkCkId.GetId();
- if (string.IsNullOrEmpty(rkckid))
+ if (strType != QcSeason.瓒呮湡妫�.ToString())
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
- txt_rkCkId.Focus();
- return;
+ if (string.IsNullOrEmpty(rkckid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
+ txt_rkCkId.Focus();
+ return;
+ }
}
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
index a445b33..7700281 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
@@ -33,18 +33,35 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucLookOrg1 = new Gs.DevApp.UserControl.UcLookOrg();
this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
this.dateEdit2 = new DevExpress.XtraEditors.DateEdit();
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptBtnView = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -59,11 +76,13 @@
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -84,26 +103,35 @@
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitContainerControl1.Size = new System.Drawing.Size(1397, 590);
- this.splitContainerControl1.SplitterPosition = 52;
+ this.splitContainerControl1.SplitterPosition = 43;
this.splitContainerControl1.TabIndex = 0;
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.ucLookOrg1);
this.layoutControl1.Controls.Add(this.dateEdit1);
this.layoutControl1.Controls.Add(this.dateEdit2);
- this.layoutControl1.Controls.Add(this.simpleButton1);
+ this.layoutControl1.Controls.Add(this.btnQuery);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1397, 52);
+ this.layoutControl1.Size = new System.Drawing.Size(1397, 43);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // ucLookOrg1
+ //
+ this.ucLookOrg1.IsReadly = false;
+ this.ucLookOrg1.Location = new System.Drawing.Point(84, 12);
+ this.ucLookOrg1.Name = "ucLookOrg1";
+ this.ucLookOrg1.Size = new System.Drawing.Size(224, 24);
+ this.ucLookOrg1.TabIndex = 7;
//
// dateEdit1
//
this.dateEdit1.EditValue = null;
- this.dateEdit1.Location = new System.Drawing.Point(84, 12);
+ this.dateEdit1.Location = new System.Drawing.Point(384, 12);
this.dateEdit1.Name = "dateEdit1";
this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -116,7 +144,7 @@
// dateEdit2
//
this.dateEdit2.EditValue = null;
- this.dateEdit2.Location = new System.Drawing.Point(284, 12);
+ this.dateEdit2.Location = new System.Drawing.Point(584, 12);
this.dateEdit2.Name = "dateEdit2";
this.dateEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -126,72 +154,86 @@
this.dateEdit2.StyleController = this.layoutControl1;
this.dateEdit2.TabIndex = 5;
//
- // simpleButton1
+ // btnQuery
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
- this.simpleButton1.Location = new System.Drawing.Point(412, 12);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(96, 27);
- this.simpleButton1.StyleController = this.layoutControl1;
- this.simpleButton1.TabIndex = 6;
- this.simpleButton1.Text = "纭畾鏌ヨ";
+ this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+ this.btnQuery.Location = new System.Drawing.Point(712, 12);
+ this.btnQuery.Name = "btnQuery";
+ this.btnQuery.Size = new System.Drawing.Size(146, 27);
+ this.btnQuery.StyleController = this.layoutControl1;
+ this.btnQuery.TabIndex = 6;
+ this.btnQuery.Text = "纭畾鏌ヨ";
//
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
+ this.layoutControlItem4,
this.layoutControlItem2,
+ this.layoutControlItem1,
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition1.Width = 200D;
+ columnDefinition1.Width = 300D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Absolute;
columnDefinition2.Width = 200D;
columnDefinition3.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition3.Width = 200D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition4.Width = 150D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition5.Width = 506D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
columnDefinition2,
columnDefinition3,
- columnDefinition4});
+ columnDefinition4,
+ columnDefinition5});
rowDefinition1.Height = 100D;
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
- this.Root.Size = new System.Drawing.Size(1397, 52);
+ this.Root.Size = new System.Drawing.Size(1376, 51);
this.Root.TextVisible = false;
//
- // layoutControlItem1
+ // layoutControlItem4
//
- this.layoutControlItem1.Control = this.dateEdit1;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(200, 32);
- this.layoutControlItem1.Text = "寮�濮嬫椂闂�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.Control = this.ucLookOrg1;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.Size = new System.Drawing.Size(300, 31);
+ this.layoutControlItem4.Text = "閫夋嫨缁勭粐";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.dateEdit2;
- this.layoutControlItem2.Location = new System.Drawing.Point(200, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(500, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(200, 32);
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(200, 31);
this.layoutControlItem2.Text = "缁撴潫鏃堕棿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.dateEdit1;
+ this.layoutControlItem1.Location = new System.Drawing.Point(300, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem1.Size = new System.Drawing.Size(200, 31);
+ this.layoutControlItem1.Text = "寮�濮嬫椂闂�";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.simpleButton1;
- this.layoutControlItem3.Location = new System.Drawing.Point(400, 0);
+ this.layoutControlItem3.Control = this.btnQuery;
+ this.layoutControlItem3.Location = new System.Drawing.Point(700, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(100, 32);
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(150, 31);
this.layoutControlItem3.Text = "纭畾鏌ヨ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -202,15 +244,117 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1397, 526);
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptBtnView});
+ this.gcMain1.Size = new System.Drawing.Size(1397, 535);
this.gcMain1.TabIndex = 0;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
//
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鐗╂枡闀夸唬鐮�";
+ this.gridColumn1.FieldName = "itemNo";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn2.FieldName = "itemName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn3.FieldName = "itemModel";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍗曚綅";
+ this.gridColumn4.FieldName = "dwName";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "璁″垝璁㈠崟閲�";
+ this.gridColumn5.FieldName = "jhddQty";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "寤鸿鍒拌揣鎴栧畬宸ユ棩鏈�";
+ this.gridColumn6.FieldName = "dhDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "渚涘簲鍟�";
+ this.gridColumn7.FieldName = "gysName";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 6;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鏌ョ湅璇︾粏";
+ this.gridColumn8.ColumnEdit = this.rptBtnView;
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 94;
+ //
+ // rptBtnView
+ //
+ this.rptBtnView.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.rptBtnView.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璇︾粏", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptBtnView.Name = "rptBtnView";
+ this.rptBtnView.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptBtnView.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnView_ButtonClick);
//
// WomShjh
//
@@ -233,11 +377,13 @@
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).EndInit();
this.ResumeLayout(false);
}
@@ -249,12 +395,23 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.DateEdit dateEdit1;
private DevExpress.XtraEditors.DateEdit dateEdit2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.SimpleButton btnQuery;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnView;
+ private UserControl.UcLookOrg ucLookOrg1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index 90ade0c..9363aa2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -1,20 +1,12 @@
锘縰sing DevExpress.Utils;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Rpt
@@ -25,6 +17,10 @@
public WomShjh()
{
InitializeComponent();
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(ucLookOrg1);
+ dateEdit1.DateTime = DateTime.Now;
+ dateEdit2.DateTime = DateTime.Now.AddDays(30);
this.gridView1.OptionsView.ShowGroupPanel = false;
tips.Appearance.BackColor = Color.LightBlue; // 璁剧疆鑳屾櫙棰滆壊
tips.Appearance.ForeColor = Color.Black; // 璁剧疆鍓嶆櫙鑹诧紙鏂囧瓧棰滆壊锛�
@@ -65,6 +61,7 @@
gridView1.OptionsFind.ShowClearButton = true; // 鏄剧ず娓呴櫎鎸夐挳
gridView1.OptionsFind.ShowCloseButton = true; // 鏄剧ず鍏抽棴鎸夐挳
gridView1.IndicatorWidth = 60;
+ gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -80,6 +77,10 @@
};
gridView1.ShowFindPanel(); // 鏄剧ず鏌ユ壘闈㈡澘
getPageList();
+ btnQuery.Click += (s, e) =>
+ {
+ getPageList();
+ };
}
/// <summary>
@@ -99,7 +100,7 @@
try
{
var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetQLList", JsonConvert.SerializeObject(_obj));
+ _webServiceName + "GetShjhList", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strReturn);
if (_rtn.rtnCode > 0)
{
@@ -129,5 +130,21 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 鏌ョ湅璇︾粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptBtnView_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ string itemId = "";
+ string orgId = ucLookOrg1.GetId();
+ string beginDate = dateEdit1.DateTime.ToString();
+ string endDate = dateEdit2.DateTime.ToString();
+ Form frm = new WomShjhShow(orgId, beginDate, endDate, itemId);
+ frm.ShowDialog();
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.Designer.cs
index c8959ce..4a1ccb9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.Designer.cs
@@ -28,9 +28,21 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.SuspendLayout();
+ //
+ // WomShjhShow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "WomShjhShow";
+ this.ClientSize = new System.Drawing.Size(516, 260);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "WomShjhShow";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫佽揣璁″垝琛ㄨ缁�";
+ this.ResumeLayout(false);
+
}
#endregion
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.cs
index 1dc0853..338d74d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.cs
@@ -13,9 +13,17 @@
{
public partial class WomShjhShow : DevExpress.XtraEditors.XtraForm
{
- public WomShjhShow()
+ string orgId = "";
+ string beginDate = "";
+ string endDate = "";
+ string itemId = "";
+ public WomShjhShow(string _orgId, string _beginDate, string _endDate, string _itemId)
{
InitializeComponent();
+ this.orgId = _orgId;
+ this.beginDate = _beginDate;
+ this.endDate = _endDate;
+ this.itemId = _itemId;
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjhShow.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 346188f..ba1c306 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1675,6 +1675,9 @@
<EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
<DependentUpon>WomShjh.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
+ <DependentUpon>WomShjhShow.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
<DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 306e26f..8749e37 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1733,7 +1733,6 @@
}
};
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
-
if (isPostSearch == true)
{
gridView1.OptionsView.ShowGroupPanel = false;
@@ -1750,7 +1749,6 @@
//鏄惁鏄剧ず搴曢儴鐨勮繃婊ゆ潯
// gridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never;
}
-
// gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
foreach (GridColumn column in gridView1.Columns)
{
@@ -1776,7 +1774,6 @@
column.OptionsFilter.AllowAutoFilter = false;
}
}
-
gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
--
Gitblit v1.9.3