구매내역 색상 및 필터 정렬 기능 추가, 삭제시 데이터 숨김처리하게
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
181210 chi NR구매등록시 이미지 표시 및 추가 기능
|
||||
181212 chi 구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가
|
||||
181210 chi NR구매등록시 이미지 표시 및 추가 기능
|
||||
NR구매목록에서 권한 없는 사람이 더블클릭으로 편집할 수 있는 버그 수정
|
||||
이미지 크기를 640*480 내에서 자동 조정 됨
|
||||
구매내역 내보내기 하면 완료 메세지 추가
|
||||
구매내역 검색 쿼리 정리 작업(간소화)
|
||||
|
||||
181207 chi 업체정보화면 에 담당자 목록 추가
|
||||
업체대표 및 담당자 테이블 데이터 추가
|
||||
품목에 이미지 확인 사항 추가
|
||||
|
||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
|
||||
// 지정되도록 할 수 있습니다.
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("18.12.10.1200")]
|
||||
[assembly: AssemblyFileVersion("18.12.10.1200")]
|
||||
[assembly: AssemblyVersion("18.12.13.0900")]
|
||||
[assembly: AssemblyFileVersion("18.12.13.0900")]
|
||||
|
||||
146
Project/_Common/fUserInfo.Designer.cs
generated
146
Project/_Common/fUserInfo.Designer.cs
generated
@@ -42,6 +42,7 @@
|
||||
System.Windows.Forms.Label label1;
|
||||
System.Windows.Forms.Label label2;
|
||||
System.Windows.Forms.Label label3;
|
||||
System.Windows.Forms.Label label4;
|
||||
this.idTextBox = new System.Windows.Forms.TextBox();
|
||||
this.bs = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsMSSQL = new Project.dsMSSQL();
|
||||
@@ -60,6 +61,7 @@
|
||||
this.textBox1 = new System.Windows.Forms.TextBox();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
this.textBox3 = new System.Windows.Forms.TextBox();
|
||||
this.tbKJPath = new System.Windows.Forms.TextBox();
|
||||
idLabel = new System.Windows.Forms.Label();
|
||||
passwordLabel = new System.Windows.Forms.Label();
|
||||
nameLabel = new System.Windows.Forms.Label();
|
||||
@@ -73,6 +75,7 @@
|
||||
label1 = new System.Windows.Forms.Label();
|
||||
label2 = new System.Windows.Forms.Label();
|
||||
label3 = new System.Windows.Forms.Label();
|
||||
label4 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
@@ -80,119 +83,119 @@
|
||||
// idLabel
|
||||
//
|
||||
idLabel.AutoSize = true;
|
||||
idLabel.Location = new System.Drawing.Point(22, 15);
|
||||
idLabel.Location = new System.Drawing.Point(33, 15);
|
||||
idLabel.Name = "idLabel";
|
||||
idLabel.Size = new System.Drawing.Size(19, 12);
|
||||
idLabel.Size = new System.Drawing.Size(53, 12);
|
||||
idLabel.TabIndex = 0;
|
||||
idLabel.Text = "id:";
|
||||
idLabel.Text = "사원번호";
|
||||
//
|
||||
// passwordLabel
|
||||
//
|
||||
passwordLabel.AutoSize = true;
|
||||
passwordLabel.Location = new System.Drawing.Point(22, 42);
|
||||
passwordLabel.Location = new System.Drawing.Point(33, 42);
|
||||
passwordLabel.Name = "passwordLabel";
|
||||
passwordLabel.Size = new System.Drawing.Size(65, 12);
|
||||
passwordLabel.Size = new System.Drawing.Size(53, 12);
|
||||
passwordLabel.TabIndex = 2;
|
||||
passwordLabel.Text = "password:";
|
||||
passwordLabel.Text = "비밀번호";
|
||||
//
|
||||
// nameLabel
|
||||
//
|
||||
nameLabel.AutoSize = true;
|
||||
nameLabel.Location = new System.Drawing.Point(22, 69);
|
||||
nameLabel.Location = new System.Drawing.Point(57, 69);
|
||||
nameLabel.Name = "nameLabel";
|
||||
nameLabel.Size = new System.Drawing.Size(41, 12);
|
||||
nameLabel.Size = new System.Drawing.Size(29, 12);
|
||||
nameLabel.TabIndex = 4;
|
||||
nameLabel.Text = "name:";
|
||||
nameLabel.Text = "이름";
|
||||
//
|
||||
// deptLabel
|
||||
//
|
||||
deptLabel.AutoSize = true;
|
||||
deptLabel.Location = new System.Drawing.Point(22, 122);
|
||||
deptLabel.Location = new System.Drawing.Point(317, 69);
|
||||
deptLabel.Name = "deptLabel";
|
||||
deptLabel.Size = new System.Drawing.Size(33, 12);
|
||||
deptLabel.Size = new System.Drawing.Size(29, 12);
|
||||
deptLabel.TabIndex = 8;
|
||||
deptLabel.Text = "dept:";
|
||||
deptLabel.Text = "부서";
|
||||
//
|
||||
// gradeLabel
|
||||
//
|
||||
gradeLabel.AutoSize = true;
|
||||
gradeLabel.Location = new System.Drawing.Point(22, 149);
|
||||
gradeLabel.Location = new System.Drawing.Point(317, 96);
|
||||
gradeLabel.Name = "gradeLabel";
|
||||
gradeLabel.Size = new System.Drawing.Size(41, 12);
|
||||
gradeLabel.Size = new System.Drawing.Size(29, 12);
|
||||
gradeLabel.TabIndex = 10;
|
||||
gradeLabel.Text = "grade:";
|
||||
gradeLabel.Text = "직책";
|
||||
//
|
||||
// emailLabel
|
||||
//
|
||||
emailLabel.AutoSize = true;
|
||||
emailLabel.Location = new System.Drawing.Point(22, 176);
|
||||
emailLabel.Location = new System.Drawing.Point(33, 122);
|
||||
emailLabel.Name = "emailLabel";
|
||||
emailLabel.Size = new System.Drawing.Size(40, 12);
|
||||
emailLabel.Size = new System.Drawing.Size(53, 12);
|
||||
emailLabel.TabIndex = 12;
|
||||
emailLabel.Text = "email:";
|
||||
emailLabel.Text = "전자메일";
|
||||
//
|
||||
// levelLabel
|
||||
//
|
||||
levelLabel.AutoSize = true;
|
||||
levelLabel.Location = new System.Drawing.Point(22, 257);
|
||||
levelLabel.Location = new System.Drawing.Point(319, 177);
|
||||
levelLabel.Name = "levelLabel";
|
||||
levelLabel.Size = new System.Drawing.Size(35, 12);
|
||||
levelLabel.Size = new System.Drawing.Size(29, 12);
|
||||
levelLabel.TabIndex = 18;
|
||||
levelLabel.Text = "level:";
|
||||
levelLabel.Text = "권한";
|
||||
//
|
||||
// indateLabel
|
||||
//
|
||||
indateLabel.AutoSize = true;
|
||||
indateLabel.Location = new System.Drawing.Point(22, 284);
|
||||
indateLabel.Location = new System.Drawing.Point(305, 15);
|
||||
indateLabel.Name = "indateLabel";
|
||||
indateLabel.Size = new System.Drawing.Size(43, 12);
|
||||
indateLabel.Size = new System.Drawing.Size(41, 12);
|
||||
indateLabel.TabIndex = 20;
|
||||
indateLabel.Text = "indate:";
|
||||
indateLabel.Text = "입사일";
|
||||
//
|
||||
// outdateLabel
|
||||
//
|
||||
outdateLabel.AutoSize = true;
|
||||
outdateLabel.Location = new System.Drawing.Point(22, 311);
|
||||
outdateLabel.Location = new System.Drawing.Point(305, 42);
|
||||
outdateLabel.Name = "outdateLabel";
|
||||
outdateLabel.Size = new System.Drawing.Size(50, 12);
|
||||
outdateLabel.Size = new System.Drawing.Size(41, 12);
|
||||
outdateLabel.TabIndex = 22;
|
||||
outdateLabel.Text = "outdate:";
|
||||
outdateLabel.Text = "퇴사일";
|
||||
//
|
||||
// memoLabel
|
||||
//
|
||||
memoLabel.AutoSize = true;
|
||||
memoLabel.Location = new System.Drawing.Point(22, 338);
|
||||
memoLabel.Location = new System.Drawing.Point(320, 119);
|
||||
memoLabel.Name = "memoLabel";
|
||||
memoLabel.Size = new System.Drawing.Size(45, 12);
|
||||
memoLabel.Size = new System.Drawing.Size(29, 12);
|
||||
memoLabel.TabIndex = 24;
|
||||
memoLabel.Text = "memo:";
|
||||
memoLabel.Text = "비고";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new System.Drawing.Point(22, 203);
|
||||
label1.Location = new System.Drawing.Point(21, 149);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new System.Drawing.Size(23, 12);
|
||||
label1.Size = new System.Drawing.Size(65, 12);
|
||||
label1.TabIndex = 14;
|
||||
label1.Text = "Tel";
|
||||
label1.Text = "사무실전화";
|
||||
//
|
||||
// label2
|
||||
//
|
||||
label2.AutoSize = true;
|
||||
label2.Location = new System.Drawing.Point(22, 230);
|
||||
label2.Location = new System.Drawing.Point(33, 176);
|
||||
label2.Name = "label2";
|
||||
label2.Size = new System.Drawing.Size(20, 12);
|
||||
label2.Size = new System.Drawing.Size(53, 12);
|
||||
label2.TabIndex = 16;
|
||||
label2.Text = "Hp";
|
||||
label2.Text = "휴대전화";
|
||||
//
|
||||
// label3
|
||||
//
|
||||
label3.AutoSize = true;
|
||||
label3.Location = new System.Drawing.Point(22, 95);
|
||||
label3.Location = new System.Drawing.Point(23, 95);
|
||||
label3.Name = "label3";
|
||||
label3.Size = new System.Drawing.Size(55, 12);
|
||||
label3.Size = new System.Drawing.Size(63, 12);
|
||||
label3.TabIndex = 6;
|
||||
label3.Text = "name(E)";
|
||||
label3.Text = "이름(영문)";
|
||||
//
|
||||
// idTextBox
|
||||
//
|
||||
@@ -225,23 +228,23 @@
|
||||
// deptTextBox
|
||||
//
|
||||
this.deptTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true));
|
||||
this.deptTextBox.Location = new System.Drawing.Point(93, 119);
|
||||
this.deptTextBox.Location = new System.Drawing.Point(355, 66);
|
||||
this.deptTextBox.Name = "deptTextBox";
|
||||
this.deptTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.deptTextBox.Size = new System.Drawing.Size(177, 21);
|
||||
this.deptTextBox.TabIndex = 9;
|
||||
//
|
||||
// gradeTextBox
|
||||
//
|
||||
this.gradeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "grade", true));
|
||||
this.gradeTextBox.Location = new System.Drawing.Point(93, 146);
|
||||
this.gradeTextBox.Location = new System.Drawing.Point(355, 93);
|
||||
this.gradeTextBox.Name = "gradeTextBox";
|
||||
this.gradeTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.gradeTextBox.Size = new System.Drawing.Size(177, 21);
|
||||
this.gradeTextBox.TabIndex = 11;
|
||||
//
|
||||
// emailTextBox
|
||||
//
|
||||
this.emailTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "email", true));
|
||||
this.emailTextBox.Location = new System.Drawing.Point(93, 173);
|
||||
this.emailTextBox.Location = new System.Drawing.Point(93, 119);
|
||||
this.emailTextBox.Name = "emailTextBox";
|
||||
this.emailTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.emailTextBox.TabIndex = 13;
|
||||
@@ -249,33 +252,35 @@
|
||||
// levelTextBox
|
||||
//
|
||||
this.levelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true));
|
||||
this.levelTextBox.Location = new System.Drawing.Point(93, 254);
|
||||
this.levelTextBox.Location = new System.Drawing.Point(355, 173);
|
||||
this.levelTextBox.Name = "levelTextBox";
|
||||
this.levelTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.levelTextBox.ReadOnly = true;
|
||||
this.levelTextBox.Size = new System.Drawing.Size(177, 21);
|
||||
this.levelTextBox.TabIndex = 19;
|
||||
//
|
||||
// indateTextBox
|
||||
//
|
||||
this.indateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "indate", true));
|
||||
this.indateTextBox.Location = new System.Drawing.Point(93, 281);
|
||||
this.indateTextBox.Location = new System.Drawing.Point(355, 12);
|
||||
this.indateTextBox.Name = "indateTextBox";
|
||||
this.indateTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.indateTextBox.Size = new System.Drawing.Size(177, 21);
|
||||
this.indateTextBox.TabIndex = 21;
|
||||
//
|
||||
// outdateTextBox
|
||||
//
|
||||
this.outdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "outdate", true));
|
||||
this.outdateTextBox.Location = new System.Drawing.Point(93, 308);
|
||||
this.outdateTextBox.Location = new System.Drawing.Point(355, 39);
|
||||
this.outdateTextBox.Name = "outdateTextBox";
|
||||
this.outdateTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.outdateTextBox.Size = new System.Drawing.Size(177, 21);
|
||||
this.outdateTextBox.TabIndex = 23;
|
||||
//
|
||||
// memoTextBox
|
||||
//
|
||||
this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
|
||||
this.memoTextBox.Location = new System.Drawing.Point(93, 335);
|
||||
this.memoTextBox.Location = new System.Drawing.Point(355, 122);
|
||||
this.memoTextBox.Multiline = true;
|
||||
this.memoTextBox.Name = "memoTextBox";
|
||||
this.memoTextBox.Size = new System.Drawing.Size(200, 21);
|
||||
this.memoTextBox.Size = new System.Drawing.Size(177, 45);
|
||||
this.memoTextBox.TabIndex = 25;
|
||||
//
|
||||
// button1
|
||||
@@ -284,17 +289,17 @@
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(200, 21);
|
||||
this.button1.TabIndex = 3;
|
||||
this.button1.Text = "Change";
|
||||
this.button1.Text = "변경";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// button2
|
||||
//
|
||||
this.button2.Location = new System.Drawing.Point(93, 363);
|
||||
this.button2.Location = new System.Drawing.Point(93, 231);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Size = new System.Drawing.Size(200, 30);
|
||||
this.button2.Size = new System.Drawing.Size(439, 30);
|
||||
this.button2.TabIndex = 26;
|
||||
this.button2.Text = "Save";
|
||||
this.button2.Text = "저장(&S)";
|
||||
this.button2.UseVisualStyleBackColor = true;
|
||||
this.button2.Click += new System.EventHandler(this.button2_Click);
|
||||
//
|
||||
@@ -315,7 +320,7 @@
|
||||
// textBox1
|
||||
//
|
||||
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "tel", true));
|
||||
this.textBox1.Location = new System.Drawing.Point(93, 200);
|
||||
this.textBox1.Location = new System.Drawing.Point(93, 146);
|
||||
this.textBox1.Name = "textBox1";
|
||||
this.textBox1.Size = new System.Drawing.Size(200, 21);
|
||||
this.textBox1.TabIndex = 15;
|
||||
@@ -323,7 +328,7 @@
|
||||
// textBox2
|
||||
//
|
||||
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hp", true));
|
||||
this.textBox2.Location = new System.Drawing.Point(93, 227);
|
||||
this.textBox2.Location = new System.Drawing.Point(93, 173);
|
||||
this.textBox2.Name = "textBox2";
|
||||
this.textBox2.Size = new System.Drawing.Size(200, 21);
|
||||
this.textBox2.TabIndex = 17;
|
||||
@@ -336,11 +341,31 @@
|
||||
this.textBox3.Size = new System.Drawing.Size(200, 21);
|
||||
this.textBox3.TabIndex = 7;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
label4.AutoSize = true;
|
||||
label4.Location = new System.Drawing.Point(17, 204);
|
||||
label4.Name = "label4";
|
||||
label4.Size = new System.Drawing.Size(69, 12);
|
||||
label4.TabIndex = 27;
|
||||
label4.Text = "견적서 위치";
|
||||
//
|
||||
// tbKJPath
|
||||
//
|
||||
this.tbKJPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true));
|
||||
this.tbKJPath.Location = new System.Drawing.Point(93, 200);
|
||||
this.tbKJPath.Name = "tbKJPath";
|
||||
this.tbKJPath.ReadOnly = true;
|
||||
this.tbKJPath.Size = new System.Drawing.Size(439, 21);
|
||||
this.tbKJPath.TabIndex = 28;
|
||||
//
|
||||
// fUserInfo
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(305, 402);
|
||||
this.ClientSize = new System.Drawing.Size(542, 270);
|
||||
this.Controls.Add(label4);
|
||||
this.Controls.Add(this.tbKJPath);
|
||||
this.Controls.Add(label3);
|
||||
this.Controls.Add(this.textBox3);
|
||||
this.Controls.Add(label2);
|
||||
@@ -372,7 +397,7 @@
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "fUserInfo";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "fUserInfo";
|
||||
this.Text = "사용자 정보";
|
||||
this.Load += new System.EventHandler(this.fUserInfo_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
|
||||
@@ -401,5 +426,6 @@
|
||||
private System.Windows.Forms.TextBox textBox1;
|
||||
private System.Windows.Forms.TextBox textBox2;
|
||||
private System.Windows.Forms.TextBox textBox3;
|
||||
private System.Windows.Forms.TextBox tbKJPath;
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,10 @@ namespace Project._Common
|
||||
{
|
||||
// TODO: 이 코드는 데이터를 'dsMSSQL.Users' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
|
||||
this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no);
|
||||
tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept);
|
||||
tbKJPath.Tag = tbKJPath.Text;
|
||||
if (FCOMMON.info.Login.level > 4) tbKJPath.Enabled = true;
|
||||
else tbKJPath.Enabled = false;
|
||||
//this.bs.Filter = "id='" + FCOMMON.info.Login.no + "'";
|
||||
}
|
||||
|
||||
@@ -63,6 +67,18 @@ namespace Project._Common
|
||||
this.bs.EndEdit();
|
||||
try
|
||||
{
|
||||
if (tbKJPath.Enabled)
|
||||
{
|
||||
if (tbKJPath.Text.Trim() != tbKJPath.Tag.ToString().Trim())
|
||||
{
|
||||
if (!FCOMMON.DBM.setPathKJ(FCOMMON.info.Login.dept, tbKJPath.Text.Trim()))
|
||||
{
|
||||
FCOMMON.Util.MsgE("견적서 폴더 업데이트 실패");
|
||||
}
|
||||
else Pub.log.AddI("견적서폴더 업뎅트 : " + tbKJPath.Text);
|
||||
}
|
||||
}
|
||||
|
||||
var cnt = this.tam.UpdateAll(this.dsMSSQL);
|
||||
Util.MsgI(string.Format("{0}건의 자료가 업데이트 됨", cnt));
|
||||
DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
|
||||
@@ -168,4 +168,7 @@
|
||||
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>248, 17</value>
|
||||
</metadata>
|
||||
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
</root>
|
||||
30
Project/fMain.Designer.cs
generated
30
Project/fMain.Designer.cs
generated
@@ -88,6 +88,7 @@
|
||||
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
|
||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
|
||||
@@ -526,10 +527,11 @@
|
||||
this.toolStripButton1,
|
||||
this.toolStripButton2,
|
||||
this.toolStripButton3,
|
||||
this.toolStripButton4});
|
||||
this.toolStripButton4,
|
||||
this.toolStripButton5});
|
||||
this.toolStrip.Location = new System.Drawing.Point(0, 4);
|
||||
this.toolStrip.Name = "toolStrip";
|
||||
this.toolStrip.Size = new System.Drawing.Size(25, 119);
|
||||
this.toolStrip.Size = new System.Drawing.Size(25, 146);
|
||||
this.toolStrip.TabIndex = 32;
|
||||
this.toolStrip.Text = "ToolStrip";
|
||||
//
|
||||
@@ -549,7 +551,7 @@
|
||||
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
|
||||
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton2.Name = "toolStripButton2";
|
||||
this.toolStripButton2.Size = new System.Drawing.Size(23, 24);
|
||||
this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
|
||||
this.toolStripButton2.Text = "구매신청";
|
||||
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
|
||||
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
|
||||
@@ -560,7 +562,7 @@
|
||||
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
|
||||
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton3.Name = "toolStripButton3";
|
||||
this.toolStripButton3.Size = new System.Drawing.Size(23, 24);
|
||||
this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
|
||||
this.toolStripButton3.Text = "toolStripButton3";
|
||||
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
|
||||
//
|
||||
@@ -570,10 +572,21 @@
|
||||
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
|
||||
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton4.Name = "toolStripButton4";
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(23, 24);
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
|
||||
this.toolStripButton4.Text = "toolStripButton4";
|
||||
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
|
||||
//
|
||||
// toolStripButton5
|
||||
//
|
||||
this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
|
||||
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton5.Name = "toolStripButton5";
|
||||
this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
|
||||
this.toolStripButton5.Text = "toolStripButton5";
|
||||
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
|
||||
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
|
||||
//
|
||||
// tabControl1
|
||||
//
|
||||
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
|
||||
@@ -585,7 +598,7 @@
|
||||
this.tabControl1.Name = "tabControl1";
|
||||
this.tabControl1.SelectedIndex = 0;
|
||||
this.tabControl1.ShowToolTips = true;
|
||||
this.tabControl1.Size = new System.Drawing.Size(1009, 594);
|
||||
this.tabControl1.Size = new System.Drawing.Size(1009, 569);
|
||||
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
|
||||
this.tabControl1.TabIndex = 34;
|
||||
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
|
||||
@@ -598,7 +611,7 @@
|
||||
this.tabPage1.Location = new System.Drawing.Point(4, 29);
|
||||
this.tabPage1.Name = "tabPage1";
|
||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
|
||||
this.tabPage1.Size = new System.Drawing.Size(1001, 561);
|
||||
this.tabPage1.Size = new System.Drawing.Size(1001, 536);
|
||||
this.tabPage1.TabIndex = 0;
|
||||
this.tabPage1.Text = "요약";
|
||||
//
|
||||
@@ -608,7 +621,7 @@
|
||||
// toolStripContainer1.ContentPanel
|
||||
//
|
||||
this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1);
|
||||
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 594);
|
||||
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569);
|
||||
this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load);
|
||||
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
//
|
||||
@@ -719,6 +732,7 @@
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
|
||||
private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripContainer toolStripContainer1;
|
||||
private System.Windows.Forms.ToolStripButton toolStripButton5;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -82,21 +82,33 @@ namespace Project
|
||||
|
||||
tmDisplay.Start(); //display timer
|
||||
|
||||
Func_Login();
|
||||
|
||||
bw.RunWorkerAsync(); //background worker
|
||||
|
||||
}
|
||||
|
||||
void Func_Login()
|
||||
{
|
||||
Dialog.fLogin flogIn = new Dialog.fLogin();
|
||||
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||
Application.ExitThread();
|
||||
|
||||
if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
|
||||
|
||||
sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3})",
|
||||
sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3}) - {4}",
|
||||
FCOMMON.info.Login.title,
|
||||
FCOMMON.info.Login.no,
|
||||
FCOMMON.info.Login.nameK,
|
||||
FCOMMON.info.Login.tel);
|
||||
FCOMMON.info.Login.tel,
|
||||
FCOMMON.info.Login.dept);
|
||||
Pub.log.Add("Program Start");
|
||||
|
||||
bw.RunWorkerAsync(); //background worker
|
||||
Func_RunStartForm();
|
||||
}
|
||||
void Func_RunStartForm()
|
||||
{
|
||||
//시작폼 확인
|
||||
if (Pub.setting.startForm == eFormList.NR구매관리)
|
||||
{
|
||||
menu_nrpurchase();
|
||||
@@ -459,5 +471,22 @@ namespace Project
|
||||
e.Graphics.DrawString("X", this.Font, Brushes.Black, tabControl1.Right - 50, tabControl1.Top);
|
||||
}
|
||||
|
||||
private void toolStripButton5_Click(object sender, EventArgs e)
|
||||
{
|
||||
if(this.tabControl1.TabPages.Count > 1)
|
||||
{
|
||||
while(tabControl1.TabPages.Count > 1)
|
||||
{
|
||||
var tab = this.tabControl1.TabPages[1];
|
||||
var f = tab.Controls[0] as System.Windows.Forms.Form;
|
||||
f.Close();
|
||||
f.Dispose();
|
||||
tabControl1.TabPages.Remove(tab);
|
||||
this.tabControl1.Refresh();
|
||||
}
|
||||
}
|
||||
Func_Login();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,14 +155,14 @@
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
|
||||
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
|
||||
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/03vz/tXX+/3bNb3w39dzrf/3
|
||||
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/kzvz/tXX+/3bNrnw39dzrf/3
|
||||
T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d
|
||||
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/4kbe/7GzKt4C9UKAUnN
|
||||
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/7Ebe/7GzKt4C9UKAUnN
|
||||
zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV
|
||||
3//t93YTNKB+++QfcXNKW6BaEcAroffvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
|
||||
51X+SJhZYQrVhgBJzR2n3Lta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
|
||||
3//t93YTNKB+++QfcXNKW6BaEcAtpvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
|
||||
51X+SJhZYQrVhgBJzR2nnLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
|
||||
q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q
|
||||
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgAM56GbRv3GrQAAAABJRU5ErkJggg==
|
||||
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgC1jKF7RfhP4wAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@@ -195,6 +195,18 @@
|
||||
/6JfwD1zwJ0PBKGYjG27jpiCU51uaEW9AoiwfbM9P6TLZjMz+NZ7Aln5ja07LKbgWKsDS98j/IIklDx+
|
||||
pXOIpnL0Y6kIJxSsxLOQ4jKW6cyZrIrZuQVs2lJrClq7XGiwd/DrabFfxSHbJX7O7KjY165rsPE9s2Wz
|
||||
mRlsPdlcFvzP7ywKIQR/ADe1RkU7UZGnAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFBSURBVDhPnZOxSgNBFEXzO5b6ATZLCrETYmWhnRAsLBRt
|
||||
7FNYCApCegtNkypFCgshjaAiSkCbBBQVAyaiaUYZPRNuMm93qyycZPLm3bOZndmCn+IqxBeF9kvfn111
|
||||
DQeN68Be7d5vHdUNRsIPAkieet/+fTA0UIupNHt+eWN/IpGA5lbny1fW5gzUGo+/gf7QBYGR8NG8644m
|
||||
/wPn1R1f3y6OoRYLREaQF86TSLS0upsV0PzWbhnSgpPb0T8wAtZJ4+D5ITQrrDFzCkuwUCpbwcXhehCw
|
||||
DAk0Zk5hYDeMgC1kF2hUWKTDEiSLK1aQbFb96c1nCMRwkJgjeHz5E+i8fliBwoJQGnpiwXyxlBXoWyHV
|
||||
0gKWawRsI0Webt7x5Y6CefpnZpOJgBeEkyXYY+BJA+sF7gqEx+fAORcG01zOOf8HE8Uw/ZN/lX0AAAAA
|
||||
SUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
||||
Reference in New Issue
Block a user