From 05654db0a8e441869dd6083313ea151243dcc658 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 三月 2025 13:05:29 +0800
Subject: [PATCH] 人员配置
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10
DevApp/Gs.DevApp/Resources/selectvaluespivottable_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs | 104 ++++
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs | 98 ++++
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs | 219 ++++++++++
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.resx | 120 ++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 25 +
DevApp/Gs.DevApp/Properties/Resources.resx | 185 ++++----
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 186 --------
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs | 215 ++++++++++
10 files changed, 881 insertions(+), 281 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index 16fe505..436d906 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -86,59 +86,7 @@
getPageList(1);
}
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_userName, gridView1, "userName");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var lst = new List<string>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("", "User/DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- { }
- else
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
- getPageList(this.pageBar1.CurrentPage);
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -161,101 +109,7 @@
}
}
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_userName, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
- }
-
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- lbGuid.Text = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
- txt_password.Visible = lbPwd.Visible = true;
- txt_account.Enabled = txt_password.Enabled = true;
- }
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_account.Text.Trim()))
- {
- MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- txt_account.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_password.Text.Trim()))
- {
- MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
- txt_password.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_userName.Text.Trim()))
- {
- MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�");
- txt_userName.Focus();
- return;
- }
-
- var _obj = new
- {
- Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- account = txt_account.Text.Trim(),
- password = txt_password.Text.Trim(),
- userName = txt_userName.Text.Trim(),
- address = txt_address.Text.Trim(),
- tel = txt_tel.Text.Trim(),
- email = txt_email.Text.Trim(),
- isStatus = txt_isStatus.Checked,
- remark = txt_remark.Text.Trim(),
- isSys = 0,
- staffId = txt_staffId.GetId()
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", "User/EditModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -339,23 +193,7 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- /// <summary>
- /// 瑙掕壊
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit1_ButtonClick(object sender,
- ButtonPressedEventArgs e)
- {
- if (e.Button.Index == 0)
- {
- var rowhandle = gridView1.FocusedRowHandle;
- var dr = gridView1.GetDataRow(rowhandle);
- var userGuid = dr["guid"].ToString();
- var frm = new UserSelectRole(userGuid);
- frm.ShowDialog();
- }
- }
+
/// <summary>
/// pda椤甸潰
/// </summary>
@@ -364,14 +202,14 @@
private void repositoryItemButtonEdit2_ButtonClick(object sender,
ButtonPressedEventArgs e)
{
- if (e.Button.Index == 0)
- {
- var rowhandle = gridView1.FocusedRowHandle;
- var dr = gridView1.GetDataRow(rowhandle);
- var userGuid = dr["guid"].ToString();
- var frm = new UserSetPwd(userGuid);
- frm.ShowDialog();
- }
+ //if (e.Button.Index == 0)
+ //{
+ // var rowhandle = gridView1.FocusedRowHandle;
+ // var dr = gridView1.GetDataRow(rowhandle);
+ // var userGuid = dr["guid"].ToString();
+ // var frm = new SelectCk(userGuid);
+ // frm.ShowDialog();
+ //}
}
/// <summary>
/// 浠撳簱
@@ -385,7 +223,7 @@
var rowhandle = gridView1.FocusedRowHandle;
var dr = gridView1.GetDataRow(rowhandle);
var userGuid = dr["guid"].ToString();
- var frm = new RoleSelectAction(userGuid);
+ var frm = new SelectCk(userGuid);
frm.ShowDialog();
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
index 35e0a9f..67afb21 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
@@ -28,11 +28,224 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.panelControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1020, 691);
+ this.panelControl2.TabIndex = 4;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(2, 2);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1016, 644);
+ this.gcMain.TabIndex = 6;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 60;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_depotCode,
+ this.gv_depotName,
+ this.gv_depottype,
+ this.gv_createBy,
+ this.gv_isNg,
+ this.gridColumn2,
+ this.gridColumn1});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.MultiSelect = true;
+ this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_depotCode
+ //
+ this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotCode.Caption = "浠撳簱缂栫爜";
+ this.gv_depotCode.FieldName = "depotCode";
+ this.gv_depotCode.MinWidth = 50;
+ this.gv_depotCode.Name = "gv_depotCode";
+ this.gv_depotCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotCode.Tag = "query_a.depot_code";
+ this.gv_depotCode.Visible = true;
+ this.gv_depotCode.VisibleIndex = 1;
+ this.gv_depotCode.Width = 100;
+ //
+ // gv_depotName
+ //
+ this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotName.AppearanceCell.Options.UseFont = true;
+ this.gv_depotName.Caption = "浠撳簱鍚嶇О";
+ this.gv_depotName.FieldName = "depotName";
+ this.gv_depotName.MinWidth = 50;
+ this.gv_depotName.Name = "gv_depotName";
+ this.gv_depotName.OptionsColumn.AllowEdit = false;
+ this.gv_depotName.Tag = "query_a.depot_name";
+ this.gv_depotName.Visible = true;
+ this.gv_depotName.VisibleIndex = 2;
+ this.gv_depotName.Width = 150;
+ //
+ // gv_depottype
+ //
+ this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depottype.AppearanceCell.Options.UseFont = true;
+ this.gv_depottype.Caption = "浠撳簱绫诲瀷";
+ this.gv_depottype.FieldName = "depottype";
+ this.gv_depottype.MinWidth = 50;
+ this.gv_depottype.Name = "gv_depottype";
+ this.gv_depottype.OptionsColumn.AllowEdit = false;
+ this.gv_depottype.Tag = "query_a.depottype";
+ this.gv_depottype.Visible = true;
+ this.gv_depottype.VisibleIndex = 3;
+ this.gv_depottype.Width = 80;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 4;
+ this.gv_createBy.Width = 71;
+ //
+ // gv_isNg
+ //
+ this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_isNg.AppearanceCell.Options.UseFont = true;
+ this.gv_isNg.Caption = "涓嶈壇鍝佷粨";
+ this.gv_isNg.FieldName = "isNg";
+ this.gv_isNg.MaxWidth = 50;
+ this.gv_isNg.MinWidth = 50;
+ this.gv_isNg.Name = "gv_isNg";
+ this.gv_isNg.OptionsColumn.AllowEdit = false;
+ this.gv_isNg.Tag = "query_a.is_ng";
+ this.gv_isNg.Visible = true;
+ this.gv_isNg.VisibleIndex = 5;
+ this.gv_isNg.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "绂佺敤鐘舵��";
+ this.gridColumn2.FieldName = "isNg";
+ this.gridColumn2.MaxWidth = 50;
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "query_a.zuid";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.Width = 50;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "org.FNumber";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.Width = 250;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(2, 646);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1016, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.AppearancePressed.BackColor = System.Drawing.Color.White;
+ this.btnIn.AppearancePressed.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16;
+ this.btnIn.Location = new System.Drawing.Point(920, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾淇濆瓨";
+ //
+ // SelectCk
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "SelectCk";
- }
+ this.ClientSize = new System.Drawing.Size(1020, 691);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCk";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨浠撳簱";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ }
#endregion
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
index 51ad6eb..0a68db8 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
@@ -1,21 +1,111 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing Gs.DevApp.Entity;
+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.PDA
{
public partial class SelectCk : DevExpress.XtraEditors.XtraForm
{
- public SelectCk()
+ private readonly List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ private readonly string _webServiceName = "MesDepotsManager/";
+ private string userGuid = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_suppId">渚涘簲鍟�</param>
+ /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
+ /// <param name="_isWw">鏄惁濮斿</param>
+ public SelectCk(string _userGuid)
{
InitializeComponent();
+ this.userGuid = _userGuid;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ {
+
+ });
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ System.Text.StringBuilder sbList = new System.Text.StringBuilder();
+ int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
+ DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
+ foreach (int idx in rows)
+ {
+ string _guid = dt.Rows[idx]["guid"].ToString();
+ if (sbList.Length > 0)
+ sbList.Append(",");
+ sbList.Append(_guid);
+ }
+ var _obj = new
+ {
+ userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
+ bindGuidslist = sbList.ToString(),
+ fType="浠撳簱",
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ "MesSysPageviewManager/SetUserBind",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ this.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
}
+
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage,999999, "org.FNumber asc ,a.depot_code", "asc",
+ "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.resx b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.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/DevFrm/PDA/SelectPage.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs
index 23a8585..09d79a6 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs
@@ -28,19 +28,224 @@
/// </summary>
private void InitializeComponent()
{
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
this.SuspendLayout();
//
- // SelectPage
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.panelControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1020, 691);
+ this.panelControl2.TabIndex = 4;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(2, 2);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1016, 644);
+ this.gcMain.TabIndex = 6;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 60;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_depotCode,
+ this.gv_depotName,
+ this.gv_depottype,
+ this.gv_createBy,
+ this.gv_isNg,
+ this.gridColumn2,
+ this.gridColumn1});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.MultiSelect = true;
+ this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_depotCode
+ //
+ this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotCode.Caption = "浠撳簱缂栫爜";
+ this.gv_depotCode.FieldName = "depotCode";
+ this.gv_depotCode.MinWidth = 50;
+ this.gv_depotCode.Name = "gv_depotCode";
+ this.gv_depotCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotCode.Tag = "query_a.depot_code";
+ this.gv_depotCode.Visible = true;
+ this.gv_depotCode.VisibleIndex = 1;
+ this.gv_depotCode.Width = 100;
+ //
+ // gv_depotName
+ //
+ this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotName.AppearanceCell.Options.UseFont = true;
+ this.gv_depotName.Caption = "浠撳簱鍚嶇О";
+ this.gv_depotName.FieldName = "depotName";
+ this.gv_depotName.MinWidth = 50;
+ this.gv_depotName.Name = "gv_depotName";
+ this.gv_depotName.OptionsColumn.AllowEdit = false;
+ this.gv_depotName.Tag = "query_a.depot_name";
+ this.gv_depotName.Visible = true;
+ this.gv_depotName.VisibleIndex = 2;
+ this.gv_depotName.Width = 150;
+ //
+ // gv_depottype
+ //
+ this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depottype.AppearanceCell.Options.UseFont = true;
+ this.gv_depottype.Caption = "浠撳簱绫诲瀷";
+ this.gv_depottype.FieldName = "depottype";
+ this.gv_depottype.MinWidth = 50;
+ this.gv_depottype.Name = "gv_depottype";
+ this.gv_depottype.OptionsColumn.AllowEdit = false;
+ this.gv_depottype.Tag = "query_a.depottype";
+ this.gv_depottype.Visible = true;
+ this.gv_depottype.VisibleIndex = 3;
+ this.gv_depottype.Width = 80;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 4;
+ this.gv_createBy.Width = 71;
+ //
+ // gv_isNg
+ //
+ this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_isNg.AppearanceCell.Options.UseFont = true;
+ this.gv_isNg.Caption = "涓嶈壇鍝佷粨";
+ this.gv_isNg.FieldName = "isNg";
+ this.gv_isNg.MaxWidth = 50;
+ this.gv_isNg.MinWidth = 50;
+ this.gv_isNg.Name = "gv_isNg";
+ this.gv_isNg.OptionsColumn.AllowEdit = false;
+ this.gv_isNg.Tag = "query_a.is_ng";
+ this.gv_isNg.Visible = true;
+ this.gv_isNg.VisibleIndex = 5;
+ this.gv_isNg.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "绂佺敤鐘舵��";
+ this.gridColumn2.FieldName = "isNg";
+ this.gridColumn2.MaxWidth = 50;
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "query_a.zuid";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.Width = 50;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "org.FNumber";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.Width = 250;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(2, 646);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1016, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.AppearancePressed.BackColor = System.Drawing.Color.White;
+ this.btnIn.AppearancePressed.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16;
+ this.btnIn.Location = new System.Drawing.Point(920, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾淇濆瓨";
+ //
+ // SelectCk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(426, 438);
- this.Name = "SelectPage";
- this.Text = "SelectPage";
+ this.ClientSize = new System.Drawing.Size(1020, 691);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCk";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨浠撳簱";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
-
#endregion
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
index b5abbf6..6d70aed 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
@@ -1,4 +1,7 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -8,14 +11,107 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using static DevExpress.Data.Mask.Internal.RegExMaskMath.DraftFiniteAutomaton<T>;
namespace Gs.DevApp.DevFrm.PDA
{
public partial class SelectPage : DevExpress.XtraEditors.XtraForm
{
- public SelectPage()
+ private readonly List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ private readonly string _webServiceName = "MesDepotsManager/";
+ private string userGuid = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_suppId">渚涘簲鍟�</param>
+ /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
+ /// <param name="_isWw">鏄惁濮斿</param>
+ public SelectPage(string _userGuid)
{
InitializeComponent();
+ this.userGuid = _userGuid;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ {
+
+ });
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ System.Text.StringBuilder sbList = new System.Text.StringBuilder();
+ int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
+ DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
+ foreach (int idx in rows)
+ {
+ string _guid = dt.Rows[idx]["guid"].ToString();
+ if (sbList.Length > 0)
+ sbList.Append(",");
+ sbList.Append(_guid);
+ }
+ var _obj = new
+ {
+ userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
+ bindGuidslist = sbList.ToString(),
+ fType = "浠撳簱",
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ "MesSysPageviewManager/SetUserBind",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ this.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
}
+
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc",
+ "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 187657e..7db3994 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -321,6 +321,24 @@
<Compile Include="DevFrm\PDA\Frm_UserBind.Designer.cs">
<DependentUpon>Frm_UserBind.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\PDA\SelectCk.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectCk.Designer.cs">
+ <DependentUpon>SelectCk.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectPage.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectPage.Designer.cs">
+ <DependentUpon>SelectPage.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectPrint.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectPrint.Designer.cs">
+ <DependentUpon>SelectPrint.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
<SubType>Form</SubType>
</Compile>
@@ -1141,6 +1159,12 @@
<EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx">
<DependentUpon>Frm_UserBind.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectCk.resx">
+ <DependentUpon>SelectCk.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
+ <DependentUpon>SelectPage.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</EmbeddedResource>
@@ -1700,6 +1724,7 @@
<None Include="Resources\bo_dashboard.svg" />
<None Include="Resources\column2_32x32.png" />
<None Include="Resources\projectfile_16x16.png" />
+ <None Include="Resources\selectvaluespivottable_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 ea5f2b7..559cd71 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1733,6 +1733,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap selectvaluespivottable_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("selectvaluespivottable_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap sendxls_16x16 {
get {
object obj = ResourceManager.GetObject("sendxls_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 9bb619d..a5571a8 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,8 +124,10 @@
<data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x321.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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\logo_png_black.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>
@@ -141,8 +143,8 @@
<data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
+ <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -152,10 +154,13 @@
<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,
+ <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox_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>
</data>
<data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -232,9 +237,6 @@
<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>
</data>
@@ -268,6 +270,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -276,13 +283,13 @@
<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="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+ <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>
+ </data>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
@@ -309,11 +316,13 @@
<value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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 name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_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,
@@ -323,11 +332,16 @@
<data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up2_16x16.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>
+ <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="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -335,17 +349,16 @@
<data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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 name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_32x32.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>
<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>
@@ -498,6 +511,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -530,8 +548,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>
@@ -576,11 +594,6 @@
<data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -588,9 +601,6 @@
<value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -631,6 +641,9 @@
<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="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -649,14 +662,16 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wordwrap_32x32.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,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodetails_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodetails_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -666,10 +681,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</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="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="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -723,6 +736,9 @@
<data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -760,19 +776,18 @@
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="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="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+ <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="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+ <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="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -791,10 +806,8 @@
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,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -821,10 +834,8 @@
<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>
</data>
- <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -836,10 +847,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -847,18 +856,16 @@
<data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -885,16 +892,16 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\viewmergeddata_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,
+ <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\upload_16x16.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="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -915,15 +922,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
+ <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -934,18 +939,16 @@
<data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+ <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
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="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.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="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -955,7 +958,7 @@
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>
+ <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>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/selectvaluespivottable_16x16.png b/DevApp/Gs.DevApp/Resources/selectvaluespivottable_16x16.png
new file mode 100644
index 0000000..e17ffee
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/selectvaluespivottable_16x16.png
Binary files differ
--
Gitblit v1.9.3