From d19fcd70a3b11339eb0c50b5c734eeca855a9a95 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 二月 2025 14:05:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/公用模块/FrmLogin.designer.cs | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
index d63e3f9..b3a6adc 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.designer.cs"
@@ -50,6 +50,8 @@
this.cmbUser = new System.Windows.Forms.ComboBox();
this.cmbHOrg = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.textBox1 = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// label1
@@ -66,8 +68,8 @@
// txtUser
//
this.txtUser.ImeMode = System.Windows.Forms.ImeMode.On;
- this.txtUser.Location = new System.Drawing.Point(103, 159);
- this.txtUser.Margin = new System.Windows.Forms.Padding(4);
+ this.txtUser.Location = new System.Drawing.Point(104, 186);
+ this.txtUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUser.Name = "txtUser";
this.txtUser.Size = new System.Drawing.Size(221, 25);
this.txtUser.TabIndex = 1;
@@ -78,7 +80,7 @@
//
this.txtPsd.ImeMode = System.Windows.Forms.ImeMode.On;
this.txtPsd.Location = new System.Drawing.Point(463, 362);
- this.txtPsd.Margin = new System.Windows.Forms.Padding(4);
+ this.txtPsd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPsd.Name = "txtPsd";
this.txtPsd.PasswordChar = '*';
this.txtPsd.Size = new System.Drawing.Size(221, 25);
@@ -99,7 +101,7 @@
// btnOK
//
this.btnOK.Location = new System.Drawing.Point(521, 424);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(108, 31);
this.btnOK.TabIndex = 4;
@@ -110,7 +112,7 @@
// button2
//
this.button2.Location = new System.Drawing.Point(669, 424);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(108, 31);
this.button2.TabIndex = 5;
@@ -135,7 +137,7 @@
this.cmbAccount.FormattingEnabled = true;
this.cmbAccount.ImeMode = System.Windows.Forms.ImeMode.On;
this.cmbAccount.Location = new System.Drawing.Point(463, 274);
- this.cmbAccount.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbAccount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbAccount.Name = "cmbAccount";
this.cmbAccount.Size = new System.Drawing.Size(221, 23);
this.cmbAccount.TabIndex = 7;
@@ -160,7 +162,7 @@
this.chkRemember.AutoSize = true;
this.chkRemember.BackColor = System.Drawing.Color.White;
this.chkRemember.Location = new System.Drawing.Point(693, 369);
- this.chkRemember.Margin = new System.Windows.Forms.Padding(4);
+ this.chkRemember.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkRemember.Name = "chkRemember";
this.chkRemember.Size = new System.Drawing.Size(89, 19);
this.chkRemember.TabIndex = 9;
@@ -236,7 +238,7 @@
//
this.cmbUser.FormattingEnabled = true;
this.cmbUser.Location = new System.Drawing.Point(463, 321);
- this.cmbUser.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(221, 23);
this.cmbUser.TabIndex = 16;
@@ -247,7 +249,7 @@
this.cmbHOrg.FormattingEnabled = true;
this.cmbHOrg.ImeMode = System.Windows.Forms.ImeMode.On;
this.cmbHOrg.Location = new System.Drawing.Point(463, 234);
- this.cmbHOrg.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHOrg.Name = "cmbHOrg";
this.cmbHOrg.Size = new System.Drawing.Size(221, 23);
this.cmbHOrg.TabIndex = 18;
@@ -263,12 +265,36 @@
this.label5.TabIndex = 17;
this.label5.Text = "缁� 缁�:";
//
+ // button1
+ //
+ this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
+ this.button1.Location = new System.Drawing.Point(359, 424);
+ this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(108, 31);
+ this.button1.TabIndex = 19;
+ this.button1.Text = "鍒峰崱鐧婚檰";
+ this.button1.UseVisualStyleBackColor = false;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // textBox1
+ //
+ this.textBox1.ImeMode = System.Windows.Forms.ImeMode.On;
+ this.textBox1.Location = new System.Drawing.Point(463, 186);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(221, 25);
+ this.textBox1.TabIndex = 20;
+ this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
+ //
// FrmLogin
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.ClientSize = new System.Drawing.Size(817, 501);
+ this.Controls.Add(this.textBox1);
+ this.Controls.Add(this.button1);
this.Controls.Add(this.cmbHOrg);
this.Controls.Add(this.label5);
this.Controls.Add(this.cmbUser);
@@ -290,7 +316,7 @@
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.ImeMode = System.Windows.Forms.ImeMode.On;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmLogin";
@@ -324,6 +350,8 @@
private System.Windows.Forms.ComboBox cmbUser;
private System.Windows.Forms.ComboBox cmbHOrg;
private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.TextBox textBox1;
}
}
--
Gitblit v1.9.1