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_MesJSSalary.Designer.cs | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
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);
}
--
Gitblit v1.9.3