From 465f62c705dc6f0a1b161d18bf9968d69cdabfe5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 十月 2024 15:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index d91a953..3b970fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -41,7 +41,6 @@
this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
@@ -61,6 +60,7 @@
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_name = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_isStatus = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -82,11 +82,11 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(772, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = null;
//
// xtraTabControl1
//
@@ -216,17 +216,6 @@
this.labelControl13.Size = new System.Drawing.Size(68, 21);
this.labelControl13.TabIndex = 139;
this.labelControl13.Text = "瀹℃牳浜猴細";
- //
- // txt_isStatus
- //
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Checked = true;
- this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
- this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 138;
- this.txt_isStatus.UseVisualStyleBackColor = true;
//
// labelControl10
//
@@ -415,6 +404,17 @@
this.labelControl2.TabIndex = 2;
this.labelControl2.Text = "缁勭粐鍚嶇О锛�";
//
+ // txt_isStatus
+ //
+ this.txt_isStatus.AutoSize = true;
+ this.txt_isStatus.Checked = true;
+ this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+ this.txt_isStatus.TabIndex = 138;
+ this.txt_isStatus.UseVisualStyleBackColor = true;
+ //
// Organization
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -466,12 +466,12 @@
private DevExpress.XtraEditors.TextEdit txt_factory;
private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.LabelControl labelControl10;
- private System.Windows.Forms.CheckBox txt_isStatus;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.LabelControl labelControl15;
private System.Windows.Forms.Label txt_checkStatus;
+ private System.Windows.Forms.CheckBox txt_isStatus;
}
}
\ No newline at end of file
--
Gitblit v1.9.3