From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 26 七月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.resx | 123 +++
DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs | 72 +-
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs | 53 +
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 17
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs | 6
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/Frm_MesJSSalary.Designer.cs | 54 +
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs | 39 +
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs | 13
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs | 803 +++++++++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs | 4
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs | 554 +++++++++++++++++
DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs | 2
18 files changed, 1,749 insertions(+), 123 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..d0d4cda 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -307,6 +307,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;
@@ -945,6 +946,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 +957,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 +968,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 +979,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 +991,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 +1029,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 +1040,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..1e71466 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -285,7 +285,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, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -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"])
@@ -607,7 +618,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
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..564c21e 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
{
@@ -490,8 +508,23 @@
strMsg = "鍙嶅鏍�";
break;
}
- ;
- toolBarMenu1.guidKey = "";
+ if (_inFieldValue == 1)
+ {
+ string confirmMsg = $"鏄惁瀹℃牳 浜х嚎鍙凤細{lineNo}锛屾棩鏈燂細{date}锛�";
+ if (MessageBox.Show(confirmMsg, "瀹℃牳纭", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+ {
+ return;
+ }
+ }
+ else
+ {
+ string confirmMsg = $"鏄惁鍙嶅鏍� 浜х嚎鍙凤細{lineNo}锛屾棩鏈燂細{date}锛�";
+ if (MessageBox.Show(confirmMsg, "瀹℃牳纭", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+ {
+ return;
+ }
+ }
+ toolBarMenu1.guidKey = "";
var _obj = new
{
lineNo = lineNo,
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
new file mode 100644
index 0000000..1061938
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
@@ -0,0 +1,803 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+ partial class Frm_MesDeToLine
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_DepartmentId = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.txt_LineNo = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.txt_DepartmentName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_LineName = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = 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();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepartmentId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_LineNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepartmentName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_LineName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.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.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 61;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_createBy,
+ this.gv_createDate,
+ this.gridColumn6,
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4});
+ this.gridView1.DetailHeight = 428;
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 62;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "寤虹珛鑰�";
+ this.gv_createBy.FieldName = "createBy";
+ 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;
+ this.gv_createBy.Width = 100;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+ this.gv_createDate.FieldName = "createDate";
+ 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;
+ this.gv_createDate.Width = 286;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "瀹℃牳";
+ 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;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "閮ㄩ棬ID";
+ this.gridColumn1.FieldName = "departmentId";
+ this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "departmentId";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "閮ㄩ棬鍚嶇О";
+ this.gridColumn2.FieldName = "departmentName";
+ this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Tag = "departmentName";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 120;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浜х嚎缂栧彿";
+ this.gridColumn3.FieldName = "lineNo";
+ this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Tag = "lineNo";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜х嚎鍚嶇О";
+ this.gridColumn4.FieldName = "lineName";
+ this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Tag = "lineName";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 120;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 159;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
+ this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Controls.Add(this.txt_checkStatus);
+ this.layoutMx1.Controls.Add(this.txt_Guid);
+ this.layoutMx1.Controls.Add(this.txt_DepartmentId);
+ this.layoutMx1.Controls.Add(this.txt_LineNo);
+ this.layoutMx1.Controls.Add(this.txt_DepartmentName);
+ this.layoutMx1.Controls.Add(this.txt_LineName);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem9});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 159);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(692, 131);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(334, 34);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(790, 81);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 231;
+ this.txt_createDate.Tag = "readonly";
+ //
+ // txt_createBy
+ //
+ this.txt_createBy.Location = new System.Drawing.Point(1137, 81);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
+ //
+ // txt_checkBy
+ //
+ this.txt_checkBy.Location = new System.Drawing.Point(443, 81);
+ this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 247;
+ this.txt_checkBy.Tag = "readonly";
+ //
+ // txt_checkDate
+ //
+ this.txt_checkDate.Location = new System.Drawing.Point(96, 81);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkDate.Name = "txt_checkDate";
+ this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkDate.StyleController = this.layoutMx1;
+ this.txt_checkDate.TabIndex = 248;
+ this.txt_checkDate.Tag = "readonly";
+ //
+ // txt_checkStatus
+ //
+ this.txt_checkStatus.Location = new System.Drawing.Point(1056, 46);
+ this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkStatus.Name = "txt_checkStatus";
+ this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_checkStatus.Size = new System.Drawing.Size(340, 27);
+ this.txt_checkStatus.StyleController = this.layoutMx1;
+ this.txt_checkStatus.TabIndex = 249;
+ this.txt_checkStatus.Tag = "readonly";
+ //
+ // txt_Guid
+ //
+ this.txt_Guid.Location = new System.Drawing.Point(790, 116);
+ this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_Guid.Name = "txt_Guid";
+ this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+ this.txt_Guid.StyleController = this.layoutMx1;
+ this.txt_Guid.TabIndex = 250;
+ this.txt_Guid.Tag = "";
+ //
+ // txt_DepartmentId
+ //
+ this.txt_DepartmentId.Location = new System.Drawing.Point(96, 12);
+ this.txt_DepartmentId.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_DepartmentId.Name = "txt_DepartmentId";
+ this.txt_DepartmentId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_DepartmentId.Properties.NullText = "";
+ this.txt_DepartmentId.Properties.PopupView = this.searchLookUpEdit1View;
+ this.txt_DepartmentId.Size = new System.Drawing.Size(259, 28);
+ this.txt_DepartmentId.StyleController = this.layoutMx1;
+ this.txt_DepartmentId.TabIndex = 250;
+ this.txt_DepartmentId.Tag = "";
+ //
+ // searchLookUpEdit1View
+ //
+ this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+ this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // txt_LineNo
+ //
+ this.txt_LineNo.Location = new System.Drawing.Point(96, 46);
+ this.txt_LineNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_LineNo.Name = "txt_LineNo";
+ this.txt_LineNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_LineNo.Properties.NullText = "";
+ this.txt_LineNo.Properties.PopupView = this.gridView2;
+ this.txt_LineNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_LineNo.StyleController = this.layoutMx1;
+ this.txt_LineNo.TabIndex = 251;
+ this.txt_LineNo.Tag = "";
+ //
+ // gridView2
+ //
+ this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // txt_DepartmentName
+ //
+ this.txt_DepartmentName.Location = new System.Drawing.Point(443, 12);
+ this.txt_DepartmentName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_DepartmentName.Name = "txt_DepartmentName";
+ this.txt_DepartmentName.Properties.ReadOnly = true;
+ this.txt_DepartmentName.Size = new System.Drawing.Size(259, 28);
+ this.txt_DepartmentName.StyleController = this.layoutMx1;
+ this.txt_DepartmentName.TabIndex = 252;
+ this.txt_DepartmentName.Tag = "readonly";
+ //
+ // txt_LineName
+ //
+ this.txt_LineName.Location = new System.Drawing.Point(443, 46);
+ this.txt_LineName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_LineName.Name = "txt_LineName";
+ this.txt_LineName.Properties.ReadOnly = true;
+ this.txt_LineName.Size = new System.Drawing.Size(259, 28);
+ this.txt_LineName.StyleController = this.layoutMx1;
+ this.txt_LineName.TabIndex = 253;
+ this.txt_LineName.Tag = "readonly";
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lbGuid;
+ this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "lbGuid";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem12,
+ this.layoutControlItem13,
+ this.layoutControlItem11,
+ this.layoutControlItem10,
+ this.layoutControlItem8,
+ this.layoutControlItem7,
+ this.layoutControlItem6,
+ this.layoutControlItem5,
+ this.layoutControlItem1,
+ this.layoutControlItem2});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1408, 159);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_DepartmentId;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "閮ㄩ棬";
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem12.Text = "閮ㄩ棬";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_Guid;
+ this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem13.CustomizationFormText = "Guid";
+ this.layoutControlItem13.Location = new System.Drawing.Point(694, 104);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem13.Text = "Guid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_LineNo;
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem11.Text = "浜х嚎";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_checkStatus;
+ this.layoutControlItem10.Location = new System.Drawing.Point(1041, 34);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkDate;
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 69);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_checkBy;
+ this.layoutControlItem7.Location = new System.Drawing.Point(347, 69);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem7.Text = "瀹℃牳鑰�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_createDate;
+ this.layoutControlItem6.Location = new System.Drawing.Point(694, 69);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_createBy;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1041, 69);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem5.Text = "寤虹珛鑰�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_DepartmentName;
+ this.layoutControlItem1.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
+ this.layoutControlItem1.Text = "閮ㄩ棬鍚嶇О";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_LineName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 34);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem2.Text = "浜х嚎鍚嶇О";
+ this.layoutControlItem2.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_MesDeToLine
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.Controls.Add(this.picCheckBox);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.Name = "Frm_MesDeToLine";
+ this.Text = "閮ㄩ棬浜х嚎鍏崇郴";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepartmentId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_LineNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepartmentName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_LineName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
+ private DevExpress.XtraEditors.TextEdit txt_checkDate;
+ private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+ private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.TextEdit txt_Guid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraEditors.SearchLookUpEdit txt_DepartmentId;
+ private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraEditors.SearchLookUpEdit txt_LineNo;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraEditors.TextEdit txt_DepartmentName;
+ private DevExpress.XtraEditors.TextEdit txt_LineName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
new file mode 100644
index 0000000..f922fd6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.cs
@@ -0,0 +1,554 @@
+锘縰sing DevExpress.ClipboardSource.SpreadsheetML;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows.Media.Animation;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+ public partial class Frm_MesDeToLine : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "MesDeToLine/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ public Frm_MesDeToLine()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ GetDepartmentData();
+ GetLineData();
+
+ // 娣诲姞涓嬫媺妗嗛�夋嫨浜嬩欢
+ this.txt_DepartmentId.EditValueChanged += Txt_DepartmentId_EditValueChanged;
+ this.txt_LineNo.EditValueChanged += Txt_LineNo_EditValueChanged;
+ }
+
+ /// <summary>
+ /// 閮ㄩ棬涓嬫媺妗嗛�夋嫨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Txt_DepartmentId_EditValueChanged(object sender, EventArgs e)
+ {
+ SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
+ DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
+ if (selectedDataRow != null)
+ {
+ txt_DepartmentName.Text = selectedDataRow["閮ㄩ棬鍚嶇О"].ToString();
+ }
+ else
+ {
+ txt_DepartmentName.Text = "";
+ }
+ }
+
+ /// <summary>
+ /// 浜х嚎涓嬫媺妗嗛�夋嫨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Txt_LineNo_EditValueChanged(object sender, EventArgs e)
+ {
+ SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
+ DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
+ if (selectedDataRow != null)
+ {
+ txt_LineName.Text = selectedDataRow["浜х嚎鍚嶇О"].ToString();
+ }
+ else
+ {
+ txt_LineName.Text = "";
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇閮ㄩ棬涓嬫媺妗嗘暟鎹�
+ /// </summary>
+ private void GetDepartmentData()
+ {
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetDepartmentList", "");
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+ txt_DepartmentId.Properties.ValueMember = "閮ㄩ棬Id";
+ txt_DepartmentId.Properties.DisplayMember = "閮ㄩ棬Id";
+ txt_DepartmentId.Properties.ShowClearButton = false;
+ txt_DepartmentId.Properties.DataSource = dt;
+ }
+ else
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇浜х嚎涓嬫媺妗嗘暟鎹�
+ /// </summary>
+ private void GetLineData()
+ {
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetLineList", "");
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+ txt_LineNo.Properties.ValueMember = "浜х嚎缂栧彿";
+ txt_LineNo.Properties.DisplayMember = "浜х嚎缂栧彿";
+ txt_LineNo.Properties.ShowClearButton = false;
+ txt_LineNo.Properties.DataSource = dt;
+ }
+ else
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+ /// <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>
+ /// <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_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_Guid, gridView1, "departmentName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+
+ /// <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(this.layoutMx1.Controls, true);
+ GetDepartmentData();
+ GetLineData();
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_Guid, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+
+ getModel(rowGuid);
+ GetDepartmentData();
+ GetLineData();
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ string departmentId = "";
+ string departmentName = txt_DepartmentName.Text.Trim();
+ string lineNo = "";
+ string lineName = txt_LineName.Text.Trim();
+
+ // 鑾峰彇閮ㄩ棬涓嬫媺妗嗛�変腑鍊�
+ if (txt_DepartmentId.EditValue != null)
+ {
+ var selectedDeptRow = txt_DepartmentId.GetSelectedDataRow() as DataRowView;
+ if (selectedDeptRow != null)
+ {
+ departmentId = selectedDeptRow["閮ㄩ棬Id"].ToString();
+ departmentName = selectedDeptRow["閮ㄩ棬鍚嶇О"].ToString();
+ }
+ }
+
+ // 鑾峰彇浜х嚎涓嬫媺妗嗛�変腑鍊�
+ if (txt_LineNo.EditValue != null)
+ {
+ var selectedLineRow = txt_LineNo.GetSelectedDataRow() as DataRowView;
+ if (selectedLineRow != null)
+ {
+ lineNo = selectedLineRow["浜х嚎缂栧彿"].ToString();
+ lineName = selectedLineRow["浜х嚎鍚嶇О"].ToString();
+ }
+ }
+
+ if (string.IsNullOrWhiteSpace(departmentId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閮ㄩ棬锛�");
+ txt_DepartmentId.Focus();
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(lineNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
+ txt_LineNo.Focus();
+ return;
+ }
+
+ try
+ {
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ departmentId = departmentId,
+ departmentName = departmentName,
+ lineNo = lineNo,
+ lineName = lineName
+ };
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _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;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="strGuid">涓婚敭</param>
+ /// <param name="isEdit">鏄惁鍙紪杈�</param>
+ /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+
+ // 璁剧疆涓嬫媺妗嗛�変腑鍊煎拰鍚嶇О瀛楁
+ txt_DepartmentId.EditValue = dy.departmentId;
+ txt_DepartmentName.Text = dy.departmentName;
+ txt_LineNo.EditValue = dy.lineNo;
+ txt_LineName.Text = dy.lineName;
+
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+ /// <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_DepartmentId, gridView1, "departmentName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_DEPARTMENTTOLINE,check_Date,check_Status,check_user"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+ }
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.resx
@@ -0,0 +1,123 @@
+锘�<?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>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
index 6e24f77..e8f5d26 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);
@@ -893,7 +910,7 @@
this.Controls.Add(this.toolBarMenu1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesJJSalary";
- this.Text = "璁℃椂宸ヨ祫";
+ this.Text = "璁′欢鍗曚环";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -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..91327b1 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
@@ -128,7 +128,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, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -387,7 +387,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -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..5fa2d9a 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);
@@ -785,7 +805,7 @@
this.Controls.Add(this.toolBarMenu1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesJSSalary";
- this.Text = "璁℃椂宸ヨ祫";
+ this.Text = "璁℃椂鍗曚环";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -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_MesJSSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
index 472916f..e2c1466 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
@@ -165,7 +165,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, "hourlyType");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -431,7 +431,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "hourlyType");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
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();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
index 14e23d1..86b3727 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
@@ -42,7 +42,6 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -65,10 +64,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1450, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_items{}";
@@ -76,10 +75,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1160, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1450, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -87,8 +87,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1158, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1448, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -97,29 +98,31 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
//
this.split1.Panel1.Controls.Add(this.gcMain1);
- this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1158, 570);
+ this.split1.Size = new System.Drawing.Size(1448, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1158, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1448, 683);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -131,7 +134,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Appearance.Row.Options.UseTextOptions = true;
this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gridColumn2,
@@ -140,9 +143,10 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.RowAutoHeight = true;
@@ -153,91 +157,80 @@
//
this.gridColumn1.Caption = "鐗╂枡缂栫爜";
this.gridColumn1.FieldName = "鐗╂枡缂栫爜";
- this.gridColumn1.MinWidth = 24;
+ this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 90;
+ this.gridColumn1.Width = 112;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "鐗╂枡鍚嶇О";
- this.gridColumn2.MinWidth = 24;
+ this.gridColumn2.MinWidth = 30;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 90;
+ this.gridColumn2.Width = 112;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
this.gridColumn3.FieldName = "鐗╂枡瑙勬牸";
- this.gridColumn3.MinWidth = 24;
+ this.gridColumn3.MinWidth = 30;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 90;
+ this.gridColumn3.Width = 112;
//
// gridColumn4
//
this.gridColumn4.Caption = "鎬婚渶棰嗛噺";
this.gridColumn4.FieldName = "鎬婚渶棰嗛噺";
- this.gridColumn4.MinWidth = 24;
+ this.gridColumn4.MinWidth = 30;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 90;
+ this.gridColumn4.Width = 112;
//
// gridColumn5
//
this.gridColumn5.Caption = "鎬诲凡棰嗛噺";
this.gridColumn5.FieldName = "鎬诲凡棰嗛噺";
- this.gridColumn5.MinWidth = 24;
+ this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 90;
+ this.gridColumn5.Width = 112;
//
// gridColumn6
//
this.gridColumn6.Caption = "褰撳墠搴撳瓨";
this.gridColumn6.FieldName = "褰撳墠搴撳瓨";
- this.gridColumn6.MinWidth = 24;
+ this.gridColumn6.MinWidth = 30;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 90;
+ this.gridColumn6.Width = 112;
//
// gridColumn7
//
this.gridColumn7.Caption = "鎬绘瑺鏂欐暟閲�";
this.gridColumn7.FieldName = "鎬绘瑺鏂欐暟閲�";
- this.gridColumn7.MinWidth = 24;
+ this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 90;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- 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(1158, 39);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
+ this.gridColumn7.Width = 112;
//
// Frm_MesQL
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1160, 682);
+ this.ClientSize = new System.Drawing.Size(1450, 834);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesQL";
this.Text = "娆犳枡琛�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -260,7 +253,6 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UserControls.Data.UcPageBar pageBar1;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ac3e49c..3d20e99 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -416,6 +416,12 @@
<Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
<DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.Designer.cs">
+ <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
<SubType>Form</SubType>
</Compile>
@@ -1615,6 +1621,9 @@
<EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
<DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesDeToLine.resx">
+ <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
<DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3