B70340 1 ano atrás
pai
commit
0bfee37632

BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/641e57f6-8b87-4df0-8cf9-0956324e6829.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/6576265a-87a2-4668-af29-f92ff8f78634.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/7c7cb303-4c05-4fd7-ba4b-68fd8b8a3236.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/ae99de40-ad99-4291-9fa4-8ddbf36e0327.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/ee07aafc-f9b6-4d11-ad75-7c9e373ccc73.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/FileContentIndex/f8b068c0-8a51-4250-91b8-e6032dc845bc.vsidx Ver arquivo


BIN
.vs/HSKIN-MIS-SYS/v17/.suo Ver arquivo


+ 1
- 1
GRAMS-SYS/00、Module/SQL_休假與加班.vb Ver arquivo

@@ -55,7 +55,7 @@
55 55
                        萬年曆 ON 人事請假單.日期 = 萬年曆.日期 INNER JOIN
56 56
                        ras_Users ON 人事請假單.員工編號 = ras_Users.DIN
57 57
                 WHERE (人事請假單.是否生效 LIKE N'已核准') AND (人事請假單.請假類別 NOT LIKE N'國定假日') AND (人事請假單.請假類別 NOT LIKE N'未到') AND 
58
-                      (人事請假單.請假類別 NOT LIKE N'離職')  AND (人事請假單.日期 LIKE N'" & PA & "%')
58
+                      (人事請假單.請假類別 NOT LIKE N'離職')  AND (人事請假單.員工編號 LIKE N'" & PA & "%')
59 59
                 ORDER BY ras_Users.UserName, 人事請假單.日期"
60 60
         CmdSet_For_DGV()
61 61
     End Sub

+ 50
- 24
GRAMS-SYS/01、排班管理/排班明細.vb Ver arquivo

@@ -72,18 +72,7 @@ Public Class 排班明細
72 72
         conn.Close()
73 73
     End Sub
74 74
     Private Sub 班表鎖定變化()
75
-        If 鎖定_bt.Enabled = False Then
76
-            存檔_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False
77
-            For no As Integer = 1 To 20
78
-                Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
79
-                Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
80
-                Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
81
-                Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
82
-                Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
83
-                Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
84
-                姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
85
-            Next
86
-        Else
75
+        If gUserName = "*系統管理者" Then
87 76
             存檔_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True
88 77
             For no As Integer = 1 To 20
89 78
                 Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
@@ -94,6 +83,30 @@ Public Class 排班明細
94 83
                 Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
95 84
                 姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
96 85
             Next
86
+        Else
87
+            If 鎖定_bt.Enabled = False Then
88
+                存檔_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False
89
+                For no As Integer = 1 To 20
90
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
91
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
92
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
93
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
94
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
95
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
96
+                    姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
97
+                Next
98
+            Else
99
+                存檔_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True
100
+                For no As Integer = 1 To 20
101
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
102
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
103
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
104
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
105
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
106
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
107
+                    姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
108
+                Next
109
+            End If
97 110
         End If
98 111
     End Sub
99 112
     Private Sub 進度條變化1()
@@ -511,18 +524,7 @@ Public Class 排班明細
511 524
         行(9) = 行(8) + 行(0) : 行(10) = 行(9) + 行(0) : 行(11) = 行(10) + 行(0) : 行(12) = 行(11) + 行(0) : 行(13) = 行(12) + 行(0) : 行(14) = 行(13) + 行(0) : 行(15) = 行(14) + 行(0)
512 525
         行(16) = 行(15) + 行(0) : 行(17) = 行(16) + 行(0) : 行(18) = 行(17) + 行(0) : 行(19) = 行(18) + 行(0) : 行(20) = 行(19) + 行(0)
513 526
         '--------------複製權限---------------------------
514
-        If CC(17) = False Then
515
-            存檔_bt.Enabled = False : 複製班表_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False : 複製班表_bt.Enabled = False
516
-            For no As Integer = 1 To 20
517
-                Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
518
-                Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
519
-                Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
520
-                Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
521
-                Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
522
-                Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
523
-                姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
524
-            Next
525
-        Else
527
+        If gUserName = "*系統管理者" Then
526 528
             存檔_bt.Enabled = True : 複製班表_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True : 複製班表_bt.Enabled = True
527 529
             For no As Integer = 1 To 20
528 530
                 Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
@@ -533,6 +535,30 @@ Public Class 排班明細
533 535
                 Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
534 536
                 姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
535 537
             Next
