From 63dd8bdd72afc4e8277606932999e598a13dd04e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 10:09:59 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs | 11 +++++++++++
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs | 4 ++--
DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
index 02c551e..e39749b 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
@@ -202,6 +202,7 @@
this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "attenDate";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 112;
@@ -213,6 +214,7 @@
this.gridColumn2.MinWidth = 30;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Tag = "lineNo";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 112;
@@ -224,6 +226,7 @@
this.gridColumn3.MinWidth = 30;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Tag = "lineName";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 112;
@@ -235,6 +238,7 @@
this.gridColumn4.MinWidth = 30;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Tag = "staffNo";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 4;
this.gridColumn4.Width = 112;
@@ -246,6 +250,7 @@
this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Tag = "staffName";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 112;
@@ -257,6 +262,7 @@
this.gridColumn6.MinWidth = 30;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Tag = "salary";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 112;
@@ -268,6 +274,7 @@
this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Tag = "hour";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
this.gridColumn7.Width = 112;
@@ -279,6 +286,7 @@
this.gridColumn8.MinWidth = 30;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Tag = "jJSalary";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 8;
this.gridColumn8.Width = 112;
@@ -290,6 +298,7 @@
this.gridColumn9.MinWidth = 30;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Tag = "jSSalary";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 9;
this.gridColumn9.Width = 112;
@@ -301,6 +310,7 @@
this.gridColumn10.MinWidth = 30;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.OptionsColumn.ReadOnly = true;
+ this.gridColumn10.Tag = "sumSalary";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 10;
this.gridColumn10.Width = 112;
@@ -312,6 +322,7 @@
this.gridColumn11.MinWidth = 30;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.OptionsColumn.ReadOnly = true;
+ this.gridColumn11.Tag = "remark";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 11;
this.gridColumn11.Width = 112;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
index 7445425..13d4849 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
@@ -42,7 +42,7 @@
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(138, 44);
this.simpleButton1.TabIndex = 3;
- this.simpleButton1.Text = "鏌ヨ";
+ this.simpleButton1.Text = "璁剧疆";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// labelControl1
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index bc23e11..3fb517a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -93,8 +93,8 @@
var _obj = new
{
orgId = ucLookOrg1.GetId(),//涓诲缓
- beginDate = DateTime.Now.AddMonths(-1).ToString(),
- endDate = DateTime.Now.ToString()
+ beginDate = dateEdit1.EditValue.ToString(),
+ endDate = dateEdit2.EditValue.ToString()
};
var json = JsonConvert.SerializeObject(_obj);
try
--
Gitblit v1.9.3