From 1cd9e23e206544289877e3d9140a31b8fcbad2ff Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 14:26:15 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx | 140 ++++++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 57 +++--
DevApp/Gs.DevApp/Resources/dayview_32x32.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11 +
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/Resources/dayview_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs | 121 +++++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs | 64 +++++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 27 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 14 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 48 ++++
DevApp/Gs.DevApp/Properties/Resources.resx | 116 +++++-----
13 files changed, 534 insertions(+), 88 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3d80851..f77fd81 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 18ecff6..54fe640 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -69,6 +69,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -103,7 +104,6 @@
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -115,6 +115,7 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -252,6 +253,7 @@
this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gridColumn4,
this.gridColumn2,
this.gv_itemNo,
@@ -294,7 +296,7 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "org.FNumber";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 0;
+ this.gridColumn4.VisibleIndex = 1;
this.gridColumn4.Width = 250;
//
// gridColumn2
@@ -304,7 +306,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 94;
//
// gv_itemNo
@@ -317,7 +319,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.VisibleIndex = 3;
this.gv_itemNo.Width = 120;
//
// gv_itemName
@@ -332,7 +334,7 @@
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.item_name";
this.gv_itemName.Visible = true;
- this.gv_itemName.VisibleIndex = 3;
+ this.gv_itemName.VisibleIndex = 4;
this.gv_itemName.Width = 250;
//
// gv_itemModel
@@ -345,7 +347,7 @@
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.item_model";
this.gv_itemModel.Visible = true;
- this.gv_itemModel.VisibleIndex = 4;
+ this.gv_itemModel.VisibleIndex = 5;
this.gv_itemModel.Width = 360;
//
// gv_lowLimt
@@ -359,7 +361,7 @@
this.gv_lowLimt.OptionsColumn.AllowEdit = false;
this.gv_lowLimt.Tag = "query_a.lowlimit";
this.gv_lowLimt.Visible = true;
- this.gv_lowLimt.VisibleIndex = 5;
+ this.gv_lowLimt.VisibleIndex = 6;
this.gv_lowLimt.Width = 50;
//
// gv_highLimt
@@ -373,7 +375,7 @@
this.gv_highLimt.OptionsColumn.AllowEdit = false;
this.gv_highLimt.Tag = "query_a.highLimt";
this.gv_highLimt.Visible = true;
- this.gv_highLimt.VisibleIndex = 6;
+ this.gv_highLimt.VisibleIndex = 7;
this.gv_highLimt.Width = 50;
//
// gv_prdPack
@@ -387,7 +389,7 @@
this.gv_prdPack.OptionsColumn.AllowEdit = false;
this.gv_prdPack.Tag = "query_a.prd_pack";
this.gv_prdPack.Visible = true;
- this.gv_prdPack.VisibleIndex = 7;
+ this.gv_prdPack.VisibleIndex = 8;
this.gv_prdPack.Width = 50;
//
// gv_bomNo
@@ -412,7 +414,7 @@
this.gv_materialGroup.OptionsColumn.AllowEdit = false;
this.gv_materialGroup.Tag = "query_a.materialGroup";
this.gv_materialGroup.Visible = true;
- this.gv_materialGroup.VisibleIndex = 8;
+ this.gv_materialGroup.VisibleIndex = 9;
this.gv_materialGroup.Width = 130;
//
// gv_itemUnitNo
@@ -426,7 +428,7 @@
this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
this.gv_itemUnitNo.Tag = "query_c.fname";
this.gv_itemUnitNo.Visible = true;
- this.gv_itemUnitNo.VisibleIndex = 9;
+ this.gv_itemUnitNo.VisibleIndex = 10;
this.gv_itemUnitNo.Width = 50;
//
// gv_purchaseUnitNo
@@ -440,7 +442,7 @@
this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnitNo.Tag = "query_d.fname";
this.gv_purchaseUnitNo.Visible = true;
- this.gv_purchaseUnitNo.VisibleIndex = 10;
+ this.gv_purchaseUnitNo.VisibleIndex = 11;
this.gv_purchaseUnitNo.Width = 50;
//
// gv_saleUnitNo
@@ -454,7 +456,7 @@
this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
this.gv_saleUnitNo.Tag = "query_e.fname";
this.gv_saleUnitNo.Visible = true;
- this.gv_saleUnitNo.VisibleIndex = 11;
+ this.gv_saleUnitNo.VisibleIndex = 12;
this.gv_saleUnitNo.Width = 50;
//
// gv_storeUnitNo
@@ -468,7 +470,7 @@
this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
this.gv_storeUnitNo.Tag = "query_f.fname";
this.gv_storeUnitNo.Visible = true;
- this.gv_storeUnitNo.VisibleIndex = 12;
+ this.gv_storeUnitNo.VisibleIndex = 13;
this.gv_storeUnitNo.Width = 50;
//
// gv_subconUnitNo
@@ -482,7 +484,7 @@
this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
this.gv_subconUnitNo.Tag = "query_g.fname";
this.gv_subconUnitNo.Visible = true;
- this.gv_subconUnitNo.VisibleIndex = 13;
+ this.gv_subconUnitNo.VisibleIndex = 14;
this.gv_subconUnitNo.Width = 50;
//
// gv_produceUnitNo
@@ -496,7 +498,7 @@
this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
this.gv_produceUnitNo.Tag = "query_h.fname";
this.gv_produceUnitNo.Visible = true;
- this.gv_produceUnitNo.VisibleIndex = 14;
+ this.gv_produceUnitNo.VisibleIndex = 15;
this.gv_produceUnitNo.Width = 50;
//
// gv_depotNo
@@ -521,7 +523,7 @@
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.fforbidstatus";
this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 15;
+ this.gv_isStatus.VisibleIndex = 16;
this.gv_isStatus.Width = 50;
//
// gridColumn1
@@ -535,7 +537,7 @@
this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 20;
+ this.gridColumn1.VisibleIndex = 21;
this.gridColumn1.Width = 180;
//
// gridColumn3
@@ -553,7 +555,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 16;
+ this.gridColumn6.VisibleIndex = 17;
this.gridColumn6.Width = 94;
//
// gridColumn7
@@ -563,7 +565,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 17;
+ this.gridColumn7.VisibleIndex = 18;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -573,7 +575,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 18;
+ this.gridColumn8.VisibleIndex = 19;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -583,8 +585,18 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 19;
+ this.gridColumn9.VisibleIndex = 20;
this.gridColumn9.Width = 94;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
//
// pageBar1
//
@@ -1276,5 +1288,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index f26d3c6..e15e4d2 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.BasicData;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +21,7 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnAllClick += ToolBarMenu1_btnAllClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -34,6 +36,16 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ //鍔犲叆checkbox begin
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain1, 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;
+ //鍔犲叆checkbox end
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -42,6 +54,40 @@
Task.Delay(100);
getPageList(1);
}
+
+ /// <summary>
+ /// 鎵归噺璁剧疆
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAllClick(object sender, EventArgs e)
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ DataTable dt = this.gcMain1.DataSource as DataTable;
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["guid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ if (sb.Length > 0)
+ sb.Append(",");
+ sb.Append(_guid);
+ }
+ }
+ }
+ if (string.IsNullOrEmpty(sb.ToString()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ return;
+ }
+ Frm_MesItemsShow frm = new Frm_MesItemsShow(sb.ToString());
+ frm.ShowDialog();
+ }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -107,7 +153,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
new file mode 100644
index 0000000..9158828
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
@@ -0,0 +1,121 @@
+锘縩amespace Gs.DevApp.DevFrm.BasicData
+{
+ partial class Frm_MesItemsShow
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemsShow));
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_day = new System.Windows.Forms.NumericUpDown();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_day)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_day);
+ this.panel1.Controls.Add(this.btnCancel);
+ this.panel1.Controls.Add(this.btnSave);
+ this.panel1.Controls.Add(this.labelControl1);
+ this.panel1.Location = new System.Drawing.Point(29, 51);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(360, 215);
+ this.panel1.TabIndex = 3;
+ //
+ // btnCancel
+ //
+ this.btnCancel.Appearance.Options.UseFont = true;
+ this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
+ this.btnCancel.Location = new System.Drawing.Point(205, 143);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(87, 37);
+ this.btnCancel.TabIndex = 244;
+ this.btnCancel.Text = "鍙栨秷 (&C)";
+ //
+ // btnSave
+ //
+ this.btnSave.Appearance.Options.UseFont = true;
+ this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
+ this.btnSave.Location = new System.Drawing.Point(39, 143);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(87, 37);
+ this.btnSave.TabIndex = 243;
+ this.btnSave.Text = "纭畾 (&L)";
+ //
+ // labelControl1
+ //
+ this.labelControl1.Location = new System.Drawing.Point(39, 62);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(105, 18);
+ this.labelControl1.TabIndex = 242;
+ this.labelControl1.Text = "鎻愬墠鍒拌揣澶╂暟锛�";
+ //
+ // txt_day
+ //
+ this.txt_day.Location = new System.Drawing.Point(172, 60);
+ this.txt_day.Name = "txt_day";
+ this.txt_day.Size = new System.Drawing.Size(120, 26);
+ this.txt_day.TabIndex = 245;
+ //
+ // Frm_MesItemsShow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(420, 343);
+ this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "Frm_MesItemsShow";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Frm_MesItemsShow";
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_day)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.NumericUpDown txt_day;
+ private DevExpress.XtraEditors.SimpleButton btnCancel;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
new file mode 100644
index 0000000..8bab744
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
@@ -0,0 +1,64 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+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.BasicData
+{
+ public partial class Frm_MesItemsShow : DevExpress.XtraEditors.XtraForm
+ {
+ string guidList = "";
+ public Frm_MesItemsShow(string _guidList)
+ {
+ InitializeComponent();
+ this.guidList = _guidList;
+ this.Text = "璁剧疆鎻愬墠閫佽揣鏃ユ湡锛�" + guidList;
+ this.btnCancel.Click += BtnCancel_Click;
+ this.btnSave.Click += BtnSave_Click;
+ }
+
+ private void BtnSave_Click(object sender, EventArgs e)
+ {
+ var _obj = new
+ {
+ guidList = this.guidList,
+ bz10 = txt_day.Value,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/SetDays",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ else
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ DialogResult = DialogResult.None;
+ }
+ }
+ catch (Exception ex)
+ {
+ DialogResult = DialogResult.Cancel;
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void BtnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
new file mode 100644
index 0000000..c0dfd5d
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
@@ -0,0 +1,140 @@
+锘�<?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>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
+ bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
+ tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW
+ aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA
+ 9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
+ bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
+ PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL
+ cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM
+ bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c
+ 0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg==
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 58cc302..11f2d6f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -203,6 +203,12 @@
<Compile Include="DevFrm\BasicData\Frm_MesItems.Designer.cs">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.Designer.cs">
+ <DependentUpon>Frm_MesItemsShow.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItemType.cs">
<SubType>Form</SubType>
</Compile>
@@ -1383,6 +1389,9 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemsShow.resx">
+ <DependentUpon>Frm_MesItemsShow.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
</EmbeddedResource>
@@ -2211,6 +2220,8 @@
<None Include="Resources\bodetails_32x321.png" />
<None Include="Resources\bodetails_16x163.png" />
<None Include="Resources\refreshpivottable_16x16.png" />
+ <None Include="Resources\dayview_32x32.png" />
+ <None Include="Resources\dayview_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 002f001..ef54b51 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -891,6 +891,26 @@
}
/// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap dayview_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("dayview_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap dayview_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("dayview_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
/// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
internal static DevExpress.Utils.Svg.SvgImage defaultprinter {
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 51159a8..fef548d 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,6 +124,9 @@
<data name="print_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\print_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@@ -157,6 +160,11 @@
</data>
<data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -200,11 +208,19 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="fontsizeincrease_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fontsizeincrease_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sendxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="dayview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\dayview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -238,16 +254,11 @@
<data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
- </data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -307,14 +318,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -330,8 +338,8 @@
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -363,8 +371,8 @@
<data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -401,6 +409,9 @@
<data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -411,6 +422,9 @@
</data>
<data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -542,11 +556,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -608,6 +617,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -621,8 +633,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -661,8 +673,8 @@
<data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -749,9 +761,6 @@
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -799,8 +808,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -898,15 +909,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -931,8 +938,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
@@ -959,9 +968,6 @@
</data>
<data name="boreport2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boreport2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1058,8 +1064,10 @@
<data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
@@ -1078,11 +1086,11 @@
<data name="print_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\print_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="refreshpivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refreshpivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1145,10 +1153,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1161,7 +1167,7 @@
<data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="refreshpivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refreshpivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="dayview_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\dayview_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/dayview_16x16.png b/DevApp/Gs.DevApp/Resources/dayview_16x16.png
new file mode 100644
index 0000000..7a0e5d8
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/dayview_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/dayview_32x32.png b/DevApp/Gs.DevApp/Resources/dayview_32x32.png
new file mode 100644
index 0000000..dce0d70
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/dayview_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index d873c15..2325b6f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -70,6 +70,7 @@
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -126,9 +127,10 @@
this.barLargeButtonItem2,
this.barLargeButtonItem3,
this.barLargeButtonItem4,
- this.btnFPiZhun});
+ this.btnFPiZhun,
+ this.btnAll});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 67;
+ this.barManager1.MaxItemId = 68;
//
// bar2
//
@@ -177,7 +179,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnAll)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
this.bar2.OptionsBar.DrawBorder = false;
this.bar2.OptionsBar.DrawDragBorder = false;
@@ -549,6 +552,15 @@
this.barLargeButtonItem4.Tag = "Never";
this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnAll
+ //
+ this.btnAll.Caption = "鎵归噺璁剧疆";
+ this.btnAll.Id = 67;
+ this.btnAll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.dayview_16x16;
+ this.btnAll.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.dayview_32x32;
+ this.btnAll.Name = "btnAll";
+ this.btnAll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -561,7 +573,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 146);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 144);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -571,7 +583,7 @@
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 4);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 2);
//
// barDockControlRight
//
@@ -579,7 +591,7 @@
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 4);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 2);
//
// UcToolBarMenu
//
@@ -590,7 +602,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 146);
+ this.Size = new System.Drawing.Size(1543, 144);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -641,5 +653,6 @@
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
private DevExpress.XtraBars.BarLargeButtonItem btnFPiZhun;
+ private DevExpress.XtraBars.BarLargeButtonItem btnAll;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 1ca35cd..ece6770 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -56,6 +56,7 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+ btnAll.ItemClick += BtnAll_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -64,7 +65,8 @@
actions = lst;
}
-
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -358,6 +360,12 @@
private void BtnQuery_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnQueryClick != null) btnQueryClick(this, e);
+ }
+
+ private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnAllClick != null)
+ btnAllClick(this, e);
}
/// <summary>
@@ -966,6 +974,10 @@
/// </summary>
public event EventHandler btnOutClick;
+ /// <summary>
+ /// 鎵归噺璁剧疆
+ /// </summary>
+ public event EventHandler btnAllClick;
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3