538
+        Else
539
+            If CC(17) = False Then
540
+                存檔_bt.Enabled = False : 複製班表_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False : 複製班表_bt.Enabled = False
541
+                For no As Integer = 1 To 20
542
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
543
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
544
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
545
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
546
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
547
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
548
+                    姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
549
+                Next
550
+            Else
551
+                存檔_bt.Enabled = True : 複製班表_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True : 複製班表_bt.Enabled = True
552
+                For no As Integer = 1 To 20
553
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
554
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
555
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
556
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
557
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
558
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
559
+                    姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
560
+                Next
561
+            End If
536 562
         End If
537 563
         年_lb.Text = PA : 月_lb.Text = PA1
538 564
     End Sub

+ 50
- 24
GRAMS-SYS/01、排班管理/排班明細_參考.vb Ver arquivo

@@ -72,18 +72,7 @@ Public Class 排班明細_參考
72 72
         conn.Close()
73 73
     End Sub
74 74
     Private Sub 班表鎖定變化()
75
-        If 鎖定_bt.Enabled = False Then
76
-            存檔_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False
77
-            For no As Integer = 1 To 20
78
-                Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
79
-                Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
80
-                Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
81
-                Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
82
-                Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
83
-                Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
84
-                姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
85
-            Next
86
-        Else
75
+        If gUserName = "*系統管理者" Then
87 76
             存檔_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True
88 77
             For no As Integer = 1 To 20
89 78
                 Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
@@ -94,6 +83,30 @@ Public Class 排班明細_參考
94 83
                 Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
95 84
                 姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
96 85
             Next
86
+        Else
87
+            If 鎖定_bt.Enabled = False Then
88
+                存檔_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False
89
+                For no As Integer = 1 To 20
90
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
91
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
92
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
93
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
94
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
95
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
96
+                    姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
97
+                Next
98
+            Else
99
+                存檔_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True
100
+                For no As Integer = 1 To 20
101
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
102
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
103
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
104
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
105
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
106
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
107
+                    姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
108
+                Next
109
+            End If
97 110
         End If
98 111
     End Sub
99 112
     Private Sub 進度條變化1()
@@ -511,18 +524,7 @@ Public Class 排班明細_參考
511 524
         行(9) = 行(8) + 行(0) : 行(10) = 行(9) + 行(0) : 行(11) = 行(10) + 行(0) : 行(12) = 行(11) + 行(0) : 行(13) = 行(12) + 行(0) : 行(14) = 行(13) + 行(0) : 行(15) = 行(14) + 行(0)
512 525
         行(16) = 行(15) + 行(0) : 行(17) = 行(16) + 行(0) : 行(18) = 行(17) + 行(0) : 行(19) = 行(18) + 行(0) : 行(20) = 行(19) + 行(0)
513 526
         '--------------複製權限---------------------------
514
-        If CC(17) = False Then
515
-            存檔_bt.Enabled = False : 複製班表_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False : 複製班表_bt.Enabled = False
516
-            For no As Integer = 1 To 20
517
-                Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
518
-                Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
519
-                Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
520
-                Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
521
-                Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
522
-                Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
523
-                姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
524
-            Next
525
-        Else
527
+        If gUserName = "*系統管理者" Then
526 528
             存檔_bt.Enabled = True : 複製班表_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True : 複製班表_bt.Enabled = True
527 529
             For no As Integer = 1 To 20
528 530
                 Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
@@ -533,6 +535,30 @@ Public Class 排班明細_參考
533 535
                 Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
534 536
                 姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
535 537
             Next
538
+        Else
539
+            If CC(17) = False Then
540
+                存檔_bt.Enabled = False : 複製班表_bt.Enabled = False : 人員_dgv.Enabled = False : 全_ch.Enabled = False : 複製班表_bt.Enabled = False
541
+                For no As Integer = 1 To 20
542
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
543
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
544
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
545
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
546
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
547
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
548
+                    姓名_tbS.Enabled = False : 班別_cbS.Enabled = False : CheckBoxS.Enabled = False : NumericUpDownS.Enabled = False : NUPS.Enabled = False
549
+                Next
550
+            Else
551
+                存檔_bt.Enabled = True : 複製班表_bt.Enabled = True : 人員_dgv.Enabled = True : 全_ch.Enabled = True : 複製班表_bt.Enabled = True
552
+                For no As Integer = 1 To 20
553
+                    Dim 姓名_tbS As TextBox = CType(Me.Controls.Find("姓名_tb" + no.ToString(), True)(0), TextBox)
554
+                    Dim 班別_cbS As ComboBox = CType(Me.Controls.Find("班別_cb" + no.ToString(), True)(0), ComboBox)
555
+                    Dim A_lbS As Label = CType(Me.Controls.Find("A_lb" + no.ToString(), True)(0), Label)
556
+                    Dim CheckBoxS As CheckBox = CType(Me.Controls.Find("CheckBox" + no.ToString(), True)(0), CheckBox)
557
+                    Dim NumericUpDownS As NumericUpDown = CType(Me.Controls.Find("NumericUpDown" + no.ToString(), True)(0), NumericUpDown)
558
+                    Dim NUPS As NumericUpDown = CType(Me.Controls.Find("NUP" + no.ToString(), True)(0), NumericUpDown)
559
+                    姓名_tbS.Enabled = True : 班別_cbS.Enabled = True : CheckBoxS.Enabled = True : NumericUpDownS.Enabled = True : NUPS.Enabled = True
560
+                Next
561
+            End If
536 562
         End If
