From c0aa9538d0c080a0ede4fe80b61bb3901db82621 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 二月 2025 09:45:35 +0800
Subject: [PATCH] 细节修改
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 89 ----------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 110 ++++++++-----
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 11 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs | 9 +
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 10 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 36 ++-
DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs | 21 ++
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 111 +++++++------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 43 ++--
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 2
17 files changed, 223 insertions(+), 235 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index e1272a4..c716c5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -120,7 +120,7 @@
this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
this.gvMx1lastupdateDate.Visible = true;
- this.gvMx1lastupdateDate.VisibleIndex = 3;
+ this.gvMx1lastupdateDate.VisibleIndex = 4;
this.gvMx1lastupdateDate.Width = 180;
//
// gvMx1lastupdateBy
@@ -134,7 +134,7 @@
this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
this.gvMx1lastupdateBy.Visible = true;
- this.gvMx1lastupdateBy.VisibleIndex = 4;
+ this.gvMx1lastupdateBy.VisibleIndex = 3;
this.gvMx1lastupdateBy.Width = 94;
//
// gvMx1description
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index e4e193a..4985aae 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -86,27 +86,6 @@
}
/// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- _toolCk(0);
- }
-
- /// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- _toolCk(1);
- }
-
- /// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
@@ -169,7 +148,6 @@
}
-
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -197,7 +175,8 @@
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
var row = gvMx1.GetDataRow(i);
- if (row != null) {
+ if (row != null)
+ {
if (string.IsNullOrEmpty(row["depotSectionCode"].ToString()))
{
MsgHelper.ShowError("缂栫爜涓嶈兘涓虹┖锛�");
@@ -240,6 +219,7 @@
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -318,14 +298,11 @@
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
- gvList);
+ UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -386,61 +363,5 @@
}
}
}
-
-
- /// <summary>
- /// 宸ュ叿鏉′簨浠�
- /// </summary>
- /// <param name="inFieldValue"></param>
- private void _toolCk(int _inFieldValue)
- {
- string strMsg = "";
- switch (_inFieldValue)
- {
- case 1:
- strMsg = "瀹℃牳";
- break;
- case 0:
- strMsg = "鍙嶅鏍�";
- break;
- };
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_depotName, gridView1, "depotName");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
- return;
-
- var _obj = new
- {
- guid = rowGuid,
- ckValue = _inFieldValue,
- parameter = "MES_DEPOTS,check_date,check_status,check_by"
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
- }
-
}
}
\ 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 85f7f57..345c9cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -180,9 +180,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
-
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 1a1083b..e6f61f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -9,7 +9,6 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesUnit : XtraForm
@@ -35,7 +34,6 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 79811b6..ba82a0d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -86,11 +86,11 @@
//
this.lb_isZxbg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isZxbg.Appearance.Options.UseFont = true;
- this.lb_isZxbg.Location = new System.Drawing.Point(328, 116);
+ this.lb_isZxbg.Location = new System.Drawing.Point(333, 116);
this.lb_isZxbg.Name = "lb_isZxbg";
- this.lb_isZxbg.Size = new System.Drawing.Size(73, 21);
+ this.lb_isZxbg.Size = new System.Drawing.Size(68, 21);
this.lb_isZxbg.TabIndex = 243;
- this.lb_isZxbg.Text = "鏁寸嚎鎶ュ伐 ";
+ this.lb_isZxbg.Text = "鏁寸嚎鎶ュ伐";
//
// gv_isZxbg
//
@@ -110,11 +110,11 @@
//
this.lb_lineType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lineType.Appearance.Options.UseFont = true;
- this.lb_lineType.Location = new System.Drawing.Point(328, 84);
+ this.lb_lineType.Location = new System.Drawing.Point(333, 84);
this.lb_lineType.Name = "lb_lineType";
- this.lb_lineType.Size = new System.Drawing.Size(73, 21);
+ this.lb_lineType.Size = new System.Drawing.Size(68, 21);
this.lb_lineType.TabIndex = 240;
- this.lb_lineType.Text = "绾夸綋绫诲埆 ";
+ this.lb_lineType.Text = "绾夸綋绫诲埆";
//
// gv_lineType
//
@@ -134,11 +134,11 @@
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(328, 52);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(333, 52);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21);
this.lb_lastupdateDate.TabIndex = 231;
- this.lb_lastupdateDate.Text = "鏇存柊鏃堕棿 ";
+ this.lb_lastupdateDate.Text = "鏇存柊鏃堕棿";
//
// txt_lastupdateDate
//
@@ -168,11 +168,11 @@
//
this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(345, 20);
+ this.lb_lastupdateBy.Location = new System.Drawing.Point(350, 20);
this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
+ this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21);
this.lb_lastupdateBy.TabIndex = 228;
- this.lb_lastupdateBy.Text = "鏇存柊鑰� ";
+ this.lb_lastupdateBy.Text = "鏇存柊鑰�";
//
// txt_lastupdateBy
//
@@ -230,11 +230,11 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(49, 116);
+ this.lb_remark.Location = new System.Drawing.Point(54, 116);
this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(39, 21);
+ this.lb_remark.Size = new System.Drawing.Size(34, 21);
this.lb_remark.TabIndex = 219;
- this.lb_remark.Text = "澶囨敞 ";
+ this.lb_remark.Text = "澶囨敞";
//
// txt_remark
//
@@ -263,11 +263,11 @@
//
this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_name.Appearance.Options.UseFont = true;
- this.lb_name.Location = new System.Drawing.Point(15, 84);
+ this.lb_name.Location = new System.Drawing.Point(20, 84);
this.lb_name.Name = "lb_name";
- this.lb_name.Size = new System.Drawing.Size(73, 21);
+ this.lb_name.Size = new System.Drawing.Size(68, 21);
this.lb_name.TabIndex = 217;
- this.lb_name.Text = "浜х嚎鍚嶇О ";
+ this.lb_name.Text = "浜х嚎鍚嶇О";
//
// txt_name
//
@@ -296,11 +296,11 @@
//
this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lineNo.Appearance.Options.UseFont = true;
- this.lb_lineNo.Location = new System.Drawing.Point(15, 52);
+ this.lb_lineNo.Location = new System.Drawing.Point(20, 52);
this.lb_lineNo.Name = "lb_lineNo";
- this.lb_lineNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_lineNo.Size = new System.Drawing.Size(68, 21);
this.lb_lineNo.TabIndex = 216;
- this.lb_lineNo.Text = "浜х嚎缂栧彿 ";
+ this.lb_lineNo.Text = "浜х嚎缂栧彿";
//
// txt_lineNo
//
@@ -536,6 +536,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesWorkshopLine";
+ this.Text = "绾夸綋绠＄悊";
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index c560b9c..bd7ebb7 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -37,6 +37,7 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ this.txt_dptId.getSuppler("");
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -166,7 +167,14 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -312,7 +320,6 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
-
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 0598c08..8fad7e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -15,7 +15,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesStaffManager/";
-
public Frm_Staff()
{
InitializeComponent();
@@ -145,7 +144,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 4304f73..010fbc9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -4,7 +4,6 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index b9c438a..0134448 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -53,10 +53,9 @@
this.txt_isIncludeDoc = new DevExpress.XtraEditors.CheckEdit();
this.txt_isSpilit = new DevExpress.XtraEditors.CheckEdit();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txxtItem5 = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.lblPreview = new DevExpress.XtraEditors.LabelControl();
this.txxtItem4 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txxtItem3 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_docFormat = new DevExpress.XtraEditors.TextEdit();
@@ -73,6 +72,8 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -86,7 +87,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isSpilit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).BeginInit();
@@ -230,7 +231,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(947, 510);
+ this.gcMain.Size = new System.Drawing.Size(1072, 510);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -251,7 +252,9 @@
this.gv_resetZero,
this.gv_flagIncludeDocCode,
this.gv_createdBy,
- this.gv_createDate});
+ this.gv_createDate,
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -288,7 +291,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(947, 548);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1072, 548);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
@@ -299,7 +302,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(947, 38);
+ this.pageBar1.Size = new System.Drawing.Size(1072, 38);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -333,30 +336,30 @@
//
// txt_resetZero
//
- this.txt_resetZero.Location = new System.Drawing.Point(166, 336);
+ this.txt_resetZero.Location = new System.Drawing.Point(162, 268);
this.txt_resetZero.Name = "txt_resetZero";
this.txt_resetZero.Properties.Caption = "姣忓ぉ褰掗浂閲嶆柊缂栧彿";
- this.txt_resetZero.Size = new System.Drawing.Size(159, 24);
+ this.txt_resetZero.Size = new System.Drawing.Size(153, 24);
this.txt_resetZero.TabIndex = 238;
//
// txt_noLength
//
- this.txt_noLength.Location = new System.Drawing.Point(166, 285);
+ this.txt_noLength.Location = new System.Drawing.Point(162, 228);
this.txt_noLength.Maximum = new decimal(new int[] {
10,
0,
0,
0});
this.txt_noLength.Minimum = new decimal(new int[] {
- 3,
+ 6,
0,
0,
0});
this.txt_noLength.Name = "txt_noLength";
- this.txt_noLength.Size = new System.Drawing.Size(159, 28);
+ this.txt_noLength.Size = new System.Drawing.Size(136, 28);
this.txt_noLength.TabIndex = 237;
this.txt_noLength.Value = new decimal(new int[] {
- 3,
+ 6,
0,
0,
0});
@@ -385,7 +388,7 @@
//
// txt_isIncludeDoc
//
- this.txt_isIncludeDoc.Location = new System.Drawing.Point(372, 336);
+ this.txt_isIncludeDoc.Location = new System.Drawing.Point(329, 268);
this.txt_isIncludeDoc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_isIncludeDoc.Name = "txt_isIncludeDoc";
this.txt_isIncludeDoc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -396,7 +399,7 @@
//
// txt_isSpilit
//
- this.txt_isSpilit.Location = new System.Drawing.Point(372, 287);
+ this.txt_isSpilit.Location = new System.Drawing.Point(329, 230);
this.txt_isSpilit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_isSpilit.Name = "txt_isSpilit";
this.txt_isSpilit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -412,10 +415,9 @@
this.panelControl1.Appearance.Options.UseBackColor = true;
this.panelControl1.Appearance.Options.UseForeColor = true;
this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- this.panelControl1.Controls.Add(this.comboBoxEdit1);
+ this.panelControl1.Controls.Add(this.txxtItem5);
this.panelControl1.Controls.Add(this.labelControl9);
this.panelControl1.Controls.Add(this.labelControl1);
- this.panelControl1.Controls.Add(this.lblPreview);
this.panelControl1.Controls.Add(this.txxtItem4);
this.panelControl1.Controls.Add(this.txxtItem3);
this.panelControl1.Controls.Add(this.txt_docFormat);
@@ -429,24 +431,24 @@
this.panelControl1.Location = new System.Drawing.Point(81, 73);
this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(780, 188);
+ this.panelControl1.Size = new System.Drawing.Size(780, 137);
this.panelControl1.TabIndex = 229;
//
- // comboBoxEdit1
+ // txxtItem5
//
- this.comboBoxEdit1.EditValue = "搴忓彿";
- this.comboBoxEdit1.Location = new System.Drawing.Point(617, 48);
- this.comboBoxEdit1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.comboBoxEdit1.Name = "comboBoxEdit1";
- this.comboBoxEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.comboBoxEdit1.Properties.Appearance.Options.UseFont = true;
- this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txxtItem5.Location = new System.Drawing.Point(617, 48);
+ this.txxtItem5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txxtItem5.Name = "txxtItem5";
+ this.txxtItem5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txxtItem5.Properties.Appearance.Options.UseFont = true;
+ this.txxtItem5.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.comboBoxEdit1.Properties.Items.AddRange(new object[] {
- "搴忓彿"});
- this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit1.Size = new System.Drawing.Size(122, 28);
- this.comboBoxEdit1.TabIndex = 4;
+ this.txxtItem5.Properties.Items.AddRange(new object[] {
+ "<鏃�>",
+ "<搴忓彿>"});
+ this.txxtItem5.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txxtItem5.Size = new System.Drawing.Size(122, 28);
+ this.txxtItem5.TabIndex = 4;
//
// labelControl9
//
@@ -469,19 +471,6 @@
this.labelControl1.Size = new System.Drawing.Size(60, 21);
this.labelControl1.TabIndex = 0;
this.labelControl1.Text = "鍙傛暟1锛�";
- //
- // lblPreview
- //
- this.lblPreview.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
- this.lblPreview.Appearance.ForeColor = System.Drawing.Color.White;
- this.lblPreview.Appearance.Options.UseFont = true;
- this.lblPreview.Appearance.Options.UseForeColor = true;
- this.lblPreview.Location = new System.Drawing.Point(50, 139);
- this.lblPreview.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblPreview.Name = "lblPreview";
- this.lblPreview.Size = new System.Drawing.Size(269, 24);
- this.lblPreview.TabIndex = 0;
- this.lblPreview.Text = "鏍蜂緥锛歑X20150506-00001";
//
// txxtItem4
//
@@ -647,7 +636,7 @@
//
this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(81, 289);
+ this.labelControl6.Location = new System.Drawing.Point(77, 232);
this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl6.Name = "labelControl6";
this.labelControl6.Size = new System.Drawing.Size(85, 21);
@@ -663,7 +652,10 @@
this.txt_docCode.Properties.Appearance.Options.UseFont = true;
this.txt_docCode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_docCode.Properties.NullText = "";
+ this.txt_docCode.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] {
+ new DevExpress.XtraEditors.Controls.LookUpColumnInfo("docCode", "鍗曟嵁绫诲瀷", 20, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.Ascending, DevExpress.Utils.DefaultBoolean.Default)});
+ this.txt_docCode.Properties.DropDownRows = 15;
+ this.txt_docCode.Properties.NullText = "璇烽�夋嫨鍗曟嵁绫诲瀷";
this.txt_docCode.Size = new System.Drawing.Size(248, 28);
this.txt_docCode.TabIndex = 224;
//
@@ -697,6 +689,26 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹℃牳鑰�";
+ this.gridColumn1.FieldName = "checkBy";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹℃牳鏃ユ湡";
+ this.gridColumn2.FieldName = "checkDate";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.Width = 94;
+ //
// DocNoRule
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -722,7 +734,7 @@
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.panelControl1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txxtItem5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).EndInit();
@@ -757,7 +769,6 @@
private DevExpress.XtraEditors.CheckEdit txt_isSpilit;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.LabelControl lblPreview;
private DevExpress.XtraEditors.ComboBoxEdit txxtItem4;
private DevExpress.XtraEditors.ComboBoxEdit txxtItem3;
private DevExpress.XtraEditors.TextEdit txt_docFormat;
@@ -776,7 +787,9 @@
private DevExpress.XtraEditors.CheckEdit txt_resetZero;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
private DevExpress.XtraEditors.LabelControl labelControl9;
+ private DevExpress.XtraEditors.ComboBoxEdit txxtItem5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index c738bda..02ba6f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -42,6 +42,7 @@
txxtItem2.EditValueChanged += (s, e) => { DoPreviewCode(); };
txxtItem3.EditValueChanged += (s, e) => { DoPreviewCode(); };
txxtItem4.EditValueChanged += (s, e) => { DoPreviewCode(); };
+ txxtItem5.EditValueChanged += (s, e) => { DoPreviewCode(); };
txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
@@ -170,8 +171,15 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
- txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true;
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true;
}
/// <summary>
@@ -185,9 +193,10 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(panel1.Controls, true);
txxtItem1.SelectedIndex = txxtItem2.SelectedIndex =
- txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0;
+ txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = txxtItem5.SelectedIndex = 0;
txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled =
- txxtItem4.Enabled = panelControl1.Enabled = true;
+ txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true;
+ txt_docCode.EditValue = null;
}
/// <summary>
@@ -321,6 +330,8 @@
txxtItem3.Text = "<" + _ary[2];
if (_ary.Length > 3)
txxtItem4.Text = "<" + _ary[3];
+ if (_ary.Length >4)
+ txxtItem5.Text = "<" + _ary[4];
txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = false;
}
else
@@ -338,19 +349,36 @@
{
var dataTable = new DataTable();
dataTable.Columns.Add("docCode", typeof(string));
- dataTable.Rows.Add("CGDH(鍒拌揣鍗�)");//V
- dataTable.Rows.Add("CGJY(妫�楠屽崟)");//V
- dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠鍗�)");//V
- dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");//V
- dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");//V
- dataTable.Rows.Add("CKSQ(鍑哄簱鐢宠)");//V
- dataTable.Rows.Add("RKSQ(鍏ュ簱鐢宠)");//V
- dataTable.Rows.Add("TL(閫�鏂欏崟)");
- dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
- dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
- dataTable.Rows.Add("OUT(鍑哄簱鍗�)");
- dataTable.Rows.Add("HB(鐗╂枡鍚堝苟)");
- dataTable.Rows.Add("QTSQ(鍏朵粬鍏ュ簱鐢宠)");
+ dataTable.Rows.Add("BG(鎶ュ伐缂栧彿)");
+ dataTable.Rows.Add("CGDH(鍒拌揣)");
+ dataTable.Rows.Add("CGJY(閲囪喘妫�楠�)");
+ dataTable.Rows.Add("CGRK(閲囪喘鍏ュ簱)");
+ dataTable.Rows.Add("CGTHSQ(閲囪喘閫�璐х敵璇�)");
+ dataTable.Rows.Add("CGTH(閲囪喘閫�璐�)");
+ dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠)");
+ dataTable.Rows.Add("DB(璋冩嫧鍗�)");
+ dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");
+ dataTable.Rows.Add("QTCKSQ(鍏朵粬鍑哄簱鐢宠)");
+ dataTable.Rows.Add("QTCK(鍏朵粬鍑哄簱)");
+ dataTable.Rows.Add("QTRKSQ(鍏朵粬鍏ュ簱鐢宠)");
+ dataTable.Rows.Add("QTRK(鍏朵粬鍏ュ簱)");
+ dataTable.Rows.Add("SCLL(鐢熶骇棰嗘枡)");
+ dataTable.Rows.Add("SCRK(鐢熶骇鍏ュ簱)");
+ dataTable.Rows.Add("SCTLSQ(鐢熶骇閫�鏂欑敵璇�)");
+ dataTable.Rows.Add("SCTL(鐢熶骇閫�鏂�)");
+ dataTable.Rows.Add("SCCLSQ(鐢熶骇瓒呴鐢宠)");
+ dataTable.Rows.Add("SCCL(鐢熶骇瓒呴)");
+ dataTable.Rows.Add("SCBLSQ(鐢熶骇琛ユ枡鐢宠)");
+ dataTable.Rows.Add("SCBL(鐢熶骇琛ユ枡)");
+ dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");
+ dataTable.Rows.Add("WWTLSQ(濮斿閫�鏂欑敵璇�)");
+ dataTable.Rows.Add("WWTL(濮斿閫�鏂�)");
+ dataTable.Rows.Add("WWCLSQ(濮斿瓒呴鐢宠)");
+ dataTable.Rows.Add("WWCL(濮斿瓒呴)");
+ dataTable.Rows.Add("WWBLSQ(濮斿琛ユ枡鐢宠)");
+ dataTable.Rows.Add("WWBL(濮斿琛ユ枡)");
+ dataTable.Rows.Add("XSCK(閿�鍞嚭搴�)");
+ dataTable.Rows.Add("XSTH(閿�鍞��璐�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
@@ -363,32 +391,30 @@
|| txxtItem1.Enabled == false
|| txxtItem2.Enabled == false
|| txxtItem3.Enabled == false
- || txxtItem4.Enabled == false)
+ || txxtItem4.Enabled == false
+ || txxtItem5.Enabled == false)
return;
- var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text +
- txxtItem4.Text;
+ var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text + txxtItem5.Text; ;
txt_docFormat.Text = text;
- if (txt_docFormat.Text == "")
- {
- lblPreview.Text = "璇峰畾涔夎鍒�.";
- }
- else
- {
- var preview = txt_docFormat.Text;
- var length = int.Parse(txt_noLength.Value.ToString());
- var docCode = "";
- if (txt_isIncludeDoc.Checked)
- docCode = txt_docCode.EditValue.ToString();
- preview = docCode + preview;
- preview = preview.Replace("<鏃�>", "");
- preview = preview.Replace("<骞村勾骞村勾>", "2024");
- preview = preview.Replace("<骞村勾>", "24");
- preview = preview.Replace("<鏈堟湀>", "06");
- preview = preview.Replace("<鏃ユ棩>", "18");
- preview = preview + (txt_isSpilit.Checked ? "-" : "") +
- "8".PadLeft(length, '0');
- lblPreview.Text = "鏍蜂緥锛�" + preview;
- }
+ //if (txt_docFormat.Text == "")
+ //{
+ // lblPreview.Text = "璇峰畾涔夎鍒�.";
+ //}
+ //else
+ //{
+ // var preview = txt_docFormat.Text;
+ // var length = int.Parse(txt_noLength.Value.ToString());
+ // var docCode = "";
+ // if (txt_isIncludeDoc.Checked)
+ // docCode = (txt_docCode.EditValue==null?"": txt_docCode.EditValue.ToString());
+ // preview = docCode + preview;
+ // preview = preview.Replace("鏃�", "");
+ // preview = preview.Replace("骞村勾骞村勾", "2025");
+ // preview = preview.Replace("骞村勾", "25");
+ // preview = preview.Replace("鏈堟湀", "06");
+ // preview = preview.Replace("鏃ユ棩", "18");
+ // preview = preview + (txt_isSpilit.Checked ? "-" : "") + "8".PadLeft(length, '0');
+ //}
}
/// <summary>
@@ -438,7 +464,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "checkStatus", "", "", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index f8d7043..b74ba3d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -292,7 +292,5 @@
frm.ShowDialog();
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index 7eb5b43..b803afd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -169,7 +169,14 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index e9b3eb2..d54dd54 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -167,7 +167,15 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
+
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
index 499e9fa..b5acd26 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
@@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data;
-using System.Drawing;
using System.Net;
using System.Windows.Forms;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 42b8d51..d945be9 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -145,14 +145,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
@@ -163,16 +164,22 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1);
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
}
/// <summary>
@@ -242,8 +249,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ",
- "desc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ", "desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index a01b847..0762d5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -215,7 +215,7 @@
//
this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.userName.AppearanceCell.Options.UseFont = true;
- this.userName.Caption = "璐﹀彿鍚嶇О";
+ this.userName.Caption = "鐧诲綍鍚嶇О";
this.userName.FieldName = "userName";
this.userName.MinWidth = 50;
this.userName.Name = "userName";
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs
index 414366f..00c7068 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs
@@ -33,6 +33,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -54,8 +55,9 @@
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn2,
this.gridColumn5,
+ this.gridColumn2,
+ this.gridColumn1,
this.gridColumn4});
this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
@@ -64,28 +66,36 @@
//
// gridColumn2
//
- this.gridColumn2.Caption = "鐢ㄦ埛鍚嶇О";
+ this.gridColumn2.Caption = "鐧诲綍鍚嶇О";
this.gridColumn2.FieldName = "userName";
this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 80;
//
// gridColumn5
//
- this.gridColumn5.Caption = "鐢ㄦ埛璐﹀彿";
+ this.gridColumn5.Caption = "鐧诲綍璐﹀彿";
this.gridColumn5.FieldName = "account";
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.VisibleIndex = 0;
//
// gridColumn4
//
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍏宠仈鍛樺伐";
+ this.gridColumn1.FieldName = "staffId";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 2;
//
// UcLookUser
//
@@ -107,5 +117,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
--
Gitblit v1.9.3