From c42e01627d34dc2ff3d18cc47b2018de3dbef36d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:15:34 +0800
Subject: [PATCH] 计件工资样式调整
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs | 51 ++++++---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs | 52 +++++++---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs | 20 +++
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 13 ++
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs | 13 ++
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs | 10 +-
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 8 +
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs | 2
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs | 64 ++++++++++--
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs | 31 +++--
DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs | 9 +
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs | 2
12 files changed, 202 insertions(+), 73 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index 0a38a7b..7f7dca9 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -945,6 +945,7 @@
this.gridColumn16.FieldName = "staffId";
this.gridColumn16.MinWidth = 30;
this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 0;
this.gridColumn16.Width = 112;
@@ -955,6 +956,7 @@
this.gridColumn9.FieldName = "staffNo";
this.gridColumn9.MinWidth = 30;
this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 1;
this.gridColumn9.Width = 112;
@@ -965,6 +967,7 @@
this.gridColumn10.FieldName = "staffName";
this.gridColumn10.MinWidth = 30;
this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 2;
this.gridColumn10.Width = 112;
@@ -975,6 +978,7 @@
this.gridColumn11.FieldName = "hour";
this.gridColumn11.MinWidth = 30;
this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 3;
this.gridColumn11.Width = 112;
@@ -986,6 +990,7 @@
this.gridColumn12.FieldName = "lineNo";
this.gridColumn12.MinWidth = 30;
this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "edit";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
this.gridColumn12.Width = 112;
@@ -1023,7 +1028,7 @@
this.gridColumn14.FieldName = "salary";
this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Tag = "edit";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 6;
this.gridColumn14.Width = 112;
@@ -1034,6 +1039,7 @@
this.gridColumn15.FieldName = "remark";
this.gridColumn15.MinWidth = 30;
this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Tag = "edit";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 7;
this.gridColumn15.Width = 112;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index db29302..cd0ebfb 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -354,7 +354,12 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gridView1);
+ gridViews.Add(gridView2);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
txt_ErrorType.EditValue = "璁℃椂宸ユ椂";
GetTimeType();
GetWOMDAAInfo();
@@ -558,6 +563,12 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ // 鎺у埗鏄庣粏琛ㄥ彲缂栬緫鐘舵��
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView2);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+
+
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
index 3cb9ccd..02c551e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
@@ -47,6 +47,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gridControl2 = new DevExpress.XtraGrid.GridControl();
@@ -92,7 +93,6 @@
this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -201,6 +201,7 @@
this.gridColumn1.FieldName = "attenDate";
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 112;
@@ -211,6 +212,7 @@
this.gridColumn2.FieldName = "lineNo";
this.gridColumn2.MinWidth = 30;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 112;
@@ -221,6 +223,7 @@
this.gridColumn3.FieldName = "lineName";
this.gridColumn3.MinWidth = 30;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 112;
@@ -231,6 +234,7 @@
this.gridColumn4.FieldName = "staffNo";
this.gridColumn4.MinWidth = 30;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 4;
this.gridColumn4.Width = 112;
@@ -241,6 +245,7 @@
this.gridColumn5.FieldName = "staffName";
this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 112;
@@ -251,6 +256,7 @@
this.gridColumn6.FieldName = "salary";
this.gridColumn6.MinWidth = 30;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 112;
@@ -261,6 +267,7 @@
this.gridColumn7.FieldName = "hour";
this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
this.gridColumn7.Width = 112;
@@ -271,6 +278,7 @@
this.gridColumn8.FieldName = "jJSalary";
this.gridColumn8.MinWidth = 30;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 8;
this.gridColumn8.Width = 112;
@@ -281,6 +289,7 @@
this.gridColumn9.FieldName = "jSSalary";
this.gridColumn9.MinWidth = 30;
this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 9;
this.gridColumn9.Width = 112;
@@ -291,6 +300,7 @@
this.gridColumn10.FieldName = "sumSalary";
this.gridColumn10.MinWidth = 30;
this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 10;
this.gridColumn10.Width = 112;
@@ -301,6 +311,7 @@
this.gridColumn11.FieldName = "remark";
this.gridColumn11.MinWidth = 30;
this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 11;
this.gridColumn11.Width = 112;
@@ -312,6 +323,17 @@
this.gridColumn47.MinWidth = 30;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Width = 112;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "瀹℃牳";
+ this.gridColumn48.FieldName = "checkStatus";
+ this.gridColumn48.MinWidth = 30;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.OptionsColumn.ReadOnly = true;
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 0;
+ this.gridColumn48.Width = 112;
//
// xtraTabControl1
//
@@ -369,6 +391,7 @@
this.gridColumn12.FieldName = "attenDate";
this.gridColumn12.MinWidth = 30;
this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.OptionsColumn.ReadOnly = true;
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 0;
this.gridColumn12.Width = 112;
@@ -379,6 +402,7 @@
this.gridColumn13.FieldName = "lineNo";
this.gridColumn13.MinWidth = 30;
this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 1;
this.gridColumn13.Width = 112;
@@ -389,6 +413,7 @@
this.gridColumn14.FieldName = "lineName";
this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 2;
this.gridColumn14.Width = 112;
@@ -399,6 +424,7 @@
this.gridColumn15.FieldName = "staffNo";
this.gridColumn15.MinWidth = 30;
this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 3;
this.gridColumn15.Width = 112;
@@ -409,6 +435,7 @@
this.gridColumn16.FieldName = "staffName";
this.gridColumn16.MinWidth = 30;
this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 4;
this.gridColumn16.Width = 112;
@@ -419,6 +446,7 @@
this.gridColumn17.FieldName = "workTime";
this.gridColumn17.MinWidth = 30;
this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.OptionsColumn.ReadOnly = true;
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 5;
this.gridColumn17.Width = 112;
@@ -449,6 +477,7 @@
this.gridColumn20.FieldName = "checkInfo";
this.gridColumn20.MinWidth = 30;
this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 8;
this.gridColumn20.Width = 112;
@@ -459,6 +488,7 @@
this.gridColumn21.FieldName = "modiLog";
this.gridColumn21.MinWidth = 30;
this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 9;
this.gridColumn21.Width = 112;
@@ -469,6 +499,7 @@
this.gridColumn22.FieldName = "remark";
this.gridColumn22.MinWidth = 30;
this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 10;
this.gridColumn22.Width = 112;
@@ -524,6 +555,7 @@
this.gridColumn23.FieldName = "attenDate";
this.gridColumn23.MinWidth = 30;
this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.OptionsColumn.ReadOnly = true;
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 0;
this.gridColumn23.Width = 112;
@@ -534,6 +566,7 @@
this.gridColumn24.FieldName = "lineNo";
this.gridColumn24.MinWidth = 30;
this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 1;
this.gridColumn24.Width = 112;
@@ -544,6 +577,7 @@
this.gridColumn25.FieldName = "lineName";
this.gridColumn25.MinWidth = 30;
this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 2;
this.gridColumn25.Width = 112;
@@ -554,6 +588,7 @@
this.gridColumn26.FieldName = "dAA001";
this.gridColumn26.MinWidth = 30;
this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 3;
this.gridColumn26.Width = 112;
@@ -564,6 +599,7 @@
this.gridColumn27.FieldName = "itemNo";
this.gridColumn27.MinWidth = 30;
this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 4;
this.gridColumn27.Width = 112;
@@ -574,6 +610,7 @@
this.gridColumn28.FieldName = "itemName";
this.gridColumn28.MinWidth = 30;
this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 5;
this.gridColumn28.Width = 112;
@@ -584,6 +621,7 @@
this.gridColumn29.FieldName = "itemModel";
this.gridColumn29.MinWidth = 30;
this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 6;
this.gridColumn29.Width = 112;
@@ -594,6 +632,7 @@
this.gridColumn30.FieldName = "num";
this.gridColumn30.MinWidth = 30;
this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.OptionsColumn.ReadOnly = true;
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 7;
this.gridColumn30.Width = 112;
@@ -604,6 +643,7 @@
this.gridColumn31.FieldName = "aCNum";
this.gridColumn31.MinWidth = 30;
this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.OptionsColumn.ReadOnly = true;
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 8;
this.gridColumn31.Width = 112;
@@ -614,6 +654,7 @@
this.gridColumn32.FieldName = "salary";
this.gridColumn32.MinWidth = 30;
this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.OptionsColumn.ReadOnly = true;
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 9;
this.gridColumn32.Width = 112;
@@ -624,6 +665,7 @@
this.gridColumn33.FieldName = "sumSalary";
this.gridColumn33.MinWidth = 30;
this.gridColumn33.Name = "gridColumn33";
+ this.gridColumn33.OptionsColumn.ReadOnly = true;
this.gridColumn33.Visible = true;
this.gridColumn33.VisibleIndex = 10;
this.gridColumn33.Width = 112;
@@ -678,6 +720,7 @@
this.gridColumn34.FieldName = "attenDate";
this.gridColumn34.MinWidth = 30;
this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.OptionsColumn.ReadOnly = true;
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 0;
this.gridColumn34.Width = 112;
@@ -688,6 +731,7 @@
this.gridColumn35.FieldName = "staffNo";
this.gridColumn35.MinWidth = 30;
this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 1;
this.gridColumn35.Width = 112;
@@ -698,6 +742,7 @@
this.gridColumn36.FieldName = "staffName";
this.gridColumn36.MinWidth = 30;
this.gridColumn36.Name = "gridColumn36";
+ this.gridColumn36.OptionsColumn.ReadOnly = true;
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 2;
this.gridColumn36.Width = 112;
@@ -708,6 +753,7 @@
this.gridColumn37.FieldName = "hour";
this.gridColumn37.MinWidth = 30;
this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.OptionsColumn.ReadOnly = true;
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 3;
this.gridColumn37.Width = 112;
@@ -718,6 +764,7 @@
this.gridColumn38.FieldName = "lineNo";
this.gridColumn38.MinWidth = 30;
this.gridColumn38.Name = "gridColumn38";
+ this.gridColumn38.OptionsColumn.ReadOnly = true;
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 4;
this.gridColumn38.Width = 112;
@@ -728,6 +775,7 @@
this.gridColumn39.FieldName = "lineName";
this.gridColumn39.MinWidth = 30;
this.gridColumn39.Name = "gridColumn39";
+ this.gridColumn39.OptionsColumn.ReadOnly = true;
this.gridColumn39.Visible = true;
this.gridColumn39.VisibleIndex = 5;
this.gridColumn39.Width = 112;
@@ -738,6 +786,7 @@
this.gridColumn40.FieldName = "errorType";
this.gridColumn40.MinWidth = 30;
this.gridColumn40.Name = "gridColumn40";
+ this.gridColumn40.OptionsColumn.ReadOnly = true;
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 6;
this.gridColumn40.Width = 112;
@@ -748,6 +797,7 @@
this.gridColumn41.FieldName = "hourlyType";
this.gridColumn41.MinWidth = 30;
this.gridColumn41.Name = "gridColumn41";
+ this.gridColumn41.OptionsColumn.ReadOnly = true;
this.gridColumn41.Visible = true;
this.gridColumn41.VisibleIndex = 7;
this.gridColumn41.Width = 112;
@@ -758,6 +808,7 @@
this.gridColumn42.FieldName = "hourlySalary";
this.gridColumn42.MinWidth = 30;
this.gridColumn42.Name = "gridColumn42";
+ this.gridColumn42.OptionsColumn.ReadOnly = true;
this.gridColumn42.Visible = true;
this.gridColumn42.VisibleIndex = 8;
this.gridColumn42.Width = 112;
@@ -768,6 +819,7 @@
this.gridColumn43.FieldName = "sumSalary";
this.gridColumn43.MinWidth = 30;
this.gridColumn43.Name = "gridColumn43";
+ this.gridColumn43.OptionsColumn.ReadOnly = true;
this.gridColumn43.Visible = true;
this.gridColumn43.VisibleIndex = 9;
this.gridColumn43.Width = 112;
@@ -779,16 +831,6 @@
this.gridColumn44.MinWidth = 30;
this.gridColumn44.Name = "gridColumn44";
this.gridColumn44.Width = 112;
- //
- // gridColumn48
- //
- this.gridColumn48.Caption = "瀹℃牳";
- this.gridColumn48.FieldName = "checkStatus";
- this.gridColumn48.MinWidth = 30;
- this.gridColumn48.Name = "gridColumn48";
- this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 0;
- this.gridColumn48.Width = 112;
//
// Frm_MesAttanCon
//
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
index 678a20c..2421411 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -167,11 +167,13 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
// 淇濆瓨鍘熷鍊�
SaveOriginalValues();
+ SetGridView2EditState(false);
}
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView2);
_originalValues.Clear();
+ SetGridView2EditState(false);
}
JArray array2 = new JArray();
@@ -228,7 +230,8 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ SetGridView2EditState(false);
}
/// <summary>
@@ -374,6 +377,20 @@
{
// 鍏跺畠闇�瑕佺殑UI鐘舵�佸垏鎹�
//Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ SetGridView2EditState(true);
+
+ }
+
+ private void SetGridView2EditState(bool editable)
+ {
+ // 鍦ㄥ矖
+ var colHour = gridView2.Columns["hour"];
+ if (colHour != null)
+ colHour.OptionsColumn.AllowEdit = editable;
+ // 淇敼鍘熷洜
+ var colReason = gridView2.Columns["reason"];
+ if (colReason != null)
+ colReason.OptionsColumn.AllowEdit = editable;
}
/// <summary>
@@ -445,6 +462,7 @@
ToolBox.MsgHelper.ShowInformation("淇濆瓨鎴愬姛锛�");
getPageList();
toolBarMenu1.isSetBtn = true;
+ SetGridView2EditState(false);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
index 6e24f77..b6d56f5 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
@@ -79,8 +79,6 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -93,6 +91,8 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -133,7 +133,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
@@ -146,6 +145,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -256,6 +256,7 @@
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.OptionsColumn.ReadOnly = true;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
@@ -269,6 +270,7 @@
this.gv_createDate.MinWidth = 225;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.OptionsColumn.ReadOnly = true;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
@@ -280,6 +282,7 @@
this.gridColumn6.FieldName = "checkStatus";
this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Tag = "checkStatus";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 0;
@@ -288,10 +291,12 @@
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡缂栫爜";
- this.gridColumn1.FieldName = "itemno";
+ this.gridColumn1.FieldName = "itemNo";
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "item_No";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 94;
@@ -302,6 +307,8 @@
this.gridColumn2.FieldName = "itemName";
this.gridColumn2.MinWidth = 30;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Tag = "item_Name";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 112;
@@ -312,6 +319,8 @@
this.gridColumn7.FieldName = "itemModel";
this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Tag = "item_Model";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 112;
@@ -322,6 +331,7 @@
this.gridColumn8.FieldName = "salary";
this.gridColumn8.MinWidth = 30;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Tag = "salary";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 9;
@@ -334,6 +344,7 @@
this.gridColumn3.MinWidth = 30;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Tag = "beginTime";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 4;
@@ -346,6 +357,7 @@
this.gridColumn4.MinWidth = 30;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Tag = "endTime";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 5;
@@ -358,6 +370,7 @@
this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Tag = "remark";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 6;
@@ -369,6 +382,7 @@
this.gridColumn10.FieldName = "itemId";
this.gridColumn10.MinWidth = 30;
this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Tag = "itemId";
this.gridColumn10.Width = 112;
//
@@ -625,6 +639,9 @@
this.txt_Salary.Location = new System.Drawing.Point(96, 81);
this.txt_Salary.Margin = new System.Windows.Forms.Padding(4);
this.txt_Salary.Name = "txt_Salary";
+ this.txt_Salary.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ this.txt_Salary.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ this.txt_Salary.Properties.MaskSettings.Set("mask", "f");
this.txt_Salary.Size = new System.Drawing.Size(259, 28);
this.txt_Salary.StyleController = this.layoutMx1;
this.txt_Salary.TabIndex = 393;
@@ -729,18 +746,6 @@
this.layoutControlItem14.Size = new System.Drawing.Size(347, 34);
this.layoutControlItem14.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
//
// layoutControlItem12
//
@@ -883,6 +888,18 @@
this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesJJSalary
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -934,7 +951,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
@@ -947,6 +963,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
index cebb3ff..becc7a9 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
@@ -430,7 +430,7 @@
{
txt_itemId.Click += (s, e) =>
{
- var frm = new JyxmShow("");
+ var frm = new JyxmShow("璁′欢");
frm.UpdateParent += (ss, ee) =>
{
try
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
index f15026e..7266614 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
@@ -73,8 +73,6 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -85,6 +83,8 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -121,7 +121,6 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -132,6 +131,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -240,6 +240,7 @@
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.OptionsColumn.ReadOnly = true;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
@@ -253,6 +254,7 @@
this.gv_createDate.MinWidth = 225;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.OptionsColumn.ReadOnly = true;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
@@ -264,6 +266,8 @@
this.gridColumn6.FieldName = "checkStatus";
this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Tag = "checkStatus";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 0;
this.gridColumn6.Width = 117;
@@ -275,6 +279,8 @@
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "hourlyType";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 94;
@@ -286,6 +292,8 @@
this.gridColumn2.MinWidth = 30;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Tag = "hourlySalary";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 94;
@@ -297,6 +305,8 @@
this.gridColumn3.MinWidth = 30;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Tag = "beginTime";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
@@ -308,6 +318,8 @@
this.gridColumn4.MinWidth = 30;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Tag = "endTime";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 94;
@@ -319,6 +331,8 @@
this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Tag = "remark";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 94;
@@ -330,6 +344,8 @@
this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Tag = "salaryType";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 94;
@@ -480,6 +496,9 @@
this.txt_HourlySalary.Location = new System.Drawing.Point(443, 12);
this.txt_HourlySalary.Margin = new System.Windows.Forms.Padding(4);
this.txt_HourlySalary.Name = "txt_HourlySalary";
+ this.txt_HourlySalary.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ this.txt_HourlySalary.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ this.txt_HourlySalary.Properties.MaskSettings.Set("mask", "f");
this.txt_HourlySalary.Size = new System.Drawing.Size(259, 28);
this.txt_HourlySalary.StyleController = this.layoutMx1;
this.txt_HourlySalary.TabIndex = 250;
@@ -544,6 +563,7 @@
this.txt_HourlyType.Name = "txt_HourlyType";
this.txt_HourlyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_HourlyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_HourlyType.Size = new System.Drawing.Size(259, 28);
this.txt_HourlyType.StyleController = this.layoutMx1;
this.txt_HourlyType.TabIndex = 250;
@@ -647,18 +667,6 @@
this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
//
// layoutControlItem13
//
@@ -775,6 +783,18 @@
this.layoutControlItem5.Text = "寤虹珛鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesJSSalary
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -822,7 +842,6 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -833,6 +852,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
index abfd9d0..daa5390 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
@@ -66,9 +66,9 @@
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -102,8 +102,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -206,6 +206,7 @@
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.OptionsColumn.ReadOnly = true;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
@@ -219,6 +220,7 @@
this.gv_createDate.MinWidth = 225;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.OptionsColumn.ReadOnly = true;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
@@ -230,6 +232,7 @@
this.gridColumn6.FieldName = "checkStatus";
this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 0;
this.gridColumn6.Width = 117;
@@ -241,6 +244,8 @@
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "type";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 94;
@@ -501,6 +506,16 @@
this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_checkStatus;
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -512,16 +527,6 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_checkStatus;
- this.layoutControlItem10.Location = new System.Drawing.Point(347, 0);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(347, 34);
- this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem10.TextVisible = false;
//
// Frm_MesJjgzTimeType
//
@@ -567,8 +572,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs
index f6b9ed0..aa5994d 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs
@@ -37,7 +37,14 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
-
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, null, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList();
+ }, lbGuid);
+ getPageList();
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -95,7 +102,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "name");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -317,7 +324,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Name, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Name, gridView1, "name");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
index ed6e4b2..8f64045 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
@@ -115,7 +115,7 @@
this.MinimizeBox = false;
this.Name = "KQCX";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "娆犳枡琛ㄦ煡璇�";
+ this.Text = "鏌ヨ";
((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
index 1d1bd31..5d7d4d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -50,7 +50,7 @@
this.gcMain.MainView = this.gridView1;
this.gcMain.Margin = new System.Windows.Forms.Padding(4);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1292, 662);
+ this.gcMain.Size = new System.Drawing.Size(1025, 662);
this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -121,7 +121,7 @@
this.panelControl1.Location = new System.Drawing.Point(0, 662);
this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1292, 53);
+ this.panelControl1.Size = new System.Drawing.Size(1025, 53);
this.panelControl1.TabIndex = 9;
//
// btnIn
@@ -130,7 +130,7 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
- this.btnIn.Location = new System.Drawing.Point(1172, 2);
+ this.btnIn.Location = new System.Drawing.Point(905, 2);
this.btnIn.Margin = new System.Windows.Forms.Padding(4);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(118, 49);
@@ -141,14 +141,14 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1292, 715);
+ this.ClientSize = new System.Drawing.Size(1025, 715);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "SelectSTAFF";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "鐢熶骇閫�鏂欑敵璇凤紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
+ this.Text = "閫夋嫨鍛樺伐";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
index bfc9d6e..7445425 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
@@ -58,10 +58,13 @@
//
this.textEdit1.Location = new System.Drawing.Point(209, 45);
this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ this.textEdit1.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ this.textEdit1.Properties.MaskSettings.Set("mask", "f");
this.textEdit1.Size = new System.Drawing.Size(386, 28);
this.textEdit1.TabIndex = 6;
//
- // WorkTime
+ // SetLB
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -72,9 +75,9 @@
this.Margin = new System.Windows.Forms.Padding(2);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "WorkTime";
+ this.Name = "SetLB";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "娆犳枡琛ㄦ煡璇�";
+ this.Text = "璁剧疆杩炵彮";
((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
--
Gitblit v1.9.3