537 563
         年_lb.Text = PA : 月_lb.Text = PA1
538 564
     End Sub

+ 0
- 7
GRAMS-SYS/02、休假管理/休假核准.Designer.vb Ver arquivo

@@ -72,8 +72,6 @@ Partial Class 休假核准
72 72
         '
73 73
         'Button1
74 74
         '
75
-        Me.Button1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
76
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
77 75
         Me.Button1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
78 76
         Me.Button1.Location = New System.Drawing.Point(3, 99)
79 77
         Me.Button1.Name = "Button1"
@@ -84,8 +82,6 @@ Partial Class 休假核准
84 82
         '
85 83
         '事由_tb
86 84
         '
87
-        Me.事由_tb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
88
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
89 85
         Me.事由_tb.Location = New System.Drawing.Point(54, 54)
90 86
         Me.事由_tb.Multiline = True
91 87
         Me.事由_tb.Name = "事由_tb"
@@ -288,8 +284,6 @@ Partial Class 休假核准
288 284
         '
289 285
         '假期統計_dgv
290 286
         '
291
-        Me.假期統計_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
292
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
293 287
         Me.假期統計_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
294 288
         Me.假期統計_dgv.BackgroundColor = System.Drawing.Color.White
295 289
         Me.假期統計_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -302,7 +296,6 @@ Partial Class 休假核准
302 296
         '
303 297
         'Label8
304 298
         '
305
-        Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
306 299
         Me.Label8.AutoSize = True
307 300
         Me.Label8.Location = New System.Drawing.Point(552, 2)
308 301
         Me.Label8.Name = "Label8"

+ 31
- 35
GRAMS-SYS/02、休假管理/休假歷史紀錄.Designer.vb Ver arquivo

@@ -22,8 +22,8 @@ Partial Class 休假歷史紀錄
22 22
     '請勿使用程式碼編輯器進行修改。
23 23
     <System.Diagnostics.DebuggerStepThrough()>
24 24
     Private Sub InitializeComponent()
25
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
26
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
25
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
26
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
27 27
         Me.月清單_DGV = New System.Windows.Forms.DataGridView()
28 28
         Me.事由_tb = New System.Windows.Forms.TextBox()
29 29
         Me.Label7 = New System.Windows.Forms.Label()
@@ -55,15 +55,15 @@ Partial Class 休假歷史紀錄
55 55
         '
56 56
         '月清單_DGV
57 57
         '
58
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.Gainsboro
59
-        Me.月清單_DGV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
58
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Gainsboro
59
+        Me.月清單_DGV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
60 60
         Me.月清單_DGV.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
61 61
             Or System.Windows.Forms.AnchorStyles.Left) _
62 62
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
63 63
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
64 64
         Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
65 65
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
66
-        Me.月清單_DGV.Location = New System.Drawing.Point(2, 125)
66
+        Me.月清單_DGV.Location = New System.Drawing.Point(155, 125)
67 67
         Me.月清單_DGV.Name = "月清單_DGV"
68 68
         Me.月清單_DGV.RowHeadersWidth = 5
69 69
         Me.月清單_DGV.RowTemplate.Height = 24
@@ -72,9 +72,7 @@ Partial Class 休假歷史紀錄
72 72
         '
73 73
         '事由_tb
74 74
         '
75
-        Me.事由_tb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
76
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
77
-        Me.事由_tb.Location = New System.Drawing.Point(52, 54)
75
+        Me.事由_tb.Location = New System.Drawing.Point(205, 54)
78 76
         Me.事由_tb.Multiline = True
79 77
         Me.事由_tb.Name = "事由_tb"
