This commit is contained in:
chi
2020-06-01 16:01:27 +09:00
parent 2bb7472cb0
commit 96d6628404
15 changed files with 1338 additions and 966 deletions

View File

@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserList));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.dsMSSQL = new Project.dsMSSQL();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new Project.dsMSSQLTableAdapters.UsersTableAdapter();
@@ -63,10 +63,10 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cmbdept = new System.Windows.Forms.ToolStripComboBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.processs = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -111,6 +111,7 @@
this.tam.ItemsTableAdapter = null;
this.tam.LineCodeTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.SPMasterTableAdapter = null;
this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
this.tam.UserGroupTableAdapter = null;
this.tam.UsersTableAdapter = this.ta;
@@ -368,6 +369,19 @@
this.cmbdept.Name = "cmbdept";
this.cmbdept.Size = new System.Drawing.Size(400, 25);
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel2.Text = "공정";
//
// tbProcess
//
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(100, 25);
this.tbProcess.Text = "%";
this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btRef
//
this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
@@ -386,70 +400,58 @@
this.textBox1.Size = new System.Drawing.Size(908, 21);
this.textBox1.TabIndex = 3;
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel2.Text = "공정";
//
// tbProcess
//
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(100, 25);
this.tbProcess.Text = "%";
this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// dvc_id
//
this.dvc_id.DataPropertyName = "id";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_id.DefaultCellStyle = dataGridViewCellStyle3;
this.dvc_id.HeaderText = "id";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_id.DefaultCellStyle = dataGridViewCellStyle1;
this.dvc_id.HeaderText = "ID";
this.dvc_id.Name = "dvc_id";
this.dvc_id.Width = 40;
//
// processs
//
this.processs.DataPropertyName = "processs";
this.processs.HeaderText = "processs";
this.processs.HeaderText = "공정";
this.processs.Name = "processs";
//
// dvc_level
//
this.dvc_level.DataPropertyName = "level";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.dvc_level.DefaultCellStyle = dataGridViewCellStyle4;
this.dvc_level.HeaderText = "level";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.dvc_level.DefaultCellStyle = dataGridViewCellStyle2;
this.dvc_level.HeaderText = "레벨";
this.dvc_level.Name = "dvc_level";
this.dvc_level.Width = 56;
//
// nameDataGridViewTextBoxColumn
//
this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
this.nameDataGridViewTextBoxColumn.HeaderText = "name";
this.nameDataGridViewTextBoxColumn.HeaderText = "성명";
this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
this.nameDataGridViewTextBoxColumn.Width = 62;
//
// nameEDataGridViewTextBoxColumn
//
this.nameEDataGridViewTextBoxColumn.DataPropertyName = "nameE";
this.nameEDataGridViewTextBoxColumn.HeaderText = "nameE";
this.nameEDataGridViewTextBoxColumn.HeaderText = "성명(영문)";
this.nameEDataGridViewTextBoxColumn.Name = "nameEDataGridViewTextBoxColumn";
this.nameEDataGridViewTextBoxColumn.Width = 70;
//
// deptDataGridViewTextBoxColumn
//
this.deptDataGridViewTextBoxColumn.DataPropertyName = "dept";
this.deptDataGridViewTextBoxColumn.HeaderText = "dept";
this.deptDataGridViewTextBoxColumn.HeaderText = "부서";
this.deptDataGridViewTextBoxColumn.Name = "deptDataGridViewTextBoxColumn";
this.deptDataGridViewTextBoxColumn.Visible = false;
this.deptDataGridViewTextBoxColumn.Width = 54;
//
// gradeDataGridViewTextBoxColumn
//
this.gradeDataGridViewTextBoxColumn.DataPropertyName = "grade";
this.gradeDataGridViewTextBoxColumn.HeaderText = "grade";
this.gradeDataGridViewTextBoxColumn.HeaderText = "직책";
this.gradeDataGridViewTextBoxColumn.Name = "gradeDataGridViewTextBoxColumn";
this.gradeDataGridViewTextBoxColumn.Width = 62;
//
@@ -463,28 +465,28 @@
// indateDataGridViewTextBoxColumn
//
this.indateDataGridViewTextBoxColumn.DataPropertyName = "indate";
this.indateDataGridViewTextBoxColumn.HeaderText = "indate";
this.indateDataGridViewTextBoxColumn.HeaderText = "입사일";
this.indateDataGridViewTextBoxColumn.Name = "indateDataGridViewTextBoxColumn";
this.indateDataGridViewTextBoxColumn.Width = 64;
//
// outdateDataGridViewTextBoxColumn
//
this.outdateDataGridViewTextBoxColumn.DataPropertyName = "outdate";
this.outdateDataGridViewTextBoxColumn.HeaderText = "outdate";
this.outdateDataGridViewTextBoxColumn.HeaderText = "퇴사일";
this.outdateDataGridViewTextBoxColumn.Name = "outdateDataGridViewTextBoxColumn";
this.outdateDataGridViewTextBoxColumn.Width = 71;
//
// telDataGridViewTextBoxColumn
//
this.telDataGridViewTextBoxColumn.DataPropertyName = "tel";
this.telDataGridViewTextBoxColumn.HeaderText = "tel";
this.telDataGridViewTextBoxColumn.HeaderText = "내선";
this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn";
this.telDataGridViewTextBoxColumn.Width = 43;
//
// hpDataGridViewTextBoxColumn
//
this.hpDataGridViewTextBoxColumn.DataPropertyName = "hp";
this.hpDataGridViewTextBoxColumn.HeaderText = "hp";
this.hpDataGridViewTextBoxColumn.HeaderText = "전화";
this.hpDataGridViewTextBoxColumn.Name = "hpDataGridViewTextBoxColumn";
this.hpDataGridViewTextBoxColumn.Width = 44;
//
@@ -498,7 +500,7 @@
// memoDataGridViewTextBoxColumn
//
this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo";
this.memoDataGridViewTextBoxColumn.HeaderText = "memo";
this.memoDataGridViewTextBoxColumn.HeaderText = "비고";
this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
this.memoDataGridViewTextBoxColumn.Width = 66;
//

View File

@@ -29,7 +29,8 @@ namespace Project._Common
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["password"] = Pub.MakePasswordEnc("0");
e.Row["level"] = 1;
e.Row["level"] = 1;
e.Row["dept"] = cmbdept.Text;
}
private void __Load(object sender, EventArgs e)
@@ -39,8 +40,11 @@ namespace Project._Common
this.Show();
Application.DoEvents();
if(FCOMMON.info.Login.level > 9)
cmbdept.Enabled = FCOMMON.info.Login.level > 9;
if (FCOMMON.info.Login.level > 4)
{
this.dvc_id.Visible = true;
this.btDevel.Visible = true;
this.dv1.EditMode = DataGridViewEditMode.EditOnKeystrokeOrF2;
}
@@ -48,9 +52,9 @@ namespace Project._Common
{
this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
this.dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
this.btDevel.Visible = false;
this.btDevel.Visible = true;
this.textBox1.Enabled = false;
this.dvc_id.Visible = false;
this.dvc_id.Visible = true;
this.dvc_level.Visible = false;
this.usersBindingNavigatorSaveItem.Enabled = false;
this.bindingNavigatorAddNewItem.Enabled = false;
@@ -159,6 +163,7 @@ namespace Project._Common
this.dsMSSQL.Users.Clear();
this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text, tbProcess.Text.Trim());
this.dsMSSQL.Users.AcceptChanges();
this.dv1.AutoResizeColumns();
}
private void autoResizeColumnToolStripMenuItem_Click(object sender, EventArgs e)