80 78
         Me.事由_tb.Size = New System.Drawing.Size(367, 69)
@@ -83,7 +81,7 @@ Partial Class 休假歷史紀錄
83 81
         'Label7
84 82
         '
85 83
         Me.Label7.AutoSize = True
86
-        Me.Label7.Location = New System.Drawing.Point(2, 57)
84
+        Me.Label7.Location = New System.Drawing.Point(155, 57)
87 85
         Me.Label7.Name = "Label7"
88 86
         Me.Label7.Size = New System.Drawing.Size(43, 16)
89 87
         Me.Label7.TabIndex = 799
@@ -92,7 +90,7 @@ Partial Class 休假歷史紀錄
92 90
         '請假日期_tb
93 91
         '
94 92
         Me.請假日期_tb.Enabled = False
95
-        Me.請假日期_tb.Location = New System.Drawing.Point(306, 3)
93
+        Me.請假日期_tb.Location = New System.Drawing.Point(459, 3)
96 94
         Me.請假日期_tb.Name = "請假日期_tb"
97 95
         Me.請假日期_tb.Size = New System.Drawing.Size(113, 23)
98 96
         Me.請假日期_tb.TabIndex = 798
@@ -100,16 +98,16 @@ Partial Class 休假歷史紀錄
100 98
         'Label6
101 99
         '
102 100
         Me.Label6.AutoSize = True
103
-        Me.Label6.Location = New System.Drawing.Point(244, 6)
101
+        Me.Label6.Location = New System.Drawing.Point(397, 6)
104 102
         Me.Label6.Name = "Label6"
105 103
         Me.Label6.Size = New System.Drawing.Size(55, 16)
106 104
         Me.Label6.TabIndex = 797
107
-        Me.Label6.Text = "假日期"
105
+        Me.Label6.Text = "假日期"
108 106
         '
109 107
         '員工編號_tb
110 108
         '
111 109
         Me.員工編號_tb.Enabled = False
112
-        Me.員工編號_tb.Location = New System.Drawing.Point(306, 29)
110
+        Me.員工編號_tb.Location = New System.Drawing.Point(459, 29)
113 111
         Me.員工編號_tb.Name = "員工編號_tb"
114 112
         Me.員工編號_tb.Size = New System.Drawing.Size(113, 23)
115 113
         Me.員工編號_tb.TabIndex = 796
@@ -117,7 +115,7 @@ Partial Class 休假歷史紀錄
117 115
         'Label4
118 116
         '
119 117
         Me.Label4.AutoSize = True
120
-        Me.Label4.Location = New System.Drawing.Point(244, 32)
118
+        Me.Label4.Location = New System.Drawing.Point(397, 32)
121 119
         Me.Label4.Name = "Label4"
122 120
         Me.Label4.Size = New System.Drawing.Size(55, 16)
123 121
         Me.Label4.TabIndex = 795
@@ -126,7 +124,7 @@ Partial Class 休假歷史紀錄
126 124
         '申請人_tb
127 125
         '
128 126
         Me.申請人_tb.Enabled = False
129
-        Me.申請人_tb.Location = New System.Drawing.Point(52, 29)
127
+        Me.申請人_tb.Location = New System.Drawing.Point(205, 29)
130 128
         Me.申請人_tb.Name = "申請人_tb"
131 129
         Me.申請人_tb.Size = New System.Drawing.Size(71, 23)
132 130
         Me.申請人_tb.TabIndex = 794
@@ -134,7 +132,7 @@ Partial Class 休假歷史紀錄
134 132
         'Label3
135 133
         '
136 134
         Me.Label3.AutoSize = True
137
-        Me.Label3.Location = New System.Drawing.Point(2, 32)
135
+        Me.Label3.Location = New System.Drawing.Point(155, 32)
138 136
         Me.Label3.Name = "Label3"
139 137
         Me.Label3.Size = New System.Drawing.Size(43, 16)
140 138
         Me.Label3.TabIndex = 793
@@ -143,7 +141,7 @@ Partial Class 休假歷史紀錄
143 141
         'Label1
144 142
         '
145 143
         Me.Label1.AutoSize = True
146
-        Me.Label1.Location = New System.Drawing.Point(129, 32)
144
+        Me.Label1.Location = New System.Drawing.Point(282, 32)
147 145
         Me.Label1.Name = "Label1"
148 146
         Me.Label1.Size = New System.Drawing.Size(31, 16)
149 147
         Me.Label1.TabIndex = 792
@@ -154,7 +152,7 @@ Partial Class 休假歷史紀錄
154 152
         Me.請假類別_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
155 153
         Me.請假類別_cb.FormattingEnabled = True
156 154
         Me.請假類別_cb.Items.AddRange(New Object() {"特休", "病假", "婚嫁", "喪假", "事假"})
157
-        Me.請假類別_cb.Location = New System.Drawing.Point(167, 29)
155
+        Me.請假類別_cb.Location = New System.Drawing.Point(320, 29)
158 156
         Me.請假類別_cb.Name = "請假類別_cb"
159 157
         Me.請假類別_cb.Size = New System.Drawing.Size(71, 24)
160 158
         Me.請假類別_cb.TabIndex = 791
@@ -164,7 +162,7 @@ Partial Class 休假歷史紀錄
164 162
         Me.月份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
165 163
         Me.月份_cb.FormattingEnabled = True
166 164
         Me.月份_cb.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"})
167
-        Me.月份_cb.Location = New System.Drawing.Point(167, 3)
165
+        Me.月份_cb.Location = New System.Drawing.Point(320, 3)
168 166
         Me.月份_cb.Name = "月份_cb"
169 167
         Me.月份_cb.Size = New System.Drawing.Size(71, 24)
170 168
         Me.月份_cb.TabIndex = 790
@@ -174,7 +172,7 @@ Partial Class 休假歷史紀錄
174 172
         Me.年份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
175 173
         Me.年份_cb.FormattingEnabled = True
176 174
         Me.年份_cb.Items.AddRange(New Object() {"2019", "2020", "2021", "2022", "2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030"})
177
-        Me.年份_cb.Location = New System.Drawing.Point(52, 3)
175
+        Me.年份_cb.Location = New System.Drawing.Point(205, 3)
178 176
         Me.年份_cb.Name = "年份_cb"
179 177
         Me.年份_cb.Size = New System.Drawing.Size(71, 24)
180 178
         Me.年份_cb.TabIndex = 789
@@ -182,7 +180,7 @@ Partial Class 休假歷史紀錄
182 180
         'Label16
183 181
         '
184 182
         Me.Label16.AutoSize = True
185
-        Me.Label16.Location = New System.Drawing.Point(129, 6)
183
+        Me.Label16.Location = New System.Drawing.Point(282, 6)
186 184
         Me.Label16.Name = "Label16"
187 185
         Me.Label16.Size = New System.Drawing.Size(31, 16)
188 186
         Me.Label16.TabIndex = 788
@@ -191,7 +189,7 @@ Partial Class 休假歷史紀錄
191 189
         'Label17
192 190
         '
193 191
         Me.Label17.AutoSize = True
194
-        Me.Label17.Location = New System.Drawing.Point(3, 6)
192
+        Me.Label17.Location = New System.Drawing.Point(156, 6)
195 193
         Me.Label17.Name = "Label17"
196 194
         Me.Label17.Size = New System.Drawing.Size(40, 16)
197 195
         Me.Label17.TabIndex = 787
@@ -199,19 +197,19 @@ Partial Class 休假歷史紀錄
199 197
         '
200 198
         '人員_dgv
201 199
         '
202
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
203
-        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
200
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
201
+        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
204 202
         Me.人員_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
205 203
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
206 204
         Me.人員_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
205
+        Me.人員_dgv.BackgroundColor = System.Drawing.Color.White
207 206
         Me.人員_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
208
-        Me.人員_dgv.Location = New System.Drawing.Point(3, 36)
207
+        Me.人員_dgv.Location = New System.Drawing.Point(3, 1)
209 208
         Me.人員_dgv.Name = "人員_dgv"
210 209
         Me.人員_dgv.RowHeadersWidth = 5
211 210
         Me.人員_dgv.RowTemplate.Height = 24
212
-        Me.人員_dgv.Size = New System.Drawing.Size(80, 38)
211
+        Me.人員_dgv.Size = New System.Drawing.Size(149, 596)
213 212
         Me.人員_dgv.TabIndex = 786
214
-        Me.人員_dgv.Visible = False
215 213
         '
216 214
         'PictureBox2
217 215
         '
@@ -220,7 +218,7 @@ Partial Class 休假歷史紀錄
220 218
         Me.PictureBox2.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
221 219
         Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
222 220
         Me.PictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
223
-        Me.PictureBox2.Location = New System.Drawing.Point(688, 2)
221
+        Me.PictureBox2.Location = New System.Drawing.Point(841, 2)
224 222
         Me.PictureBox2.Name = "PictureBox2"
225 223
         Me.PictureBox2.Size = New System.Drawing.Size(392, 594)
226 224
         Me.PictureBox2.TabIndex = 1408
@@ -230,8 +228,7 @@ Partial Class 休假歷史紀錄
230 228
         '
231 229
         Me.Panel1.Controls.Add(Me.圖片流水號_tb)
232 230
         Me.Panel1.Controls.Add(Me.資料指定圖庫_tb)
233
-        Me.Panel1.Controls.Add(Me.人員_dgv)
234
-        Me.Panel1.Location = New System.Drawing.Point(110, 175)
231
+        Me.Panel1.Location = New System.Drawing.Point(263, 175)
235 232
         Me.Panel1.Name = "Panel1"
236 233
         Me.Panel1.Size = New System.Drawing.Size(200, 100)
237 234
         Me.Panel1.TabIndex = 1409
@@ -254,12 +251,10 @@ Partial Class 休假歷史紀錄
254 251
         '
255 252
         '假期統計_dgv
256 253
         '
257
-        Me.假期統計_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
258
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
259 254
         Me.假期統計_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
260 255
         Me.假期統計_dgv.BackgroundColor = System.Drawing.Color.White
261 256
         Me.假期統計_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
262
-        Me.假期統計_dgv.Location = New System.Drawing.Point(421, 2)
257
+        Me.假期統計_dgv.Location = New System.Drawing.Point(574, 2)
263 258
         Me.假期統計_dgv.Name = "假期統計_dgv"
264 259
         Me.假期統計_dgv.RowHeadersWidth = 5
265 260
         Me.假期統計_dgv.RowTemplate.Height = 24
@@ -268,7 +263,7 @@ Partial Class 休假歷史紀錄
268 263
         '
269 264
         '列印_bt
270 265
         '
271
-        Me.列印_bt.Location = New System.Drawing.Point(601, 1)
266
+        Me.列印_bt.Location = New System.Drawing.Point(754, 1)
272 267
         Me.列印_bt.Name = "列印_bt"
273 268
         Me.列印_bt.Size = New System.Drawing.Size(83, 122)
274 269
         Me.列印_bt.TabIndex = 1413
@@ -279,9 +274,10 @@ Partial Class 休假歷史紀錄
279 274
         '
280 275
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
281 276
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
282
-        Me.ClientSize = New System.Drawing.Size(1083, 600)
277
+        Me.ClientSize = New System.Drawing.Size(1238, 600)
283 278
         Me.Controls.Add(Me.列印_bt)
284 279
         Me.Controls.Add(Me.假期統計_dgv)
280
+        Me.Controls.Add(Me.人員_dgv)
285 281
         Me.Controls.Add(Me.PictureBox2)
286 282
         Me.Controls.Add(Me.事由_tb)
287 283
         Me.Controls.Add(Me.Label7)

+ 10
- 4
GRAMS-SYS/02、休假管理/休假歷史紀錄.vb Ver arquivo

@@ -20,7 +20,8 @@ Public Class 休假歷史紀錄
20 20
         SQL_考勤明細表_人員()
21 21
         da.Fill(ds) : 人員_dgv.DataSource = ds.Tables(0) : conn.Close()
22 22
         人員_dgv.Columns(0).FillWeight = 70 : 人員_dgv.Columns(1).FillWeight = 80 : 人員_dgv.Columns(2).FillWeight = 100 : 人員_dgv.Columns(3).Visible = False
23
-        人員_dgv.Columns("到職日").Visible = False
23
+        人員_dgv.Columns(4).Visible = False : 人員_dgv.Columns(5).Visible = False : 人員_dgv.Columns(6).Visible = False : 人員_dgv.Columns(7).Visible = False
24
+        人員_dgv.Columns(8).Visible = False : 人員_dgv.Columns(9).Visible = False : 人員_dgv.Columns("到職日").Visible = False
24 25
         For i As Integer = 0 To 人員_dgv.Rows.Count - 1
25 26
             人員_dgv.Rows(i).Cells("No.").Value = i + 1
26 27
         Next
@@ -36,13 +37,18 @@ Public Class 休假歷史紀錄
36 37
         月清單_DGV.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
37 38
         月清單_DGV.ColumnHeadersHeight = 40
38 39
         月清單_DGV.AllowUserToAddRows = False
39
-        PA = 年份_cb.Text & "/" & 月份_cb.Text : SQL_休假清單()
40
+        PA = 員工編號_tb.Text : SQL_休假清單()    'PA = 年份_cb.Text & "/" & 月份_cb.Text : 
40 41
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
41 42
 
42 43
         月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 40 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 65
43 44
         月清單_DGV.Columns(4).FillWeight = 55 : 月清單_DGV.Columns(5).FillWeight = 150 : 月清單_DGV.Columns(6).FillWeight = 60 : 月清單_DGV.Columns(7).FillWeight = 80
44 45
         月清單_DGV.Columns(8).FillWeight = 80 : 月清單_DGV.Columns("圖片資料庫").Visible = False : 月清單_DGV.Columns("圖片編號").Visible = False
45 46
         月清單_DGV.Columns("申請時數").FillWeight = 50
47
+        If 月清單_DGV.Rows.Count > 0 Then
48
+            請假日期_tb.Text = 月清單_DGV("日期", 0).Value.ToString : Set_假期統計()
49
+        Else
50
+            假期統計_dgv.DataSource = Nothing
51
+        End If
46 52
     End Sub
47 53
     Private Sub Set_假期統計()
48 54
         Dim ds As New DataSet
@@ -62,7 +68,7 @@ Public Class 休假歷史紀錄
62 68
     Private Sub 人員_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 人員_dgv.CellClick
63 69
         If e.RowIndex = -1 Then : Else
64 70
             員工編號_tb.Text = 人員_dgv("編號", e.RowIndex).Value.ToString : 申請人_tb.Text = 人員_dgv("姓名", e.RowIndex).Value.ToString
65
-            Set_考勤明細()
71
+            Set_考勤明細() : 請假日期_tb.Text = 年份_cb.Text & "/" & 月份_cb.Text : Set_假期統計()
66 72
         End If
67 73
     End Sub
68 74
     Private Sub 月清單_DGV_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 月清單_DGV.CellClick
@@ -88,7 +94,7 @@ Public Class 休假歷史紀錄
88 94
                 Else
89 95
                     PictureBox2.Image = Nothing
90 96
                 End If
91
-            End If : Set_假期統計()
97
+            End If
92 98
         End If
93 99
     End Sub
94 100
     Private Sub 月清單_DGV_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 月清單_DGV.RowPostPaint

+ 19
- 1
GRAMS-SYS/02、休假管理/休假申請.Designer.vb Ver arquivo

@@ -68,6 +68,7 @@ Partial Class 休假申請
68 68
         Me.資料指定圖庫_tb = New System.Windows.Forms.TextBox()
69 69
         Me.檔案路徑2_tb = New System.Windows.Forms.TextBox()
70 70
         Me.預設圖片庫_tb = New System.Windows.Forms.TextBox()
71
+        Me.假期統計_dgv = New System.Windows.Forms.DataGridView()
71 72
         CType(Me.月清單_DGV, System.ComponentModel.ISupportInitialize).BeginInit()
72 73
         CType(Me.人員_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
73 74
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -76,6 +77,7 @@ Partial Class 休假申請
76 77
         Me.Panel3.SuspendLayout()
77 78
         Me.Panel4.SuspendLayout()
78 79
         Me.Panel2.SuspendLayout()
80
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
79 81
         Me.SuspendLayout()
80 82
         '
81 83
         '月清單_DGV
@@ -306,7 +308,7 @@ Partial Class 休假申請
306 308
         Me.人員_dgv.RowHeadersDefaultCellStyle = DataGridViewCellStyle7
307 309
         Me.人員_dgv.RowHeadersWidth = 5
308 310
         Me.人員_dgv.RowTemplate.Height = 24
309
-        Me.人員_dgv.Size = New System.Drawing.Size(186, 595)
311
+        Me.人員_dgv.Size = New System.Drawing.Size(186, 475)
310 312
         Me.人員_dgv.TabIndex = 785
311 313
         '
312 314
         'PictureBox1
@@ -346,6 +348,7 @@ Partial Class 休假申請
346 348
         '
347 349
         'Panel1
348 350
         '
351
+        Me.Panel1.Controls.Add(Me.假期統計_dgv)
349 352
         Me.Panel1.Controls.Add(Me.Label5)
350 353
         Me.Panel1.Controls.Add(Me.請休假時數_cb)
351 354
         Me.Panel1.Controls.Add(Me.視窗2_pl)
@@ -563,6 +566,19 @@ Partial Class 休假申請
563 566
         Me.預設圖片庫_tb.Size = New System.Drawing.Size(94, 22)
564 567
         Me.預設圖片庫_tb.TabIndex = 813
565 568
         '
569
+        '假期統計_dgv
570
+        '
571
+        Me.假期統計_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
572
+        Me.假期統計_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
573
+        Me.假期統計_dgv.BackgroundColor = System.Drawing.Color.White
574
+        Me.假期統計_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
575
+        Me.假期統計_dgv.Location = New System.Drawing.Point(2, 477)
576
+        Me.假期統計_dgv.Name = "假期統計_dgv"
577
+        Me.假期統計_dgv.RowHeadersWidth = 5
578
+        Me.假期統計_dgv.RowTemplate.Height = 24
579
+        Me.假期統計_dgv.Size = New System.Drawing.Size(186, 120)
580
+        Me.假期統計_dgv.TabIndex = 1413
581
+        '
566 582
         '休假申請
567 583
         '
568 584
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
@@ -585,6 +601,7 @@ Partial Class 休假申請
585 601
         Me.Panel4.ResumeLayout(False)
586 602
         Me.Panel2.ResumeLayout(False)
587 603
         Me.Panel2.PerformLayout()
604
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).EndInit()
588 605
         Me.ResumeLayout(False)
589 606
 
590 607
     End Sub
@@ -628,4 +645,5 @@ Partial Class 休假申請
628 645
     Friend WithEvents 預設圖片庫_tb As TextBox
629 646
     Friend WithEvents 請休假時數_cb As ComboBox
630 647
     Friend WithEvents Label5 As Label
648
+    Friend WithEvents 假期統計_dgv As DataGridView
631 649
 End Class

+ 10
- 1
GRAMS-SYS/02、休假管理/休假申請.vb Ver arquivo

@@ -40,7 +40,16 @@ Public Class 休假申請
40 40
             ElseIf 月清單_DGV.Rows(I).Cells("請假類別").Value.ToString = "國定假日" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
41 41
             ElseIf 月清單_DGV.Rows(I).Cells("請假類別").Value.ToString <> "" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightYellow
42 42
             End If
43
-        Next
43
+        Next : 特假日期_tb.Text = 月清單_DGV("日期", 0).Value.ToString : Set_假期統計()
44
+    End Sub
45
+    Private Sub Set_假期統計()
46
+        Dim ds As New DataSet
47
+        假期統計_dgv.DataSource = Nothing : ds.Clear()
48
+        假期統計_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
49
+        假期統計_dgv.ColumnHeadersHeight = 25
50
+        假期統計_dgv.AllowUserToAddRows = False
51
+        PA = 員工編號_tb.Text : PA1 = 特假日期_tb.Text : SQL_休假統計()
52
+        da.Fill(ds) : 假期統計_dgv.DataSource = ds.Tables(0) : conn.Close()
44 53
     End Sub
45 54
     Private Sub 特休申請_Load(sender As Object, e As EventArgs) Handles MyBase.Load
46 55
         Panel2.SendToBack() : 視窗2_pl.Visible = False : 剛開啟 = True

+ 4
- 1
GRAMS-SYS/10、系統管理/系統使用者管理.vb Ver arquivo

@@ -15,7 +15,10 @@ Public Class 系統使用者管理
15 15
         For i As Integer = 1 To 權限數量
16 16
             使用者清單_dgv.Columns(i + 3).Visible = False
17 17
         Next
18
-        For i As Integer = 0 To 使用者清單_dgv.Rows.Count - 1   'UserName
18
+        For i As Integer = 0 To 使用者清單_dgv.Rows.Count - 1
19
+            If IsDBNull(使用者清單_dgv.Rows(i).Cells("CC17").Value) Then
20
+                使用者清單_dgv.Rows(i).Cells("CC17").Value = False
21
+            End If
19 22
             If 使用者清單_dgv.Rows(i).Cells("CC17").Value = True Then
20 23
                 使用者清單_dgv.Rows(i).Cells("Password").Value = "******"
21 24
             End If

BIN
GRAMS-SYS/bin/Debug/HSKIN-MIS-SYS.exe Ver arquivo


BIN
GRAMS-SYS/bin/Debug/HSKIN-MIS-SYS.pdb Ver arquivo


BIN
GRAMS-SYS/obj/Debug/HSKIN-MIS-SYS.exe Ver arquivo


BIN
GRAMS-SYS/obj/Debug/HSKIN-MIS-SYS.pdb Ver arquivo


BIN
GRAMS-SYS/obj/Debug/HSKIN-MIS-SYS.vbproj.GenerateResource.cache Ver arquivo


Carregando…
Cancelar
Salvar