20240125備份

GRAMS-SYS/00、Module/SQL_休假與加班.vb

@@ -1,9 +1,9 @@
 Module SQL_休假與加班
     Friend Sub SQL_國定假日設定_月份考勤()
         ConnOpen()
-        SQL1 = "SELECT      萬年曆.日期, 萬年曆.星期, AA.請假類別, AA.事由, AA.是否生效, AA.核准人, AA.核准日期
+        SQL1 = "SELECT      萬年曆.日期, 萬年曆.星期, AA.請假類別, AA.事由, AA.是否生效, AA.核准人, AA.核准日期, AA.圖片資料庫, AA.圖片編號, AA.申請時數
                 FROM             萬年曆 LEFT OUTER JOIN
-                                (SELECT           員工編號, 日期, 請假類別, 事由, 是否生效, 核准人, 核准日期
+                                (SELECT           員工編號, 日期, 請假類別, 事由, 是否生效, 核准人, 核准日期, 圖片資料庫, 圖片編號, 申請時數
                                  FROM             人事請假單
                                  WHERE           (員工編號 LIKE N'" & PA & "') AND (日期 LIKE N'" & PA1 & "/" & PA2 & "%')) AS AA ON 萬年曆.日期 = AA.日期
                 WHERE          (萬年曆.日期 LIKE N'" & PA1 & "/" & PA2 & "%')
@@ -13,7 +13,7 @@
     Friend Sub SQL_休假申請()
         ConnOpen()
         SQL1 = "SELECT ras_Users.UserName AS 姓名, 人事請假單.員工編號 AS 編號, 人事請假單.日期, 萬年曆.星期, 人事請假單.請假類別, 
-                       人事請假單.事由, 人事請假單.是否生效, 人事請假單.核准人, 人事請假單.核准日期
+                       人事請假單.事由, 人事請假單.是否生效, 人事請假單.核准人, 人事請假單.核准日期, 圖片資料庫, 圖片編號
                 FROM   人事請假單 INNER JOIN
                        萬年曆 ON 人事請假單.日期 = 萬年曆.日期 INNER JOIN
                        ras_Users ON 人事請假單.員工編號 = ras_Users.DIN
@@ -21,10 +21,35 @@
                 ORDER BY ras_Users.UserName, 人事請假單.員工編號"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_休假統計()
+        ConnOpen()
+        SQL1 = "SELECT          CASE WHEN 請假類別 = '特休' THEN '特休' WHEN 請假類別 = '事假' THEN '事假' WHEN 請假類別 = '病假' THEN '病假'
+                                     WHEN 請假類別 = '婚假' THEN '婚假' WHEN 請假類別 = '喪假' THEN '喪假' ELSE '其他' END AS 假別, COUNT(*) AS 天數, 
+                                          SUM(CAST(申請時數 AS DECIMAL(10, 1))) AS 總時數
+                FROM       人事請假單
+                WHERE     (請假類別 NOT LIKE '國定假日') AND (請假類別 NOT LIKE '未到') AND (請假類別 NOT LIKE '離職') AND 
+                          (是否生效 LIKE '已核准') AND (員工編號 LIKE '" & PA & "') AND (日期 LIKE '" & Strings.Left(PA1, 4) & "%')
+                GROUP BY   CASE WHEN 請假類別 = '特休' THEN '特休' WHEN 請假類別 = '事假' THEN '事假' WHEN 請假類別 = '病假' THEN '病假'
+                                WHEN 請假類別 = '婚假' THEN '婚假' WHEN 請假類別 = '喪假' THEN '喪假' ELSE '其他' END"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_休假統計1()
+        ConnOpen()
+        SQL1 = "SELECT          CASE WHEN 請假類別 = '特休' THEN '特休' WHEN 請假類別 = '事假' THEN '事假' WHEN 請假類別 = '病假' THEN '病假'
+                                     WHEN 請假類別 = '婚假' THEN '婚假' WHEN 請假類別 = '喪假' THEN '喪假' WHEN 請假類別 = '未到' THEN '未到'
+                                     WHEN 請假類別 = '離職' THEN '離職' ELSE '其他' END AS 假別, COUNT(*) AS 天數, 
+                                          SUM(CAST(申請時數 AS DECIMAL(10, 1))) AS 總時數
+                FROM       人事請假單
+                WHERE     (請假類別 NOT LIKE '國定假日') AND (員工編號 LIKE '" & PA & "') AND (日期 LIKE '" & Strings.Left(PA1, 7) & "%')
+                GROUP BY   CASE WHEN 請假類別 = '特休' THEN '特休' WHEN 請假類別 = '事假' THEN '事假' WHEN 請假類別 = '病假' THEN '病假'
+                                WHEN 請假類別 = '婚假' THEN '婚假' WHEN 請假類別 = '喪假' THEN '喪假' WHEN 請假類別 = '未到' THEN '未到' 
+                                WHEN 請假類別 = '離職' THEN '離職' ELSE '其他' END"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_休假清單()
         ConnOpen()
         SQL1 = "SELECT ras_Users.UserName AS 姓名, 人事請假單.員工編號 AS 編號, 人事請假單.日期, 萬年曆.星期, 人事請假單.請假類別, 
-                       人事請假單.事由, 人事請假單.是否生效, 人事請假單.核准人, 人事請假單.核准日期
+                       人事請假單.事由, 人事請假單.是否生效, 人事請假單.核准人, 人事請假單.核准日期, 圖片資料庫, 圖片編號
                 FROM   人事請假單 INNER JOIN
                        萬年曆 ON 人事請假單.日期 = 萬年曆.日期 INNER JOIN
                        ras_Users ON 人事請假單.員工編號 = ras_Users.DIN
@@ -172,6 +197,9 @@
     Friend Sub SQL_查詢最後一筆圖片編號()
         ConnOpen_圖庫SQL() : SQL1 = "SELECT TOP(1) 流水號 FROM 加班圖片庫 ORDER BY 流水號 DESC" : CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_查詢最後一筆圖片編號1()
+        ConnOpen_圖庫SQL() : SQL1 = "SELECT TOP(1) 流水號 FROM 請假圖片庫 ORDER BY 流水號 DESC" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_修改加班圖()
         ConnOpen_圖庫SQL()
         SQL1 = "UPDATE 加班圖片庫 SET 圖片 = @binary_file WHERE 流水號 LIKE N'" & 加班申請.圖片流水號_tb.Text & "'"
@@ -185,4 +213,17 @@
     Friend Sub SQL_加班圖()
         ConnOpen_圖庫SQL() : SQL1 = "SELECT 圖片 FROM 加班圖片庫 WHERE 流水號 LIKE '" & PA2 & "'" : CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_請假圖()
+        ConnOpen_圖庫SQL() : SQL1 = "SELECT 圖片 FROM 請假圖片庫 WHERE 流水號 LIKE '" & PA2 & "'" : CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_修改請假圖()
+        ConnOpen_圖庫SQL()
+        SQL1 = "UPDATE 請假圖片庫 SET 圖片 = @binary_file WHERE 流水號 LIKE N'" & 休假申請.圖片流水號_tb.Text & "'"
+        CmdSet_For_dr_pic()
+    End Sub
+    Friend Sub SQL_新增請假圖()
+        ConnOpen_圖庫SQL()
+        SQL1 = "INSERT INTO 請假圖片庫 (流水號, 圖片) SELECT N'" & 休假申請.圖片流水號_tb.Text & "', @binary_file"
+        CmdSet_For_dr_pic()
+    End Sub
 End Module

GRAMS-SYS/00、Module/SQL_系統設定.vb

@@ -58,15 +58,18 @@
     End Sub
     Friend Sub SQL_請假申請修改()
         ConnOpen()
-        SQL1 = "UPDATE  人事請假單  SET   請假類別= N'" & 休假申請.請假類別_cb.Text & "',事由= NN'" & 休假申請.事由_tb.Text & "'
-                Where   日期 Like N'" & 休假核准.請假日期_tb.Text & "' AND 員工編號 = " & 休假核准.員工編號_tb.Text & ""
+        SQL1 = "UPDATE  人事請假單  SET   請假類別= N'" & 休假申請.請假類別_cb.Text & "',事由= N'" & 休假申請.事由_tb.Text & "', 
+                        圖片資料庫 = N'" & 休假申請.資料指定圖庫_tb.Text & "', 圖片編號 = N'" & 休假申請.圖片流水號_tb.Text & "', 
+                        申請時數 = N'" & 休假申請.請休假時數_cb.Text & "'
+                Where   日期 Like N'" & 休假申請.特假日期_tb.Text & "' AND 員工編號 = " & 休假申請.員工編號_tb.Text & ""
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_請假申請新增()
         ConnOpen()
-        SQL1 = "INSERT INTO 人事請假單  ( 員工編號, 日期, 請假類別,事由,是否生效)
+        SQL1 = "INSERT INTO 人事請假單  ( 員工編號, 日期, 請假類別,事由,是否生效, 圖片資料庫, 圖片編號, 申請時數)
                 VALUES (N'" & 休假申請.員工編號_tb.Text & "',N'" & 休假申請.特假日期_tb.Text & "',
-                 N'" & 休假申請.請假類別_cb.Text & "' , N'" & 休假申請.事由_tb.Text & "','申請中')"
+                        N'" & 休假申請.請假類別_cb.Text & "' , N'" & 休假申請.事由_tb.Text & "','申請中', 
+                        N'" & 休假申請.資料指定圖庫_tb.Text & "', N'" & 休假申請.圖片流水號_tb.Text & "', N'" & 休假申請.請休假時數_cb.Text & "')"
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_申請刪除()
@@ -76,7 +79,7 @@
     End Sub
     Friend Sub SQL_申請新增1()
         ConnOpen()
-        SQL1 = "INSERT INTO 人事請假單  ( 員工編號, 日期, 請假類別,事由,是否生效)
+        SQL1 = "INSERT INTO 人事請假單  (員工編號, 日期, 請假類別,事由,是否生效)
                 VALUES (N'" & 到離職管理.員工編號_tb.Text & "',N'" & 到離職管理.特假日期_tb.Text & "',
                  N'" & 到離職管理.請假類別_cb.Text & "' , N'" & 到離職管理.事由_tb.Text & "','申請中')"
         CmdSet_For_dr()
@@ -93,6 +96,27 @@
                 ORDER BY ID"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_適應症設定()
+        ConnOpen_ERP()
+        SQL1 = "SELECT 編號, 適應症 FROM  業務對應適應症 ORDER BY 編號"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_適應症刪除()
+        ConnOpen_ERP()
+        SQL1 = "DELETE FROM  業務對應適應症  WHERE 編號 LIKE N'" & 系統設定.適應症_編號_tb.Text & "'"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_適應症修改()
+        ConnOpen_ERP()
+        SQL1 = "UPDATE  業務對應適應症   SET   適應症 = N'" & PA1 & "' WHERE 編號 LIKE N'" & 系統設定.適應症_編號_tb.Text & "'"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_查詢最後一筆適應症()
+        ConnOpen_ERP() : SQL1 = "SELECT TOP(1) 編號 FROM 業務對應適應症 ORDER BY 編號 DESC" : CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_適應症新增()
+        ConnOpen_ERP() : SQL1 = "INSERT INTO  業務對應適應症 (編號, 適應症)  VALUES (N'" & 系統設定.適應症_編號_tb.Text & "',N'" & 系統設定.適應症_tb.Text & "')" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_時段新增()
         ConnOpen() : SQL1 = "INSERT INTO  時段設定 (ID, 時段, 時段1, 時段2, 時段3, 時段4, 時段5, 時段6, 時段7, 時段8,
                                                      上午上班, 下午上班, 加班上班, 一段休息,  二段休息)
@@ -105,10 +129,9 @@
     End Sub
     Friend Sub SQL_時段修改()
         ConnOpen()
-        SQL1 = "UPDATE  時段設定   SET   ID= N'" & PA & "', 時段1= N'" & PA2 & "' ,  時段2= N'" & PA3 & "' , 時段3= N'" & PA4 & "', 時段4= N'" & PA5 & "',
-                                         時段5= N'" & PA6 & "', 時段6= N'" & PA7 & "' , 時段7=  N'" & PA8 & "',時段8= N'" & PA9 & "',
-                                         上午上班= N'" & PA10 & "',下午上班= N'" & PA11 & "',加班上班= N'" & PA12 & "',一段休息= N'" & PA13 & "',二段休息= N'" & PA14 & "'
-
+        SQL1 = "UPDATE  時段設定   SET   ID = N'" & PA & "', 時段1 = N'" & PA2 & "' ,  時段2 = N'" & PA3 & "' , 時段3 = N'" & PA4 & "', 時段4 = N'" & PA5 & "',
+                                         時段5 = N'" & PA6 & "', 時段6 = N'" & PA7 & "' , 時段7 =  N'" & PA8 & "',時段8 = N'" & PA9 & "',
+                                         上午上班 = N'" & PA10 & "',下午上班 = N'" & PA11 & "',加班上班 = N'" & PA12 & "',一段休息 = N'" & PA13 & "',二段休息 = N'" & PA14 & "'
                 WHERE 時段 LIKE N'" & 系統設定.時段_tb.Text & "'"
         CmdSet_For_dr()
     End Sub
@@ -265,4 +288,11 @@
                                          "' WHERE (DIN = N'" & 系統使用者管理.編號_tb.Text & "')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_系統使用者修改()
+        ConnOpen()
+        SQL1 = "UPDATE  使用者權限管理表 SET  CC18 = N'" & PA1 & "', 月薪 = N'" & PA2 & "', 時薪 = N'" & PA3 & "', 主管加級 = N'" & PA4 & "', 職務加級 = N'" & PA5 & "', 
+                        勞保費 = N'" & PA6 & "', 健保費 = N'" & PA7 & "' 
+                WHERE  (DIN = N'" & PA & "')"
+        CmdSet_For_dr()
+    End Sub
 End Module

GRAMS-SYS/00、Module/SQL_考勤系統.vb

@@ -1,7 +1,20 @@
 Module SQL_考勤系統
+    Friend Sub SQL_人員薪資資料()
+        ConnOpen()
+        SQL1 = "SELECT   ras_Users.DIN AS [No.], ras_Users.DIN AS 編號, ras_Users.UserName AS 姓名, 使用者權限管理表.CC18 AS 時薪人員, 
+                         使用者權限管理表.月薪, 使用者權限管理表.時薪, 使用者權限管理表.主管加級, 使用者權限管理表.職務加級, 
+                         使用者權限管理表.勞保費, 使用者權限管理表.健保費
+                FROM     ras_Users INNER JOIN 使用者權限管理表 ON ras_Users.DIN = 使用者權限管理表.DIN
+                WHERE    IsLockedOut = 0 AND ras_Users.DIN NOT LIKE '18' AND ras_Users.DIN NOT LIKE '19' AND 
+                         ras_Users.DIN NOT LIKE '21' AND ras_Users.DIN NOT LIKE '90'
+                ORDER BY 編號"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_考勤明細表_人員()
         ConnOpen()
-        SQL1 = "SELECT   ras_Users.DIN AS [No.], ras_Users.DIN AS 編號, ras_Users.UserName AS 姓名, 使用者權限管理表.CC18
+        SQL1 = "SELECT   ras_Users.DIN AS [No.], ras_Users.DIN AS 編號, ras_Users.UserName AS 姓名, 使用者權限管理表.CC18, 
+                         使用者權限管理表.月薪, 使用者權限管理表.時薪, 使用者權限管理表.主管加級, 使用者權限管理表.職務加級, 
+                         使用者權限管理表.勞保費, 使用者權限管理表.健保費
                 FROM     ras_Users INNER JOIN
                         (SELECT DIN FROM ras_AttRecord WHERE (MONTH(Clock) = " & PA2 & ") AND (YEAR(Clock) = " & PA1 & ") GROUP BY DIN) AS QQQ 
                          ON ras_Users.DIN = QQQ.DIN INNER JOIN 使用者權限管理表 ON ras_Users.DIN = 使用者權限管理表.DIN

GRAMS-SYS/02、休假管理/休假核准.Designer.vb

@@ -40,10 +40,18 @@ Partial Class 休假核准
         Me.Label16 = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.人員_dgv = New System.Windows.Forms.DataGridView()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.圖片流水號_tb = New System.Windows.Forms.TextBox()
+        Me.資料指定圖庫_tb = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.假期統計_dgv = New System.Windows.Forms.DataGridView()
         CType(Me.月清單_DGV, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.人員_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '月清單_DGV
@@ -52,12 +60,13 @@ Partial Class 休假核准
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.月清單_DGV.Location = New System.Drawing.Point(9, 124)
+        Me.月清單_DGV.Location = New System.Drawing.Point(3, 123)
         Me.月清單_DGV.Name = "月清單_DGV"
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(862, 472)
+        Me.月清單_DGV.Size = New System.Drawing.Size(546, 473)
         Me.月清單_DGV.TabIndex = 784
         '
         'Button1
@@ -65,9 +74,9 @@ Partial Class 休假核准
         Me.Button1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Button1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.Button1.Location = New System.Drawing.Point(131, 99)
+        Me.Button1.Location = New System.Drawing.Point(3, 99)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(740, 23)
+        Me.Button1.Size = New System.Drawing.Size(418, 23)
         Me.Button1.TabIndex = 783
         Me.Button1.Text = "休假核准"
         Me.Button1.UseVisualStyleBackColor = True
@@ -76,25 +85,25 @@ Partial Class 休假核准
         '
         Me.事由_tb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.事由_tb.Location = New System.Drawing.Point(182, 54)
+        Me.事由_tb.Location = New System.Drawing.Point(54, 54)
         Me.事由_tb.Multiline = True
         Me.事由_tb.Name = "事由_tb"
-        Me.事由_tb.Size = New System.Drawing.Size(689, 44)
+        Me.事由_tb.Size = New System.Drawing.Size(367, 44)
         Me.事由_tb.TabIndex = 782
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(132, 57)
+        Me.Label7.Location = New System.Drawing.Point(4, 57)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(44, 16)
+        Me.Label7.Size = New System.Drawing.Size(43, 16)
         Me.Label7.TabIndex = 781
         Me.Label7.Text = "事    由"
         '
         '請假日期_tb
         '
         Me.請假日期_tb.Enabled = False
-        Me.請假日期_tb.Location = New System.Drawing.Point(436, 3)
+        Me.請假日期_tb.Location = New System.Drawing.Point(308, 3)
         Me.請假日期_tb.Name = "請假日期_tb"
         Me.請假日期_tb.Size = New System.Drawing.Size(113, 23)
         Me.請假日期_tb.TabIndex = 780
@@ -102,63 +111,63 @@ Partial Class 休假核准
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(374, 6)
+        Me.Label6.Location = New System.Drawing.Point(246, 6)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(56, 16)
+        Me.Label6.Size = New System.Drawing.Size(55, 16)
         Me.Label6.TabIndex = 779
-        Me.Label6.Text = "特假日期"
+        Me.Label6.Text = "請假日期"
         '
         '員工編號_tb
         '
         Me.員工編號_tb.Enabled = False
-        Me.員工編號_tb.Location = New System.Drawing.Point(436, 29)
+        Me.員工編號_tb.Location = New System.Drawing.Point(189, 29)
         Me.員工編號_tb.Name = "員工編號_tb"
-        Me.員工編號_tb.Size = New System.Drawing.Size(113, 23)
+        Me.員工編號_tb.Size = New System.Drawing.Size(51, 23)
         Me.員工編號_tb.TabIndex = 778
         '
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(374, 32)
+        Me.Label4.Location = New System.Drawing.Point(127, 32)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(56, 16)
+        Me.Label4.Size = New System.Drawing.Size(55, 16)
         Me.Label4.TabIndex = 777
         Me.Label4.Text = "員工編號"
         '
         '申請人_tb
         '
         Me.申請人_tb.Enabled = False
-        Me.申請人_tb.Location = New System.Drawing.Point(182, 29)
+        Me.申請人_tb.Location = New System.Drawing.Point(54, 29)
         Me.申請人_tb.Name = "申請人_tb"
-        Me.申請人_tb.Size = New System.Drawing.Size(186, 23)
+        Me.申請人_tb.Size = New System.Drawing.Size(71, 23)
         Me.申請人_tb.TabIndex = 776
         '
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(132, 32)
+        Me.Label3.Location = New System.Drawing.Point(4, 32)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(44, 16)
+        Me.Label3.Size = New System.Drawing.Size(43, 16)
         Me.Label3.TabIndex = 775
         Me.Label3.Text = "申請人"
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(565, 31)
+        Me.Label1.Location = New System.Drawing.Point(247, 31)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(32, 16)
+        Me.Label1.Size = New System.Drawing.Size(55, 16)
         Me.Label1.TabIndex = 774
-        Me.Label1.Text = "類別"
+        Me.Label1.Text = "類        別"
         '
         '請假類別_cb
         '
         Me.請假類別_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.請假類別_cb.FormattingEnabled = True
         Me.請假類別_cb.Items.AddRange(New Object() {"特休", "病假", "婚嫁", "喪假", "事假"})
-        Me.請假類別_cb.Location = New System.Drawing.Point(617, 28)
+        Me.請假類別_cb.Location = New System.Drawing.Point(308, 28)
         Me.請假類別_cb.Name = "請假類別_cb"
-        Me.請假類別_cb.Size = New System.Drawing.Size(254, 24)
+        Me.請假類別_cb.Size = New System.Drawing.Size(113, 24)
         Me.請假類別_cb.TabIndex = 773
         '
         '月份_cb
@@ -166,7 +175,7 @@ Partial Class 休假核准
         Me.月份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.月份_cb.FormattingEnabled = True
         Me.月份_cb.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"})
-        Me.月份_cb.Location = New System.Drawing.Point(297, 3)
+        Me.月份_cb.Location = New System.Drawing.Point(169, 3)
         Me.月份_cb.Name = "月份_cb"
         Me.月份_cb.Size = New System.Drawing.Size(71, 24)
         Me.月份_cb.TabIndex = 772
@@ -176,7 +185,7 @@ Partial Class 休假核准
         Me.年份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.年份_cb.FormattingEnabled = True
         Me.年份_cb.Items.AddRange(New Object() {"2019", "2020", "2021", "2022", "2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030"})
-        Me.年份_cb.Location = New System.Drawing.Point(182, 3)
+        Me.年份_cb.Location = New System.Drawing.Point(54, 3)
         Me.年份_cb.Name = "年份_cb"
         Me.年份_cb.Size = New System.Drawing.Size(71, 24)
         Me.年份_cb.TabIndex = 771
@@ -184,18 +193,18 @@ Partial Class 休假核准
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(259, 6)
+        Me.Label16.Location = New System.Drawing.Point(131, 6)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(32, 16)
+        Me.Label16.Size = New System.Drawing.Size(31, 16)
         Me.Label16.TabIndex = 770
         Me.Label16.Text = "月份"
         '
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(133, 6)
+        Me.Label17.Location = New System.Drawing.Point(5, 6)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(41, 16)
+        Me.Label17.Size = New System.Drawing.Size(40, 16)
         Me.Label17.TabIndex = 769
         Me.Label17.Text = "年   份"
         '
@@ -207,7 +216,7 @@ Partial Class 休假核准
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.人員_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.人員_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.人員_dgv.Location = New System.Drawing.Point(651, 161)
+        Me.人員_dgv.Location = New System.Drawing.Point(6, 32)
         Me.人員_dgv.Name = "人員_dgv"
         Me.人員_dgv.RowHeadersWidth = 5
         Me.人員_dgv.RowTemplate.Height = 24
@@ -215,23 +224,90 @@ Partial Class 休假核准
         Me.人員_dgv.TabIndex = 768
         Me.人員_dgv.Visible = False
         '
-        'PictureBox1
+        'PictureBox2
         '
-        Me.PictureBox1.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.logo0001
-        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox1.Location = New System.Drawing.Point(9, 3)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(120, 120)
-        Me.PictureBox1.TabIndex = 785
-        Me.PictureBox1.TabStop = False
+        Me.PictureBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.PictureBox2.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
+        Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.PictureBox2.Location = New System.Drawing.Point(552, 2)
+        Me.PictureBox2.Name = "PictureBox2"
+        Me.PictureBox2.Size = New System.Drawing.Size(392, 594)
+        Me.PictureBox2.TabIndex = 1407
+        Me.PictureBox2.TabStop = False
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.圖片流水號_tb)
+        Me.Panel1.Controls.Add(Me.資料指定圖庫_tb)
+        Me.Panel1.Controls.Add(Me.人員_dgv)
+        Me.Panel1.Location = New System.Drawing.Point(168, 174)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(200, 100)
+        Me.Panel1.TabIndex = 1408
+        '
+        '圖片流水號_tb
+        '
+        Me.圖片流水號_tb.Enabled = False
+        Me.圖片流水號_tb.Location = New System.Drawing.Point(98, 3)
+        Me.圖片流水號_tb.Name = "圖片流水號_tb"
+        Me.圖片流水號_tb.Size = New System.Drawing.Size(94, 23)
+        Me.圖片流水號_tb.TabIndex = 1646
+        '
+        '資料指定圖庫_tb
+        '
+        Me.資料指定圖庫_tb.Enabled = False
+        Me.資料指定圖庫_tb.Location = New System.Drawing.Point(3, 3)
+        Me.資料指定圖庫_tb.Name = "資料指定圖庫_tb"
+        Me.資料指定圖庫_tb.Size = New System.Drawing.Size(94, 23)
+        Me.資料指定圖庫_tb.TabIndex = 1645
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(11, 599)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(502, 96)
+        Me.Label2.TabIndex = 1409
+        Me.Label2.Text = "勞工喪假規定： " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "一、父母、養父母、繼父母、配偶喪亡者，給予喪假八日，工資照給。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "二、祖父母、子女、配偶之父母、配偶之養父母或繼父母喪亡者，給予喪假六日，工資" &
+    "照給。 " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "三、曾祖父母、兄弟姊妹、配偶之祖父母喪亡者，給予喪假三日，工資照給。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "勞工病假規定 :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "只要一年內未請超過30天病假，當天薪資就是折半發給。"
+        '
+        'Label5
+        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(534, 599)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(394, 96)
+        Me.Label5.TabIndex = 1410
+        Me.Label5.Text = "勞工婚假規定： " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "勞工結婚者給予婚假八日，工資照給。』 前開婚假應自結婚之日前十日起" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "三個月內請畢。 但經雇主同意者，得於一年內請畢，並自即日生效。" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "勞工婚" &
+    "假規定： " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "勞工因有事故必須親自處理者，得請事假，一年內合計不得超過十四日。 " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "事假期間不給工資。"
+        '
+        '假期統計_dgv
+        '
+        Me.假期統計_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.假期統計_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.假期統計_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.假期統計_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.假期統計_dgv.Location = New System.Drawing.Point(423, 2)
+        Me.假期統計_dgv.Name = "假期統計_dgv"
+        Me.假期統計_dgv.RowHeadersWidth = 5
+        Me.假期統計_dgv.RowTemplate.Height = 24
+        Me.假期統計_dgv.Size = New System.Drawing.Size(126, 120)
+        Me.假期統計_dgv.TabIndex = 1411
         '
         '休假核准
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(881, 600)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.月清單_DGV)
+        Me.ClientSize = New System.Drawing.Size(946, 697)
+        Me.Controls.Add(Me.假期統計_dgv)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.PictureBox2)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.事由_tb)
         Me.Controls.Add(Me.Label7)
@@ -247,7 +323,8 @@ Partial Class 休假核准
         Me.Controls.Add(Me.年份_cb)
         Me.Controls.Add(Me.Label16)
         Me.Controls.Add(Me.Label17)
-        Me.Controls.Add(Me.人員_dgv)
+        Me.Controls.Add(Me.月清單_DGV)
+        Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "休假核准"
@@ -255,7 +332,10 @@ Partial Class 休假核准
         Me.Text = "休假核准"
         CType(Me.月清單_DGV, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.人員_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -278,5 +358,11 @@ Partial Class 休假核准
     Friend WithEvents Label16 As Label
     Friend WithEvents Label17 As Label
     Friend WithEvents 人員_dgv As DataGridView
-    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents PictureBox2 As PictureBox
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents 圖片流水號_tb As TextBox
+    Friend WithEvents 資料指定圖庫_tb As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents 假期統計_dgv As DataGridView
 End Class

GRAMS-SYS/02、休假管理/休假核准.vb

@@ -1,6 +1,7 @@
-Public Class 休假核准
-    ReadOnly ds, ds1 As New DataSet
+Imports System.IO
+Public Class 休假核准
     Private Sub 讀取人員資料表()
+        Dim ds As New DataSet
         人員_dgv.DataSource = Nothing : ds.Clear()
         人員_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         人員_dgv.ColumnHeadersHeight = 25
@@ -19,6 +20,7 @@
         conn.Close()
     End Sub
     Private Sub Set_考勤明細()
+        Dim ds1 As New DataSet
         月清單_DGV.DataSource = Nothing : ds1.Clear()
         月清單_DGV.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         月清單_DGV.ColumnHeadersHeight = 40
@@ -28,7 +30,8 @@
 
         月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 40 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 65
         月清單_DGV.Columns(4).FillWeight = 55 : 月清單_DGV.Columns(5).FillWeight = 200 : 月清單_DGV.Columns(6).FillWeight = 80 : 月清單_DGV.Columns(7).FillWeight = 80
-        月清單_DGV.Columns(8).FillWeight = 80
+        月清單_DGV.Columns(8).FillWeight = 80 : 月清單_DGV.Columns("圖片資料庫").Visible = False : 月清單_DGV.Columns("圖片編號").Visible = False
+        月清單_DGV.Columns("核准人").Visible = False : 月清單_DGV.Columns("核准日期").Visible = False : 月清單_DGV.Columns("是否生效").Visible = False
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1
             If 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期六" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
             ElseIf 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期日" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
@@ -38,6 +41,15 @@
             End If
         Next
     End Sub
+    Private Sub Set_假期統計()
+        Dim ds As New DataSet
+        假期統計_dgv.DataSource = Nothing : ds.Clear()
+        假期統計_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        假期統計_dgv.ColumnHeadersHeight = 25
+        假期統計_dgv.AllowUserToAddRows = False
+        PA = 員工編號_tb.Text : PA1 = 請假日期_tb.Text : SQL_休假統計()
+        da.Fill(ds) : 假期統計_dgv.DataSource = ds.Tables(0) : conn.Close()
+    End Sub
     Private Sub 特休核准_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         年份_下拉表單資料載入()
         年份_cb.Text = Year(Today) : 月份_cb.SelectedIndex = Month(Today) - 1 : 請假類別_cb.SelectedIndex = 0
@@ -52,15 +64,21 @@
     End Sub
     Private Sub 月清單_DGV_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 月清單_DGV.CellClick
         If e.RowIndex = -1 Then : Else
-            If 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期六" Or 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期日" Or
-                月清單_DGV.Rows(e.RowIndex).Cells("請假類別").Value.ToString = "國定假日" Then
-                MsgBox("星期六/星期日或國定假日不可以申請特休!!")
-                請假日期_tb.Text = ""
-                事由_tb.Text = ""
+            員工編號_tb.Text = 月清單_DGV("編號", e.RowIndex).Value.ToString : 申請人_tb.Text = 月清單_DGV("姓名", e.RowIndex).Value.ToString
+            請假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString : 事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
+            請假類別_cb.Text = 月清單_DGV("請假類別", e.RowIndex).Value.ToString
+            資料指定圖庫_tb.Text = 月清單_DGV("圖片資料庫", e.RowIndex).Value.ToString : 圖片流水號_tb.Text = 月清單_DGV("圖片編號", e.RowIndex).Value.ToString
+            '------------驗貨報告讀取--------------------------------------------------------------------------------------------
+            If 資料指定圖庫_tb.Text <> "" And 圖片流水號_tb.Text <> "" Then
+                圖片庫 = 資料指定圖庫_tb.Text : SQL_連線字串_圖片資料庫() : PA2 = 圖片流水號_tb.Text
+                SQL_請假圖() : PictureBox2.Image = Nothing
+                While dr.Read() = True
+                    Dim unused As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                    Dim oStream As New MemoryStream(bytes) : PictureBox2.Image = Bitmap.FromStream(oStream)
+                End While : conn.Close() : PictureBox2.SizeMode = 4
             Else
-                員工編號_tb.Text = 月清單_DGV("編號", e.RowIndex).Value.ToString : 申請人_tb.Text = 月清單_DGV("姓名", e.RowIndex).Value.ToString
-                請假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString : 事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
-            End If
+                PictureBox2.Image = Nothing
+            End If : Set_假期統計()
         End If
     End Sub
     Private Sub Set_日期格式轉換()

GRAMS-SYS/02、休假管理/休假申請.Designer.vb

@@ -22,7 +22,13 @@ Partial Class 休假申請
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.月清單_DGV = New System.Windows.Forms.DataGridView()
         Me.申請_bt = New System.Windows.Forms.Button()
         Me.事由_tb = New System.Windows.Forms.TextBox()
@@ -44,6 +50,8 @@ Partial Class 休假申請
         Me.刪除_bt = New System.Windows.Forms.Button()
         Me.圖片導入系統_bt = New System.Windows.Forms.Button()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.請休假時數_cb = New System.Windows.Forms.ComboBox()
         Me.視窗2_pl = New System.Windows.Forms.Panel()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.確定導入_bt = New System.Windows.Forms.Button()
@@ -77,12 +85,36 @@ Partial Class 休假申請
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.月清單_DGV.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.月清單_DGV.DefaultCellStyle = DataGridViewCellStyle2
         Me.月清單_DGV.Location = New System.Drawing.Point(189, 98)
         Me.月清單_DGV.Name = "月清單_DGV"
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.月清單_DGV.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(748, 500)
+        Me.月清單_DGV.Size = New System.Drawing.Size(493, 500)
         Me.月清單_DGV.TabIndex = 801
         '
         '申請_bt
@@ -90,7 +122,7 @@ Partial Class 休假申請
         Me.申請_bt.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.SAVER
         Me.申請_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.申請_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.申請_bt.Location = New System.Drawing.Point(603, 4)
+        Me.申請_bt.Location = New System.Drawing.Point(681, 4)
         Me.申請_bt.Name = "申請_bt"
         Me.申請_bt.Size = New System.Drawing.Size(46, 46)
         Me.申請_bt.TabIndex = 800
@@ -104,7 +136,7 @@ Partial Class 休假申請
         Me.事由_tb.Location = New System.Drawing.Point(234, 52)
         Me.事由_tb.Multiline = True
         Me.事由_tb.Name = "事由_tb"
-        Me.事由_tb.Size = New System.Drawing.Size(703, 44)
+        Me.事由_tb.Size = New System.Drawing.Size(448, 44)
         Me.事由_tb.TabIndex = 799
         '
         'Label7
@@ -239,15 +271,39 @@ Partial Class 休假申請
         '
         '人員_dgv
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
         Me.人員_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.人員_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.人員_dgv.BackgroundColor = System.Drawing.Color.White
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.人員_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
         Me.人員_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.人員_dgv.DefaultCellStyle = DataGridViewCellStyle6
         Me.人員_dgv.Location = New System.Drawing.Point(2, 3)
         Me.人員_dgv.Name = "人員_dgv"
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.人員_dgv.RowHeadersDefaultCellStyle = DataGridViewCellStyle7
         Me.人員_dgv.RowHeadersWidth = 5
         Me.人員_dgv.RowTemplate.Height = 24
         Me.人員_dgv.Size = New System.Drawing.Size(186, 595)
@@ -260,7 +316,7 @@ Partial Class 休假申請
         Me.PictureBox1.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
         Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.PictureBox1.Location = New System.Drawing.Point(938, 53)
+        Me.PictureBox1.Location = New System.Drawing.Point(683, 53)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(345, 545)
         Me.PictureBox1.TabIndex = 1406
@@ -271,7 +327,7 @@ Partial Class 休假申請
         Me.刪除_bt.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.GarbageEmpty
         Me.刪除_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.刪除_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.刪除_bt.Location = New System.Drawing.Point(655, 4)
+        Me.刪除_bt.Location = New System.Drawing.Point(733, 4)
         Me.刪除_bt.Name = "刪除_bt"
         Me.刪除_bt.Size = New System.Drawing.Size(46, 46)
         Me.刪除_bt.TabIndex = 1408
@@ -282,7 +338,7 @@ Partial Class 休假申請
         Me.圖片導入系統_bt.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Add_Image
         Me.圖片導入系統_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.圖片導入系統_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.圖片導入系統_bt.Location = New System.Drawing.Point(706, 4)
+        Me.圖片導入系統_bt.Location = New System.Drawing.Point(784, 4)
         Me.圖片導入系統_bt.Name = "圖片導入系統_bt"
         Me.圖片導入系統_bt.Size = New System.Drawing.Size(120, 46)
         Me.圖片導入系統_bt.TabIndex = 1407
@@ -290,6 +346,8 @@ Partial Class 休假申請
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.Label5)
+        Me.Panel1.Controls.Add(Me.請休假時數_cb)
         Me.Panel1.Controls.Add(Me.視窗2_pl)
         Me.Panel1.Controls.Add(Me.刪除_bt)
         Me.Panel1.Controls.Add(Me.人員_dgv)
@@ -297,7 +355,6 @@ Partial Class 休假申請
         Me.Panel1.Controls.Add(Me.Label17)
         Me.Panel1.Controls.Add(Me.PictureBox1)
         Me.Panel1.Controls.Add(Me.Label16)
-        Me.Panel1.Controls.Add(Me.月清單_DGV)
         Me.Panel1.Controls.Add(Me.年份_cb)
         Me.Panel1.Controls.Add(Me.申請_bt)
         Me.Panel1.Controls.Add(Me.月份_cb)
@@ -311,12 +368,34 @@ Partial Class 休假申請
         Me.Panel1.Controls.Add(Me.申請人_tb)
         Me.Panel1.Controls.Add(Me.員工編號_tb)
         Me.Panel1.Controls.Add(Me.Label4)
+        Me.Panel1.Controls.Add(Me.月清單_DGV)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1285, 600)
+        Me.Panel1.Size = New System.Drawing.Size(1030, 600)
         Me.Panel1.TabIndex = 1409
         '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Label5.Location = New System.Drawing.Point(606, 8)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(67, 16)
+        Me.Label5.TabIndex = 1411
+        Me.Label5.Text = "請休假時數"
+        '
+        '請休假時數_cb
+        '
+        Me.請休假時數_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.請休假時數_cb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.請休假時數_cb.FormattingEnabled = True
+        Me.請休假時數_cb.Items.AddRange(New Object() {"", "1.0小時", "1.5小時", "2.0小時", "2.5小時", "3.0小時", "3.5小時", "4.0小時", "4.5小時", "5.0小時", "5.5小時", "6.0小時", "6.5小時", "7.0小時", "7.5小時", "8.0小時"})
+        Me.請休假時數_cb.Location = New System.Drawing.Point(607, 26)
+        Me.請休假時數_cb.Name = "請休假時數_cb"
+        Me.請休假時數_cb.Size = New System.Drawing.Size(66, 24)
+        Me.請休假時數_cb.TabIndex = 1410
+        '
         '視窗2_pl
         '
         Me.視窗2_pl.BackColor = System.Drawing.Color.White
@@ -324,7 +403,7 @@ Partial Class 休假申請
         Me.視窗2_pl.Controls.Add(Me.Panel3)
         Me.視窗2_pl.Controls.Add(Me.Label2)
         Me.視窗2_pl.Controls.Add(Me.CanceL2_bt)
-        Me.視窗2_pl.Location = New System.Drawing.Point(345, 69)
+        Me.視窗2_pl.Location = New System.Drawing.Point(301, 106)
         Me.視窗2_pl.Name = "視窗2_pl"
         Me.視窗2_pl.Size = New System.Drawing.Size(527, 479)
         Me.視窗2_pl.TabIndex = 1409
@@ -398,6 +477,7 @@ Partial Class 休假申請
         Me.檔案名稱_tb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.檔案名稱_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.檔案名稱_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.檔案名稱_tb.ForeColor = System.Drawing.Color.Black
         Me.檔案名稱_tb.Location = New System.Drawing.Point(3, 386)
         Me.檔案名稱_tb.Multiline = True
@@ -487,9 +567,9 @@ Partial Class 休假申請
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1285, 600)
-        Me.Controls.Add(Me.Panel2)
+        Me.ClientSize = New System.Drawing.Size(1030, 600)
         Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.Panel2)
         Me.Name = "休假申請"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "休假申請"
@@ -546,4 +626,6 @@ Partial Class 休假申請
     Friend WithEvents 資料指定圖庫_tb As TextBox
     Friend WithEvents 檔案路徑2_tb As TextBox
     Friend WithEvents 預設圖片庫_tb As TextBox
+    Friend WithEvents 請休假時數_cb As ComboBox
+    Friend WithEvents Label5 As Label
 End Class

GRAMS-SYS/02、休假管理/休假申請.vb

@@ -1,6 +1,8 @@
-Public Class 休假申請
+Imports System.IO
+
+Public Class 休假申請
     ReadOnly ds, ds1 As New DataSet
-    Dim 生效 As String
+    Dim 生效 As String : Dim 圖片新建, 剛開啟 As Boolean
     Private Sub 讀取人員資料表()
         人員_dgv.DataSource = Nothing : ds.Clear()
         人員_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -9,6 +11,8 @@
         SQL_考勤明細表_人員()
         da.Fill(ds) : 人員_dgv.DataSource = ds.Tables(0) : conn.Close()
         人員_dgv.Columns(0).FillWeight = 70 : 人員_dgv.Columns(1).FillWeight = 80 : 人員_dgv.Columns(2).FillWeight = 100 : 人員_dgv.Columns(3).Visible = False
+        人員_dgv.Columns(4).Visible = False : 人員_dgv.Columns(5).Visible = False : 人員_dgv.Columns(6).Visible = False : 人員_dgv.Columns(7).Visible = False
+        人員_dgv.Columns(8).Visible = False : 人員_dgv.Columns(9).Visible = False
         For i As Integer = 0 To 人員_dgv.Rows.Count - 1
             人員_dgv.Rows(i).Cells("No.").Value = i + 1
         Next
@@ -28,6 +32,8 @@
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
 
         月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 80 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 90
+        月清單_DGV.Columns("圖片資料庫").Visible = False : 月清單_DGV.Columns("圖片編號").Visible = False : 月清單_DGV.Columns(5).Visible = False
+        月清單_DGV.Columns(6).Visible = False : 月清單_DGV.Columns("申請時數").FillWeight = 50
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1
             If 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期六" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
             ElseIf 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期日" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
@@ -37,12 +43,14 @@
         Next
     End Sub
     Private Sub 特休申請_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Panel1.SendToBack() : 視窗2_pl.Visible = False
+        Panel2.SendToBack() : 視窗2_pl.Visible = False : 剛開啟 = True
         WebBrowser2.Navigate(Environment.GetFolderPath(Environment.SpecialFolder.Desktop))
     End Sub
     Private Sub 特休申請_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        SQL_資料庫選擇() : If dr.Read() Then : 預設圖片庫_tb.Text = dr("圖片資料庫").ToString : Else : MsgBox("圖片資料庫已滿，請找系統管理員!!") : Me.Close() : End If
+
         年份_下拉表單資料載入() : 年份_cb.Text = Year(Today) : 月份_cb.SelectedIndex = Month(Today) - 1
-        請假類別_cb.SelectedIndex = 0 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : 讀取人員資料表()
+        請假類別_cb.SelectedIndex = 0 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : 剛開啟 = False : 讀取人員資料表()
 
         If CC(16) = False Then : 人員_dgv.Enabled = False : 申請人_tb.Text = gUserName
             SQL_考勤明細表_讀取編號() : If dr.Read() Then : 員工編號_tb.Text = dr("DIN") : End If : Set_考勤明細()
@@ -51,26 +59,38 @@
     Private Sub 人員_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 人員_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             員工編號_tb.Text = 人員_dgv("編號", e.RowIndex).Value.ToString : 申請人_tb.Text = 人員_dgv("姓名", e.RowIndex).Value.ToString
-            Set_考勤明細()
+            請休假時數_cb.Text = "" : Set_考勤明細()
         End If
     End Sub
     Private Sub 月清單_DGV_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 月清單_DGV.CellClick
         If e.RowIndex = -1 Then : Else
             If 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期六" Or 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期日" Or
                 月清單_DGV.Rows(e.RowIndex).Cells("請假類別").Value.ToString = "國定假日" Then
-                MsgBox("星期六/星期日或國定假日不可以申請休假!!")
-                特假日期_tb.Text = ""
-                事由_tb.Text = ""
-            Else
-                特假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString
+                特假日期_tb.Text = "" : 事由_tb.Text = "" : PictureBox1.Image = Nothing
+                MsgBox("星期六/星期日或國定假日不需要申請休假!!")
+            Else 特假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString
                 事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
                 生效 = 月清單_DGV("是否生效", e.RowIndex).Value.ToString
+                請假類別_cb.Text = 月清單_DGV("請假類別", e.RowIndex).Value.ToString
+                請休假時數_cb.Text = 月清單_DGV("申請時數", e.RowIndex).Value.ToString
+                資料指定圖庫_tb.Text = 月清單_DGV("圖片資料庫", e.RowIndex).Value.ToString : 圖片流水號_tb.Text = 月清單_DGV("圖片編號", e.RowIndex).Value.ToString
+                '------------驗貨報告讀取--------------------------------------------------------------------------------------------
+                If 資料指定圖庫_tb.Text <> "" And 圖片流水號_tb.Text <> "" Then
+                    圖片庫 = 資料指定圖庫_tb.Text : SQL_連線字串_圖片資料庫() : PA2 = 圖片流水號_tb.Text
+                    SQL_請假圖() : PictureBox1.Image = Nothing
+                    While dr.Read() = True
+                        Dim unused As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                        Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
+                    End While : conn.Close() : PictureBox1.SizeMode = 4
+                Else
+                    PictureBox1.Image = Nothing
+                End If
             End If
         End If
     End Sub
     Private Sub 申請_bt_Click(sender As Object, e As EventArgs) Handles 申請_bt.Click
-        If 特假日期_tb.Text = "" Then
-            MsgBox("日期不能為空白")
+        If 特假日期_tb.Text = "" Or 請休假時數_cb.Text = "" Or 申請人_tb.Text = "" Then
+            MsgBox("人員、日期、請休假時數 不能為空白!!")
         Else
             If 生效 = "已核准" Or 生效 = "未核准" Then : MsgBox("已簽核的資料不能再做修改")
             Else
@@ -81,17 +101,64 @@
         End If
     End Sub
     Private Sub 刪除_bt_Click(sender As Object, e As EventArgs) Handles 刪除_bt.Click
-        If 特假日期_tb.Text = "" Then
-            MsgBox("日期不能為空白")
+        If 特假日期_tb.Text = "" Or 申請人_tb.Text = "" Then
+            MsgBox("人員、日期、請休假時數 不能為空白!!")
         Else
             If 生效 = "已核准" Or 生效 = "未核准" Then : MsgBox("已簽核的資料不能再做修改")
             Else : SQL_申請刪除() : Set_考勤明細() : MsgBox("儲存完成") : End If
         End If
     End Sub
+    Private Sub 確定導入_bt_Click(sender As Object, e As EventArgs) Handles 確定導入_bt.Click
+        If 檔案路徑2_tb.Text <> "" Then
+            If 特假日期_tb.Text = "" Or 請休假時數_cb.Text = "" Or 申請人_tb.Text = "" Then
+                MsgBox("人員、日期、請休假時數 不能為空白!!")
+            Else
+                If 生效 = "已核准" Or 生效 = "未核准" Then : MsgBox("已簽核的資料不能再做修改") : Else
+                    SQL_請假申請讀取()
+                    If dr.Read Then
+                        圖片導入準備() : SQL_請假申請修改() : 圖片導入()
+                    Else
+                        圖片導入準備() : SQL_請假申請新增() : 圖片導入()
+                    End If
+                    Set_考勤明細() : MsgBox("圖片導入完成")
+                    Dim image As Image = Image.FromFile(檔案路徑2_tb.Text)
+                    PictureBox1.Image = image : PictureBox1.SizeMode = 4
+                End If
+            End If
+            檔案路徑2_tb.Text = ""
+        Else : MsgBox("沒有準備圖片!!") : End If
+    End Sub
+    Private Sub 圖片導入準備()
+        If 資料指定圖庫_tb.Text = "" Then
+            圖片庫 = 預設圖片庫_tb.Text : SQL_連線字串_圖片資料庫() : 資料指定圖庫_tb.Text = 預設圖片庫_tb.Text
+            SQL_查詢最後一筆圖片編號1()
+            If dr.Read() Then : 圖片流水號_tb.Text = dr("流水號").ToString : Else : 圖片流水號_tb.Text = "0" : End If : conn.Close()
+            Dim NUM1 As Integer
+            NUM1 = Double.Parse(Strings.Right(圖片流水號_tb.Text, 8)) + 1
+            If NUM1 < 10 Then : 圖片流水號_tb.Text = "IR" & "0000000" & NUM1
+            ElseIf NUM1 > 9 And NUM1 < 100 Then : 圖片流水號_tb.Text = "IR" & "000000" & NUM1
+            ElseIf NUM1 > 99 And NUM1 < 1000 Then : 圖片流水號_tb.Text = "IR" & "00000" & NUM1
+            ElseIf NUM1 > 999 And NUM1 < 10000 Then : 圖片流水號_tb.Text = "IR" & "0000" & NUM1
+            ElseIf NUM1 > 9999 And NUM1 < 100000 Then : 圖片流水號_tb.Text = "IR" & "000" & NUM1
+            ElseIf NUM1 > 99999 And NUM1 < 100000 Then : 圖片流水號_tb.Text = "IR" & "00" & NUM1
+            ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : 圖片流水號_tb.Text = "IR" & "0" & NUM1
+            ElseIf NUM1 > 9999999 Then : 圖片流水號_tb.Text = "IR" & NUM1 : End If : 圖片新建 = True
+        Else
+            圖片庫 = 資料指定圖庫_tb.Text : SQL_連線字串_圖片資料庫() : 圖片新建 = False
+        End If
+    End Sub
+    Private Sub 圖片導入()
+        If 圖片新建 = True Then
+            PA49 = 檔案路徑2_tb.Text : SQL_新增請假圖()
+        Else
+            PA49 = 檔案路徑2_tb.Text : SQL_修改請假圖()
+        End If
+    End Sub
     Private Sub 月份_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 月份_cb.SelectedIndexChanged
-        PA1 = 年份_cb.Text : PA2 = 月份_cb.Text
-        讀取人員資料表()
-        Set_考勤明細()
+        If 剛開啟 = False Then : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : 讀取人員資料表() : Set_考勤明細() : End If
+    End Sub
+    Private Sub 年份_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 年份_cb.SelectedIndexChanged
+        If 剛開啟 = False Then : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : 讀取人員資料表() : Set_考勤明細() : End If
     End Sub
     Private Sub 月清單_DGV_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 月清單_DGV.RowPostPaint
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1

GRAMS-SYS/02、休假管理/歷史休假紀錄.Designer.vb

@@ -22,8 +22,8 @@ Partial Class 歷史休假紀錄
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.月清單_DGV = New System.Windows.Forms.DataGridView()
         Me.事由_tb = New System.Windows.Forms.TextBox()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -41,25 +41,34 @@ Partial Class 歷史休假紀錄
         Me.Label17 = New System.Windows.Forms.Label()
         Me.人員_dgv = New System.Windows.Forms.DataGridView()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.圖片流水號_tb = New System.Windows.Forms.TextBox()
+        Me.資料指定圖庫_tb = New System.Windows.Forms.TextBox()
+        Me.假期統計_dgv = New System.Windows.Forms.DataGridView()
         CType(Me.月清單_DGV, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.人員_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '月清單_DGV
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Gainsboro
-        Me.月清單_DGV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.Gainsboro
+        Me.月清單_DGV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
         Me.月清單_DGV.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.月清單_DGV.Location = New System.Drawing.Point(9, 125)
         Me.月清單_DGV.Name = "月清單_DGV"
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(862, 472)
+        Me.月清單_DGV.Size = New System.Drawing.Size(677, 472)
         Me.月清單_DGV.TabIndex = 802
         '
         '事由_tb
@@ -69,7 +78,7 @@ Partial Class 歷史休假紀錄
         Me.事由_tb.Location = New System.Drawing.Point(182, 55)
         Me.事由_tb.Multiline = True
         Me.事由_tb.Name = "事由_tb"
-        Me.事由_tb.Size = New System.Drawing.Size(689, 69)
+        Me.事由_tb.Size = New System.Drawing.Size(367, 69)
         Me.事由_tb.TabIndex = 800
         '
         'Label7
@@ -77,7 +86,7 @@ Partial Class 歷史休假紀錄
         Me.Label7.AutoSize = True
         Me.Label7.Location = New System.Drawing.Point(132, 58)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(44, 16)
+        Me.Label7.Size = New System.Drawing.Size(43, 16)
         Me.Label7.TabIndex = 799
         Me.Label7.Text = "事    由"
         '
@@ -94,7 +103,7 @@ Partial Class 歷史休假紀錄
         Me.Label6.AutoSize = True
         Me.Label6.Location = New System.Drawing.Point(374, 7)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(56, 16)
+        Me.Label6.Size = New System.Drawing.Size(55, 16)
         Me.Label6.TabIndex = 797
         Me.Label6.Text = "特假日期"
         '
@@ -111,7 +120,7 @@ Partial Class 歷史休假紀錄
         Me.Label4.AutoSize = True
         Me.Label4.Location = New System.Drawing.Point(374, 33)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(56, 16)
+        Me.Label4.Size = New System.Drawing.Size(55, 16)
         Me.Label4.TabIndex = 795
         Me.Label4.Text = "員工編號"
         '
@@ -120,7 +129,7 @@ Partial Class 歷史休假紀錄
         Me.申請人_tb.Enabled = False
         Me.申請人_tb.Location = New System.Drawing.Point(182, 30)
         Me.申請人_tb.Name = "申請人_tb"
-        Me.申請人_tb.Size = New System.Drawing.Size(186, 23)
+        Me.申請人_tb.Size = New System.Drawing.Size(71, 23)
         Me.申請人_tb.TabIndex = 794
         '
         'Label3
@@ -128,16 +137,16 @@ Partial Class 歷史休假紀錄
         Me.Label3.AutoSize = True
         Me.Label3.Location = New System.Drawing.Point(132, 33)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(44, 16)
+        Me.Label3.Size = New System.Drawing.Size(43, 16)
         Me.Label3.TabIndex = 793
         Me.Label3.Text = "申請人"
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(565, 32)
+        Me.Label1.Location = New System.Drawing.Point(259, 33)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(32, 16)
+        Me.Label1.Size = New System.Drawing.Size(31, 16)
         Me.Label1.TabIndex = 792
         Me.Label1.Text = "類別"
         '
@@ -146,9 +155,9 @@ Partial Class 歷史休假紀錄
         Me.請假類別_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.請假類別_cb.FormattingEnabled = True
         Me.請假類別_cb.Items.AddRange(New Object() {"特休", "病假", "婚嫁", "喪假", "事假"})
-        Me.請假類別_cb.Location = New System.Drawing.Point(617, 29)
+        Me.請假類別_cb.Location = New System.Drawing.Point(297, 30)
         Me.請假類別_cb.Name = "請假類別_cb"
-        Me.請假類別_cb.Size = New System.Drawing.Size(254, 24)
+        Me.請假類別_cb.Size = New System.Drawing.Size(71, 24)
         Me.請假類別_cb.TabIndex = 791
         '
         '月份_cb
@@ -176,7 +185,7 @@ Partial Class 歷史休假紀錄
         Me.Label16.AutoSize = True
         Me.Label16.Location = New System.Drawing.Point(259, 7)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(32, 16)
+        Me.Label16.Size = New System.Drawing.Size(31, 16)
         Me.Label16.TabIndex = 788
         Me.Label16.Text = "月份"
         '
@@ -185,23 +194,23 @@ Partial Class 歷史休假紀錄
         Me.Label17.AutoSize = True
         Me.Label17.Location = New System.Drawing.Point(133, 7)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(41, 16)
+        Me.Label17.Size = New System.Drawing.Size(40, 16)
         Me.Label17.TabIndex = 787
         Me.Label17.Text = "年   份"
         '
         '人員_dgv
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
         Me.人員_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.人員_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.人員_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.人員_dgv.Location = New System.Drawing.Point(651, 162)
+        Me.人員_dgv.Location = New System.Drawing.Point(3, 36)
         Me.人員_dgv.Name = "人員_dgv"
         Me.人員_dgv.RowHeadersWidth = 5
         Me.人員_dgv.RowTemplate.Height = 24
-        Me.人員_dgv.Size = New System.Drawing.Size(186, 96)
+        Me.人員_dgv.Size = New System.Drawing.Size(80, 38)
         Me.人員_dgv.TabIndex = 786
         Me.人員_dgv.Visible = False
         '
@@ -215,13 +224,67 @@ Partial Class 歷史休假紀錄
         Me.PictureBox1.TabIndex = 803
         Me.PictureBox1.TabStop = False
         '
+        'PictureBox2
+        '
+        Me.PictureBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.PictureBox2.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
+        Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.PictureBox2.Location = New System.Drawing.Point(688, 2)
+        Me.PictureBox2.Name = "PictureBox2"
+        Me.PictureBox2.Size = New System.Drawing.Size(392, 594)
+        Me.PictureBox2.TabIndex = 1408
+        Me.PictureBox2.TabStop = False
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.圖片流水號_tb)
+        Me.Panel1.Controls.Add(Me.資料指定圖庫_tb)
+        Me.Panel1.Controls.Add(Me.人員_dgv)
+        Me.Panel1.Location = New System.Drawing.Point(110, 175)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(200, 100)
+        Me.Panel1.TabIndex = 1409
+        '
+        '圖片流水號_tb
+        '
+        Me.圖片流水號_tb.Enabled = False
+        Me.圖片流水號_tb.Location = New System.Drawing.Point(98, 7)
+        Me.圖片流水號_tb.Name = "圖片流水號_tb"
+        Me.圖片流水號_tb.Size = New System.Drawing.Size(94, 23)
+        Me.圖片流水號_tb.TabIndex = 1648
+        '
+        '資料指定圖庫_tb
+        '
+        Me.資料指定圖庫_tb.Enabled = False
+        Me.資料指定圖庫_tb.Location = New System.Drawing.Point(3, 7)
+        Me.資料指定圖庫_tb.Name = "資料指定圖庫_tb"
+        Me.資料指定圖庫_tb.Size = New System.Drawing.Size(94, 23)
+        Me.資料指定圖庫_tb.TabIndex = 1647
+        '
+        '假期統計_dgv
+        '
+        Me.假期統計_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.假期統計_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.假期統計_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.假期統計_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.假期統計_dgv.Location = New System.Drawing.Point(551, 3)
+        Me.假期統計_dgv.Name = "假期統計_dgv"
+        Me.假期統計_dgv.RowHeadersWidth = 5
+        Me.假期統計_dgv.RowTemplate.Height = 24
+        Me.假期統計_dgv.Size = New System.Drawing.Size(135, 120)
+        Me.假期統計_dgv.TabIndex = 1412
+        '
         '歷史休假紀錄
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(881, 600)
+        Me.ClientSize = New System.Drawing.Size(1083, 600)
+        Me.Controls.Add(Me.假期統計_dgv)
+        Me.Controls.Add(Me.PictureBox2)
         Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.月清單_DGV)
         Me.Controls.Add(Me.事由_tb)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.請假日期_tb)
@@ -236,7 +299,8 @@ Partial Class 歷史休假紀錄
         Me.Controls.Add(Me.年份_cb)
         Me.Controls.Add(Me.Label16)
         Me.Controls.Add(Me.Label17)
-        Me.Controls.Add(Me.人員_dgv)
+        Me.Controls.Add(Me.月清單_DGV)
+        Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "歷史休假紀錄"
@@ -245,6 +309,10 @@ Partial Class 歷史休假紀錄
         CType(Me.月清單_DGV, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.人員_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        CType(Me.假期統計_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -267,4 +335,9 @@ Partial Class 歷史休假紀錄
     Friend WithEvents Label16 As Label
     Friend WithEvents Label17 As Label
     Friend WithEvents 人員_dgv As DataGridView
+    Friend WithEvents PictureBox2 As PictureBox
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents 圖片流水號_tb As TextBox
+    Friend WithEvents 資料指定圖庫_tb As TextBox
+    Friend WithEvents 假期統計_dgv As DataGridView
 End Class

GRAMS-SYS/02、休假管理/歷史休假紀錄.vb

@@ -1,4 +1,6 @@
-Public Class 歷史休假紀錄
+Imports System.IO
+
+Public Class 歷史休假紀錄
     ReadOnly ds, ds1 As New DataSet
     Private Sub 讀取人員資料表()
         人員_dgv.DataSource = Nothing : ds.Clear()
@@ -27,8 +29,17 @@
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
 
         月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 40 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 65
-        月清單_DGV.Columns(4).FillWeight = 55 : 月清單_DGV.Columns(5).FillWeight = 200 : 月清單_DGV.Columns(6).FillWeight = 80 : 月清單_DGV.Columns(7).FillWeight = 80
-        月清單_DGV.Columns(8).FillWeight = 80
+        月清單_DGV.Columns(4).FillWeight = 55 : 月清單_DGV.Columns(5).FillWeight = 150 : 月清單_DGV.Columns(6).FillWeight = 60 : 月清單_DGV.Columns(7).FillWeight = 80
+        月清單_DGV.Columns(8).FillWeight = 80 : 月清單_DGV.Columns("圖片資料庫").Visible = False : 月清單_DGV.Columns("圖片編號").Visible = False
+    End Sub
+    Private Sub Set_假期統計()
+        Dim ds As New DataSet
+        假期統計_dgv.DataSource = Nothing : ds.Clear()
+        假期統計_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        假期統計_dgv.ColumnHeadersHeight = 25
+        假期統計_dgv.AllowUserToAddRows = False
+        PA = 員工編號_tb.Text : PA1 = 請假日期_tb.Text : SQL_休假統計()
+        da.Fill(ds) : 假期統計_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub 歷史休假紀錄_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         年份_下拉表單資料載入()
@@ -52,7 +63,20 @@
             Else
                 員工編號_tb.Text = 月清單_DGV("編號", e.RowIndex).Value.ToString : 申請人_tb.Text = 月清單_DGV("姓名", e.RowIndex).Value.ToString
                 請假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString : 事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
-            End If
+                請假類別_cb.Text = 月清單_DGV("請假類別", e.RowIndex).Value.ToString
+                資料指定圖庫_tb.Text = 月清單_DGV("圖片資料庫", e.RowIndex).Value.ToString : 圖片流水號_tb.Text = 月清單_DGV("圖片編號", e.RowIndex).Value.ToString
+                '------------驗貨報告讀取--------------------------------------------------------------------------------------------
+                If 資料指定圖庫_tb.Text <> "" And 圖片流水號_tb.Text <> "" Then
+                    圖片庫 = 資料指定圖庫_tb.Text : SQL_連線字串_圖片資料庫() : PA2 = 圖片流水號_tb.Text
+                    SQL_請假圖() : PictureBox2.Image = Nothing
+                    While dr.Read() = True
+                        Dim unused As Byte() = New Byte(-1) {} : Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
+                        Dim oStream As New MemoryStream(bytes) : PictureBox2.Image = Bitmap.FromStream(oStream)
+                    End While : conn.Close() : PictureBox2.SizeMode = 4
+                Else
+                    PictureBox2.Image = Nothing
+                End If
+            End If : Set_假期統計()
         End If
     End Sub
     Private Sub 月清單_DGV_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 月清單_DGV.RowPostPaint

GRAMS-SYS/03、加班管理/加班審核.Designer.vb

@@ -51,8 +51,9 @@ Partial Class 加班審核
         '
         '月清單_DGV
         '
-        Me.月清單_DGV.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.月清單_DGV.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -60,7 +61,7 @@ Partial Class 加班審核
         Me.月清單_DGV.Name = "月清單_DGV"
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(1163, 518)
+        Me.月清單_DGV.Size = New System.Drawing.Size(994, 518)
         Me.月清單_DGV.TabIndex = 816
         '
         '事由_tb
@@ -152,11 +153,13 @@ Partial Class 加班審核
         '
         '加班核准_bt
         '
+        Me.加班核准_bt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.加班核准_bt.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.加班核准_bt.ForeColor = System.Drawing.Color.Blue
         Me.加班核准_bt.Location = New System.Drawing.Point(915, 2)
         Me.加班核准_bt.Name = "加班核准_bt"
-        Me.加班核准_bt.Size = New System.Drawing.Size(248, 37)
+        Me.加班核准_bt.Size = New System.Drawing.Size(79, 37)
         Me.加班核准_bt.TabIndex = 817
         Me.加班核准_bt.Text = "加班核准"
         Me.加班核准_bt.UseVisualStyleBackColor = True
@@ -217,11 +220,13 @@ Partial Class 加班審核
         '
         '加班未准_bt
         '
+        Me.加班未准_bt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.加班未准_bt.Font = New System.Drawing.Font("微軟正黑體", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.加班未准_bt.ForeColor = System.Drawing.Color.Red
         Me.加班未准_bt.Location = New System.Drawing.Point(915, 38)
         Me.加班未准_bt.Name = "加班未准_bt"
-        Me.加班未准_bt.Size = New System.Drawing.Size(248, 37)
+        Me.加班未准_bt.Size = New System.Drawing.Size(79, 37)
         Me.加班未准_bt.TabIndex = 824
         Me.加班未准_bt.Text = "加班未准"
         Me.加班未准_bt.UseVisualStyleBackColor = True
@@ -257,13 +262,12 @@ Partial Class 加班審核
         '
         'PictureBox1
         '
-        Me.PictureBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
+        Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.PictureBox1.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
         Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.PictureBox1.Location = New System.Drawing.Point(1167, 3)
+        Me.PictureBox1.Location = New System.Drawing.Point(998, 3)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(366, 592)
         Me.PictureBox1.TabIndex = 1406
@@ -273,7 +277,7 @@ Partial Class 加班審核
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1536, 600)
+        Me.ClientSize = New System.Drawing.Size(1367, 600)
         Me.Controls.Add(Me.PictureBox1)
         Me.Controls.Add(Me.默認核准_bt)
         Me.Controls.Add(Me.DTP2_tb)

GRAMS-SYS/03、加班管理/加班審核.vb

@@ -11,9 +11,9 @@ Public Class 加班審核
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
 
         月清單_DGV.Columns(1).Visible = False
-        月清單_DGV.Columns(0).FillWeight = 60 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 60 : 月清單_DGV.Columns(4).FillWeight = 90
+        月清單_DGV.Columns(0).FillWeight = 60 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 60 : 月清單_DGV.Columns(4).Visible = False
         月清單_DGV.Columns(5).FillWeight = 100 : 月清單_DGV.Columns(6).FillWeight = 200 : 月清單_DGV.Columns(7).FillWeight = 80 : 月清單_DGV.Columns(8).FillWeight = 90
-        月清單_DGV.Columns(9).FillWeight = 80 : 月清單_DGV.Columns(10).FillWeight = 90 : 月清單_DGV.Columns(11).FillWeight = 60 : 月清單_DGV.Columns(12).Visible = False
+        月清單_DGV.Columns(9).FillWeight = 80 : 月清單_DGV.Columns(10).FillWeight = 90 : 月清單_DGV.Columns(11).Visible = False : 月清單_DGV.Columns(12).Visible = False
         月清單_DGV.Columns(13).Visible = False
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1
             If 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期六" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink

GRAMS-SYS/03、加班管理/加班申請.Designer.vb

@@ -81,7 +81,7 @@ Partial Class 加班申請
         Me.月清單_DGV.Name = "月清單_DGV"
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(789, 486)
+        Me.月清單_DGV.Size = New System.Drawing.Size(520, 486)
         Me.月清單_DGV.TabIndex = 818
         '
         '事由_tb
@@ -92,7 +92,7 @@ Partial Class 加班申請
         Me.事由_tb.Location = New System.Drawing.Point(194, 51)
         Me.事由_tb.Multiline = True
         Me.事由_tb.Name = "事由_tb"
-        Me.事由_tb.Size = New System.Drawing.Size(740, 59)
+        Me.事由_tb.Size = New System.Drawing.Size(471, 59)
         Me.事由_tb.TabIndex = 816
         '
         'Label7
@@ -283,7 +283,7 @@ Partial Class 加班申請
         Me.視窗2_pl.Controls.Add(Me.Panel3)
         Me.視窗2_pl.Controls.Add(Me.Label2)
         Me.視窗2_pl.Controls.Add(Me.CanceL2_bt)
-        Me.視窗2_pl.Location = New System.Drawing.Point(363, 62)
+        Me.視窗2_pl.Location = New System.Drawing.Point(249, 81)
         Me.視窗2_pl.Name = "視窗2_pl"
         Me.視窗2_pl.Size = New System.Drawing.Size(527, 479)
         Me.視窗2_pl.TabIndex = 1403
@@ -388,10 +388,9 @@ Partial Class 加班申請
         '
         'Panel5
         '
+        Me.Panel5.Controls.Add(Me.視窗2_pl)
         Me.Panel5.Controls.Add(Me.PictureBox1)
         Me.Panel5.Controls.Add(Me.刪除_bt)
-        Me.Panel5.Controls.Add(Me.Panel1)
-        Me.Panel5.Controls.Add(Me.視窗2_pl)
         Me.Panel5.Controls.Add(Me.人員_dgv)
         Me.Panel5.Controls.Add(Me.圖片導入系統_bt)
         Me.Panel5.Controls.Add(Me.Label17)
@@ -408,10 +407,11 @@ Partial Class 加班申請
         Me.Panel5.Controls.Add(Me.申請人_tb)
         Me.Panel5.Controls.Add(Me.Label6)
         Me.Panel5.Controls.Add(Me.月清單_DGV)
+        Me.Panel5.Controls.Add(Me.Panel1)
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel5.Location = New System.Drawing.Point(0, 0)
         Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(1285, 600)
+        Me.Panel5.Size = New System.Drawing.Size(1016, 600)
         Me.Panel5.TabIndex = 1404
         '
         'PictureBox1
@@ -421,7 +421,7 @@ Partial Class 加班申請
         Me.PictureBox1.BackgroundImage = Global.HSKIN_MIS_SYS.My.Resources.Resources.Picture
         Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.PictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.PictureBox1.Location = New System.Drawing.Point(935, 51)
+        Me.PictureBox1.Location = New System.Drawing.Point(666, 51)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(345, 545)
         Me.PictureBox1.TabIndex = 1405
@@ -464,7 +464,7 @@ Partial Class 加班申請
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1285, 600)
+        Me.ClientSize = New System.Drawing.Size(1016, 600)
         Me.Controls.Add(Me.Panel5)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)

GRAMS-SYS/03、加班管理/加班申請.vb

@@ -11,6 +11,8 @@ Public Class 加班申請
         SQL_考勤明細表_人員()
         da.Fill(ds) : 人員_dgv.DataSource = ds.Tables(0) : conn.Close()
         人員_dgv.Columns(0).FillWeight = 70 : 人員_dgv.Columns(1).Visible = False : 人員_dgv.Columns(2).FillWeight = 100 : 人員_dgv.Columns(3).Visible = False
+        人員_dgv.Columns(4).Visible = False : 人員_dgv.Columns(5).Visible = False : 人員_dgv.Columns(6).Visible = False : 人員_dgv.Columns(7).Visible = False
+        人員_dgv.Columns(8).Visible = False : 人員_dgv.Columns(9).Visible = False
         For i As Integer = 0 To 人員_dgv.Rows.Count - 1
             人員_dgv.Rows(i).Cells("No.").Value = i + 1
         Next
@@ -29,9 +31,9 @@ Public Class 加班申請
         PA = 員工編號_tb.Text : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : SQL_加班申請()
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
 
-        月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 60 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 170
-        月清單_DGV.Columns(4).FillWeight = 70 : 月清單_DGV.Columns(5).FillWeight = 80 : 月清單_DGV.Columns(6).FillWeight = 90 : 月清單_DGV.Columns(7).FillWeight = 80
-        月清單_DGV.Columns(8).FillWeight = 90 : 月清單_DGV.Columns(9).Visible = False : 月清單_DGV.Columns(10).Visible = False
+        月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 60 : 月清單_DGV.Columns(2).FillWeight = 110 : 月清單_DGV.Columns(3).FillWeight = 150
+        月清單_DGV.Columns(4).FillWeight = 50 : 月清單_DGV.Columns(5).Visible = False : 月清單_DGV.Columns(6).Visible = False : 月清單_DGV.Columns(7).Visible = False
+        月清單_DGV.Columns(8).Visible = False : 月清單_DGV.Columns(9).Visible = False : 月清單_DGV.Columns(10).Visible = False
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1
             If 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期六" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
             ElseIf 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期日" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
@@ -112,7 +114,7 @@ Public Class 加班申請
                     End If
                     Set_加班明細() : MsgBox("圖片導入完成")
                     Dim image As Image = Image.FromFile(檔案路徑2_tb.Text)
-                    PictureBox1.Image = image
+                    PictureBox1.Image = image : PictureBox1.SizeMode = 4
                 End If
             End If
             檔案路徑2_tb.Text = ""

GRAMS-SYS/04、考勤管理/到離職管理.Designer.vb

@@ -22,7 +22,7 @@ Partial Class 到離職管理
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.月清單_DGV = New System.Windows.Forms.DataGridView()
         Me.申請_bt = New System.Windows.Forms.Button()
         Me.事由_tb = New System.Windows.Forms.TextBox()
@@ -50,22 +50,23 @@ Partial Class 到離職管理
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.月清單_DGV.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.月清單_DGV.BackgroundColor = System.Drawing.Color.White
         Me.月清單_DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.月清單_DGV.Location = New System.Drawing.Point(201, 116)
+        Me.月清單_DGV.Location = New System.Drawing.Point(192, 98)
         Me.月清單_DGV.Name = "月清單_DGV"
         Me.月清單_DGV.RowHeadersWidth = 5
         Me.月清單_DGV.RowTemplate.Height = 24
-        Me.月清單_DGV.Size = New System.Drawing.Size(670, 439)
+        Me.月清單_DGV.Size = New System.Drawing.Size(521, 470)
         Me.月清單_DGV.TabIndex = 818
         '
         '申請_bt
         '
-        Me.申請_bt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+        Me.申請_bt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.申請_bt.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.申請_bt.Location = New System.Drawing.Point(201, 561)
+        Me.申請_bt.Location = New System.Drawing.Point(192, 569)
         Me.申請_bt.Name = "申請_bt"
-        Me.申請_bt.Size = New System.Drawing.Size(670, 29)
+        Me.申請_bt.Size = New System.Drawing.Size(521, 29)
         Me.申請_bt.TabIndex = 817
         Me.申請_bt.Text = "申請"
         Me.申請_bt.UseVisualStyleBackColor = True
@@ -74,25 +75,25 @@ Partial Class 到離職管理
         '
         Me.事由_tb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.事由_tb.Location = New System.Drawing.Point(250, 66)
+        Me.事由_tb.Location = New System.Drawing.Point(236, 52)
         Me.事由_tb.Multiline = True
         Me.事由_tb.Name = "事由_tb"
-        Me.事由_tb.Size = New System.Drawing.Size(621, 44)
+        Me.事由_tb.Size = New System.Drawing.Size(477, 44)
         Me.事由_tb.TabIndex = 816
         '
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(212, 69)
+        Me.Label7.Location = New System.Drawing.Point(198, 55)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(32, 16)
+        Me.Label7.Size = New System.Drawing.Size(31, 16)
         Me.Label7.TabIndex = 815
         Me.Label7.Text = "事由"
         '
         '特假日期_tb
         '
         Me.特假日期_tb.Enabled = False
-        Me.特假日期_tb.Location = New System.Drawing.Point(504, 10)
+        Me.特假日期_tb.Location = New System.Drawing.Point(490, 2)
         Me.特假日期_tb.Name = "特假日期_tb"
         Me.特假日期_tb.Size = New System.Drawing.Size(113, 23)
         Me.特假日期_tb.TabIndex = 814
@@ -100,16 +101,16 @@ Partial Class 到離職管理
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(442, 14)
+        Me.Label6.Location = New System.Drawing.Point(428, 6)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(56, 16)
+        Me.Label6.Size = New System.Drawing.Size(55, 16)
         Me.Label6.TabIndex = 813
         Me.Label6.Text = "休假日期"
         '
         '員工編號_tb
         '
         Me.員工編號_tb.Enabled = False
-        Me.員工編號_tb.Location = New System.Drawing.Point(504, 39)
+        Me.員工編號_tb.Location = New System.Drawing.Point(490, 27)
         Me.員工編號_tb.Name = "員工編號_tb"
         Me.員工編號_tb.Size = New System.Drawing.Size(113, 23)
         Me.員工編號_tb.TabIndex = 812
@@ -117,16 +118,16 @@ Partial Class 到離職管理
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(442, 42)
+        Me.Label4.Location = New System.Drawing.Point(428, 30)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(56, 16)
+        Me.Label4.Size = New System.Drawing.Size(55, 16)
         Me.Label4.TabIndex = 811
         Me.Label4.Text = "員工編號"
         '
         '申請人_tb
         '
         Me.申請人_tb.Enabled = False
-        Me.申請人_tb.Location = New System.Drawing.Point(250, 39)
+        Me.申請人_tb.Location = New System.Drawing.Point(236, 28)
         Me.申請人_tb.Name = "申請人_tb"
         Me.申請人_tb.Size = New System.Drawing.Size(186, 23)
         Me.申請人_tb.TabIndex = 810
@@ -134,18 +135,18 @@ Partial Class 到離職管理
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(200, 42)
+        Me.Label3.Location = New System.Drawing.Point(186, 30)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(44, 16)
+        Me.Label3.Size = New System.Drawing.Size(43, 16)
         Me.Label3.TabIndex = 809
         Me.Label3.Text = "申請人"
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(650, 42)
+        Me.Label1.Location = New System.Drawing.Point(606, 30)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(32, 16)
+        Me.Label1.Size = New System.Drawing.Size(31, 16)
         Me.Label1.TabIndex = 808
         Me.Label1.Text = "類別"
         '
@@ -154,9 +155,9 @@ Partial Class 到離職管理
         Me.請假類別_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.請假類別_cb.FormattingEnabled = True
         Me.請假類別_cb.Items.AddRange(New Object() {"未到", "離職"})
-        Me.請假類別_cb.Location = New System.Drawing.Point(685, 38)
+        Me.請假類別_cb.Location = New System.Drawing.Point(641, 26)
         Me.請假類別_cb.Name = "請假類別_cb"
-        Me.請假類別_cb.Size = New System.Drawing.Size(186, 24)
+        Me.請假類別_cb.Size = New System.Drawing.Size(72, 24)
         Me.請假類別_cb.TabIndex = 807
         '
         '月份_cb
@@ -164,7 +165,7 @@ Partial Class 到離職管理
         Me.月份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.月份_cb.FormattingEnabled = True
         Me.月份_cb.Items.AddRange(New Object() {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"})
-        Me.月份_cb.Location = New System.Drawing.Point(365, 11)
+        Me.月份_cb.Location = New System.Drawing.Point(351, 3)
         Me.月份_cb.Name = "月份_cb"
         Me.月份_cb.Size = New System.Drawing.Size(71, 24)
         Me.月份_cb.TabIndex = 806
@@ -174,7 +175,7 @@ Partial Class 到離職管理
         Me.年份_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.年份_cb.FormattingEnabled = True
         Me.年份_cb.Items.AddRange(New Object() {"2019", "2020", "2021", "2022", "2023", "2024", "2025", "2026", "2027", "2028", "2029", "2030"})
-        Me.年份_cb.Location = New System.Drawing.Point(250, 11)
+        Me.年份_cb.Location = New System.Drawing.Point(236, 3)
         Me.年份_cb.Name = "年份_cb"
         Me.年份_cb.Size = New System.Drawing.Size(71, 24)
         Me.年份_cb.TabIndex = 805
@@ -182,43 +183,45 @@ Partial Class 到離職管理
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(327, 14)
+        Me.Label16.Location = New System.Drawing.Point(313, 6)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(32, 16)
+        Me.Label16.Size = New System.Drawing.Size(31, 16)
         Me.Label16.TabIndex = 804
         Me.Label16.Text = "月份"
         '
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(212, 14)
+        Me.Label17.Location = New System.Drawing.Point(198, 6)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(32, 16)
+        Me.Label17.Size = New System.Drawing.Size(31, 16)
         Me.Label17.TabIndex = 803
         Me.Label17.Text = "年份"
         '
         '人員_dgv
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.人員_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.人員_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.人員_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.人員_dgv.BackgroundColor = System.Drawing.Color.White
         Me.人員_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.人員_dgv.Location = New System.Drawing.Point(9, 14)
+        Me.人員_dgv.Location = New System.Drawing.Point(2, 1)
         Me.人員_dgv.Name = "人員_dgv"
         Me.人員_dgv.RowHeadersWidth = 5
         Me.人員_dgv.RowTemplate.Height = 24
-        Me.人員_dgv.Size = New System.Drawing.Size(186, 576)
+        Me.人員_dgv.Size = New System.Drawing.Size(186, 597)
         Me.人員_dgv.TabIndex = 802
         '
         '到離職管理
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(881, 600)
+        Me.ClientSize = New System.Drawing.Size(719, 600)
         Me.Controls.Add(Me.月清單_DGV)
         Me.Controls.Add(Me.申請_bt)
+        Me.Controls.Add(Me.人員_dgv)
         Me.Controls.Add(Me.事由_tb)
         Me.Controls.Add(Me.Label7)
         Me.Controls.Add(Me.特假日期_tb)
@@ -233,7 +236,6 @@ Partial Class 到離職管理
         Me.Controls.Add(Me.年份_cb)
         Me.Controls.Add(Me.Label16)
         Me.Controls.Add(Me.Label17)
-        Me.Controls.Add(Me.人員_dgv)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "到離職管理"

GRAMS-SYS/04、考勤管理/到離職管理.vb

@@ -9,6 +9,8 @@
         SQL_考勤明細表_人員()
         da.Fill(ds) : 人員_dgv.DataSource = ds.Tables(0) : conn.Close()
         人員_dgv.Columns(0).FillWeight = 70 : 人員_dgv.Columns(1).FillWeight = 80 : 人員_dgv.Columns(2).FillWeight = 100 : 人員_dgv.Columns(3).Visible = False
+        人員_dgv.Columns(4).Visible = False : 人員_dgv.Columns(5).Visible = False : 人員_dgv.Columns(6).Visible = False : 人員_dgv.Columns(7).Visible = False
+        人員_dgv.Columns(8).Visible = False : 人員_dgv.Columns(9).Visible = False
         For i As Integer = 0 To 人員_dgv.Rows.Count - 1
             人員_dgv.Rows(i).Cells("No.").Value = i + 1
         Next
@@ -27,7 +29,8 @@
         PA = 員工編號_tb.Text : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : SQL_國定假日設定_月份考勤()
         da.Fill(ds1) : 月清單_DGV.DataSource = ds1.Tables(0) : conn.Close()
 
-        月清單_DGV.Columns(0).FillWeight = 80 : 月清單_DGV.Columns(1).FillWeight = 80 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 90
+        月清單_DGV.Columns(0).FillWeight = 100 : 月清單_DGV.Columns(1).FillWeight = 80 : 月清單_DGV.Columns(2).FillWeight = 90 : 月清單_DGV.Columns(3).FillWeight = 90
+        月清單_DGV.Columns("圖片資料庫").Visible = False : 月清單_DGV.Columns("圖片編號").Visible = False : 月清單_DGV.Columns("申請時數").Visible = False
         For I As Integer = 0 To 月清單_DGV.Rows.Count - 1
             If 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期六" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
             ElseIf 月清單_DGV.Rows(I).Cells("星期").Value.ToString = "星期日" Then : 月清單_DGV.Rows(I).DefaultCellStyle.BackColor = Color.LightPink
@@ -57,16 +60,9 @@
     End Sub
     Private Sub 月清單_DGV_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 月清單_DGV.CellClick
         If e.RowIndex = -1 Then : Else
-            If 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期六" Or 月清單_DGV.Rows(e.RowIndex).Cells("星期").Value.ToString = "星期日" Or
-                月清單_DGV.Rows(e.RowIndex).Cells("請假類別").Value.ToString = "國定假日" Then
-                MsgBox("星期六/星期日或國定假日不可以申請休假!!")
-                特假日期_tb.Text = ""
-                事由_tb.Text = ""
-            Else
-                特假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString
-                事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
-                生效 = 月清單_DGV("是否生效", e.RowIndex).Value.ToString
-            End If
+            特假日期_tb.Text = 月清單_DGV("日期", e.RowIndex).Value.ToString
+            事由_tb.Text = 月清單_DGV("事由", e.RowIndex).Value.ToString
+            生效 = 月清單_DGV("是否生效", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub 申請_bt_Click(sender As Object, e As EventArgs) Handles 申請_bt.Click

GRAMS-SYS/04、考勤管理/考勤明細表.vb

@@ -16,9 +16,14 @@ Public Class 考勤明細表
         SQL_考勤明細表_人員()
         da.Fill(ds) : 人員_dgv.DataSource = ds.Tables(0) : conn.Close()
         人員_dgv.Columns(0).FillWeight = 70 : 人員_dgv.Columns(1).Visible = False : 人員_dgv.Columns(2).FillWeight = 100 : 人員_dgv.Columns(3).Visible = False
+        人員_dgv.Columns(4).Visible = False : 人員_dgv.Columns(5).Visible = False : 人員_dgv.Columns(6).Visible = False : 人員_dgv.Columns(7).Visible = False
+        人員_dgv.Columns(8).Visible = False : 人員_dgv.Columns(9).Visible = False
         For i As Integer = 0 To 人員_dgv.Rows.Count - 1
             人員_dgv.Rows(i).Cells("No.").Value = i + 1
         Next
+    End Sub
+    Private Sub Set_假期統計()
+
     End Sub
     Private Sub Set_考勤明細()
         月清單_dgv.DataSource = Nothing : ds1.Clear()
@@ -28,13 +33,14 @@ Public Class 考勤明細表
         PA = 編號 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : SQL_考勤明細表_月份考勤()
         da.Fill(ds1) : 月清單_dgv.DataSource = ds1.Tables(0) : conn.Close()
 
-        月清單_dgv.Columns(0).FillWeight = 100 : 月清單_dgv.Columns(1).FillWeight = 60 : 月清單_dgv.Columns(2).FillWeight = 90 : 月清單_dgv.Columns(3).FillWeight = 80
-        月清單_dgv.Columns(4).FillWeight = 60 : 月清單_dgv.Columns(5).Visible = False : 月清單_dgv.Columns(6).Visible = False : 月清單_dgv.Columns(7).Visible = False
-        月清單_dgv.Columns(8).FillWeight = 100 : 月清單_dgv.Columns(9).FillWeight = 100 : 月清單_dgv.Columns(10).FillWeight = 60 : 月清單_dgv.Columns(11).FillWeight = 100
-        月清單_dgv.Columns(12).FillWeight = 100 : 月清單_dgv.Columns(13).FillWeight = 60 : 月清單_dgv.Columns(14).FillWeight = 100 : 月清單_dgv.Columns(15).FillWeight = 100
+        月清單_dgv.Columns(0).FillWeight = 100 : 月清單_dgv.Columns(1).FillWeight = 60 : 月清單_dgv.Columns(2).FillWeight = 90 : 月清單_dgv.Columns(3).FillWeight = 100
+        月清單_dgv.Columns(4).FillWeight = 80 : 月清單_dgv.Columns(5).Visible = False : 月清單_dgv.Columns(6).Visible = False : 月清單_dgv.Columns(7).Visible = False
+        月清單_dgv.Columns(8).FillWeight = 80 : 月清單_dgv.Columns(9).FillWeight = 80 : 月清單_dgv.Columns(10).FillWeight = 60 : 月清單_dgv.Columns(11).FillWeight = 80
+        月清單_dgv.Columns(12).FillWeight = 80 : 月清單_dgv.Columns(13).FillWeight = 60 : 月清單_dgv.Columns(14).FillWeight = 80 : 月清單_dgv.Columns(15).FillWeight = 80
         月清單_dgv.Columns(16).FillWeight = 60 : 月清單_dgv.Columns(17).FillWeight = 60 : 月清單_dgv.Columns(18).Visible = False : 月清單_dgv.Columns(19).FillWeight = 60
         月清單_dgv.Columns(20).FillWeight = 60 : 月清單_dgv.Columns(21).FillWeight = 40 : 月清單_dgv.Columns(22).FillWeight = 40 : 月清單_dgv.Columns(23).FillWeight = 100
         月清單_dgv.Columns(24).FillWeight = 80 : 月清單_dgv.Columns(25).FillWeight = 150 : 月清單_dgv.Columns("休息1").Visible = False : 月清單_dgv.Columns("休息2").Visible = False
+        月清單_dgv.Columns("半天").Visible = False : 月清單_dgv.Columns("班別").Visible = False : 月清單_dgv.Columns("最後下診").Visible = False
         讀取打卡時間1() : 讀取打卡時間2()
         Dim S2, F2 As String
         For I As Integer = 0 To 月清單_dgv.Rows.Count - 1
@@ -356,6 +362,32 @@ Public Class 考勤明細表
 
         加班總_tb.Text = Format((加班時9 + (加班時10 / 60)) + (加班時11 + (加班時12 / 60)) + 加班時8 + 加班時21 +
                                  (加班時17 + 加班時19 + 加班時23 + 加班時25 + (加班時18 + 加班時20 + 加班時24 + 加班時26) / 60), "#,##0.00")
+
+        If 時薪制_ch.Checked = True Then
+            月薪_tb.Text = Strings.Format((CDbl(時薪_tb.Text) * CDbl(常日總_tb.Text)), "#,##0.0")
+        Else
+            時薪_tb.Text = Strings.Format((CDbl(月薪_tb.Text) / 30 / 8), "#,##0.0")
+        End If
+
+        Dim ds As New DataSet
+        假期統計_dgv.DataSource = Nothing : ds.Clear()
+        假期統計_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        假期統計_dgv.ColumnHeadersHeight = 25
+        假期統計_dgv.AllowUserToAddRows = False
+        PA = 編號 : PA1 = 年份_cb.Text & "/" & 月份_cb.Text : SQL_休假統計1()
+        da.Fill(ds) : 假期統計_dgv.DataSource = ds.Tables(0) : conn.Close()
+
+        第1段加班費1_tb.Text = Strings.Format(((CDbl(當月平日一段_tb.Text) + CDbl(一段假日加_tb.Text)) * CDbl(時薪_tb.Text) * 1.34), "#,##0.0")
+        第2段加班費1_tb.Text = Strings.Format(((CDbl(當月平日二段_tb.Text) + CDbl(二段假日加_tb.Text)) * CDbl(時薪_tb.Text) * 1.67), "#,##0.0")
+        第3段加班費1_tb.Text = Strings.Format((CDbl(國假日加_tb.Text) * CDbl(時薪_tb.Text) * 2), "#,##0.0")
+        加班費1_tb.Text = Strings.Format((CDbl(第1段加班費1_tb.Text) + CDbl(第2段加班費1_tb.Text) + CDbl(第3段加班費1_tb.Text)), "#,##0.0")
+        應付小計1_tb.Text = Strings.Format((CDbl(月薪_tb.Text) + CDbl(加班費1_tb.Text) + CDbl(主管加級_tb.Text) + CDbl(職務加級_tb.Text)), "#,##0.0")
+
+        第1段加班費2_tb.Text = Strings.Format(((CDbl(當月平日一段1_tb.Text) + CDbl(一段假日加1_tb.Text)) * CDbl(時薪_tb.Text) * 1.34), "#,##0.0")
+        第2段加班費2_tb.Text = Strings.Format(((CDbl(當月平日二段1_tb.Text) + CDbl(二段假日加1_tb.Text)) * CDbl(時薪_tb.Text) * 1.67), "#,##0.0")
+        第3段加班費2_tb.Text = Strings.Format((CDbl(國假日加1_tb.Text) * CDbl(時薪_tb.Text) * 2), "#,##0.0")
+        加班費2_tb.Text = Strings.Format((CDbl(第1段加班費2_tb.Text) + CDbl(第2段加班費2_tb.Text) + CDbl(第3段加班費2_tb.Text)), "#,##0.0")
+        應付小計2_tb.Text = Strings.Format((CDbl(月薪_tb.Text) + CDbl(加班費2_tb.Text) + CDbl(主管加級_tb.Text) + CDbl(職務加級_tb.Text)), "#,##0.0")
     End Sub
     Private Sub Set_時薪制()
         If 時薪制_ch.Checked = False Then
@@ -474,25 +506,32 @@ Public Class 考勤明細表
         conn.Close()
     End Sub
     Private Sub 考勤明細表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Me.MdiParent = GRAMS_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        'Me.MdiParent = GRAMS_SYS : Me.WindowState = 2 : Me.AutoScroll = True
         年份_下拉表單資料載入() : 讀取班別()
         年份_cb.Text = Year(Today) : 月份_cb.SelectedIndex = Month(Today) - 1
         PA1 = 年份_cb.Text : PA2 = 月份_cb.Text
         讀取日期()
         If CC(16) = False Then
             考勤資料編輯_bt.Enabled = False : 時薪制_ch.Enabled = False : 彈性工時_ch.Enabled = False
-            人員_dgv.Enabled = False
+            人員_dgv.Enabled = False : Panel5.Visible = False
             姓名_tb.Text = gUserName : 資料數 = 31
             For i As Integer = 0 To 人員_dgv.Rows.Count - 1 : If 姓名_tb.Text = 人員_dgv("姓名", i).Value.ToString Then : 時薪制_ch.Checked = 人員_dgv("CC18", i).Value : End If : Next
             SQL_考勤明細表_讀取編號() : If dr.Read() Then : 編號 = dr("DIN") : End If
-            Set_考勤明細() : Set_考勤流水() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+            Set_考勤明細() : PA = 編號 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : Set_考勤流水() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
         End If
     End Sub
     Private Sub 人員_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 人員_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             編號 = 人員_dgv("編號", e.RowIndex).Value.ToString : 姓名_tb.Text = 人員_dgv("姓名", e.RowIndex).Value.ToString
             時薪制_ch.Checked = 人員_dgv("CC18", e.RowIndex).Value
-            資料數 = 31 : Set_考勤明細() : Set_考勤流水() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+            月薪_tb.Text = Strings.Format(CDbl(人員_dgv("月薪", e.RowIndex).Value.ToString), "#,##0.0")
+            時薪_tb.Text = Strings.Format(CDbl(人員_dgv("時薪", e.RowIndex).Value.ToString), "#,##0.0")
+            主管加級_tb.Text = Strings.Format(CDbl(人員_dgv("主管加級", e.RowIndex).Value.ToString), "#,##0.0")
+            職務加級_tb.Text = Strings.Format(CDbl(人員_dgv("職務加級", e.RowIndex).Value.ToString), "#,##0.0")
+            健保費_tb.Text = Strings.Format(CDbl(人員_dgv("健保費", e.RowIndex).Value.ToString), "#,##0.0")
+            勞保費_tb.Text = Strings.Format(CDbl(人員_dgv("勞保費", e.RowIndex).Value.ToString), "#,##0.0")
+            資料數 = 31 : Set_考勤明細() : PA = 編號 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text : Set_考勤流水() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+
         End If
     End Sub
     Private Sub 考勤流水_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 考勤流水_dgv.CellClick
@@ -507,25 +546,45 @@ Public Class 考勤明細表
             時間_tb.Text = Strings.Left(月清單_dgv("日期", e.RowIndex).Value, 4) & "-" & Strings.Mid(月清單_dgv("日期", e.RowIndex).Value, 6, 2) &
                            "-" & Strings.Right(月清單_dgv("日期", e.RowIndex).Value, 2)
             If e.ColumnIndex = 8 Or e.ColumnIndex = 9 Or e.ColumnIndex = 11 Or e.ColumnIndex = 12 Or e.ColumnIndex = 14 Or e.ColumnIndex = 15 Then
-                時間_tb.Text = 時間_tb.Text & " " & 月清單_dgv(e.ColumnIndex, e.RowIndex).Value
-                For i As Integer = 0 To 考勤流水_dgv.Rows.Count - 1
-                    If Len(時間_tb.Text) > 11 Then
-                        If 時間_tb.Text = 考勤流水_dgv("打卡時間", i).Value.ToString Then
-                            ID_tb.Text = 考勤流水_dgv("ID", i).Value : PA3 = 考勤流水_dgv("ID", i).Value : PA6 = 考勤流水_dgv("打卡時間", i).Value.ToString : Exit For
-                        End If
-                    ElseIf Len(時間_tb.Text) = 11 Then
-                        If Strings.Left(時間_tb.Text, 10) = Strings.Left(考勤流水_dgv("打卡時間", i).Value.ToString, 10) Then
-                            ID_tb.Text = 考勤流水_dgv("ID", i).Value : PA3 = 考勤流水_dgv("ID", i).Value : PA6 = 考勤流水_dgv("打卡時間", i).Value.ToString : Exit For
+                If 月清單_dgv(e.ColumnIndex, e.RowIndex).Value <> "" Then
+                    時間_tb.Text = 時間_tb.Text & " " & 月清單_dgv(e.ColumnIndex, e.RowIndex).Value
+                    For i As Integer = 0 To 考勤流水_dgv.Rows.Count - 1
+                        If Len(時間_tb.Text) > 11 Then
+                            If 時間_tb.Text = 考勤流水_dgv("打卡時間", i).Value.ToString Then
+                                ID_tb.Text = 考勤流水_dgv("ID", i).Value : PA3 = 考勤流水_dgv("ID", i).Value : PA6 = 考勤流水_dgv("打卡時間", i).Value.ToString : Exit For
+                            End If
+                        ElseIf Len(時間_tb.Text) = 11 Then
+                            If Strings.Left(時間_tb.Text, 10) = Strings.Left(考勤流水_dgv("打卡時間", i).Value.ToString, 10) Then
+                                ID_tb.Text = 考勤流水_dgv("ID", i).Value : PA3 = 考勤流水_dgv("ID", i).Value : PA6 = 考勤流水_dgv("打卡時間", i).Value.ToString : Exit For
+                            End If
                         End If
+                    Next
+                    If ID_tb.Text = "" Then
+                        If e.ColumnIndex = 8 Then : PA6 = 時間_tb.Text & " 08:00:00"
+                        ElseIf e.ColumnIndex = 9 Then : PA6 = 時間_tb.Text & " 12:00:00"
+                        ElseIf e.ColumnIndex = 11 Then : PA6 = 時間_tb.Text & " 13:00:00"
+                        ElseIf e.ColumnIndex = 12 Then : PA6 = 時間_tb.Text & " 17:00:00"
+                        ElseIf e.ColumnIndex = 14 Then : PA6 = 時間_tb.Text & " 18:00:00"
+                        ElseIf e.ColumnIndex = 15 Then : PA6 = 時間_tb.Text & " 20:00:00"
+                        End If : PA3 = ""
+                    End If
+                Else
+                    If ID_tb.Text = "" Then
+                        If e.ColumnIndex = 8 Then : PA6 = 時間_tb.Text & " 08:00:00"
+                        ElseIf e.ColumnIndex = 9 Then : PA6 = 時間_tb.Text & " 12:00:00"
+                        ElseIf e.ColumnIndex = 11 Then : PA6 = 時間_tb.Text & " 13:00:00"
+                        ElseIf e.ColumnIndex = 12 Then : PA6 = 時間_tb.Text & " 17:00:00"
+                        ElseIf e.ColumnIndex = 14 Then : PA6 = 時間_tb.Text & " 18:00:00"
+                        ElseIf e.ColumnIndex = 15 Then : PA6 = 時間_tb.Text & " 20:00:00"
+                        End If : PA3 = ""
                     End If
-                Next
-                If ID_tb.Text = "" Then
-                    ID_tb.Text = 考勤流水_dgv("ID", 0).Value : PA3 = 考勤流水_dgv("ID", 0).Value : PA6 = 考勤流水_dgv("打卡時間", 0).Value.ToString
                 End If
+                考勤明細表_編輯.時間_dtp.Value = PA6 : 考勤明細表_編輯.姓名_tb.Text = 姓名_tb.Text
+                考勤明細表_編輯.ID_lb.Text = PA3 : 考勤明細表_編輯.ID1_lb.Text = 編號
             Else
                 時間_tb.Text = "" : ID_tb.Text = ""
             End If
-        End If
+        End If : 考勤明細表_編輯.BringToFront()
     End Sub
     Private Sub 月清單_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 月清單_dgv.RowPostPaint
         For I As Integer = 0 To 月清單_dgv.Rows.Count - 1
@@ -554,17 +613,20 @@ Public Class 考勤明細表
         End If
     End Sub
     Private Sub 考勤資料編輯_bt_Click(sender As Object, e As EventArgs) Handles 考勤資料編輯_bt.Click
-        If PA6 <> "" And PA3 <> "" And IsNumeric(PA3) <> False Then
+        If PA6 <> "" Then
             PA4 = PA6 : PA = 年份_cb.Text : PA1 = 月份_cb.Text : PA2 = Strings.Mid(PA6, 9, 2)
-            PA5 = 姓名_tb.Text : PA7 = 編號
-            考勤明細表_編輯.ShowDialog()
-
-            PA = 編號 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text
-            Set_考勤流水() : 資料數 = 31 : Set_考勤明細() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+            PA5 = 姓名_tb.Text : PA7 = 編號 : 考勤明細表_編輯.Show() : 考勤重讀()
         Else
             MsgBox("請選擇右下方的時間，做為修改的依據!!")
         End If
     End Sub
+    Private Sub 考勤重讀()
+        PA = 編號 : PA1 = 年份_cb.Text : PA2 = 月份_cb.Text
+        Set_考勤流水() : 資料數 = 31 : Set_考勤明細() : GRAMS_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+    End Sub
+    Private Sub R_bt_Click(sender As Object, e As EventArgs) Handles R_bt.Click
+        考勤重讀()
+    End Sub
     Private Sub 排班資料_bt_Click(sender As Object, e As EventArgs) Handles 排班資料_bt.Click
         PA = 年份_cb.Text : PA1 = 月份_cb.Text : PA2 = 姓名_tb.Text : 個人班表.Close() : 個人班表.Show()
     End Sub

GRAMS-SYS/04、考勤管理/考勤明細表_編輯.Designer.vb

@@ -49,7 +49,7 @@ Partial Class 考勤明細表_編輯
         Me.Label2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.Label2.Location = New System.Drawing.Point(9, 11)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(32, 16)
+        Me.Label2.Size = New System.Drawing.Size(31, 16)
         Me.Label2.TabIndex = 778
         Me.Label2.Text = "姓名"
         '
@@ -68,18 +68,17 @@ Partial Class 考勤明細表_編輯
         '
         Me.ID_lb.AutoSize = True
         Me.ID_lb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.ID_lb.Location = New System.Drawing.Point(11, 40)
+        Me.ID_lb.Location = New System.Drawing.Point(3, 40)
         Me.ID_lb.Name = "ID_lb"
-        Me.ID_lb.Size = New System.Drawing.Size(24, 16)
+        Me.ID_lb.Size = New System.Drawing.Size(23, 16)
         Me.ID_lb.TabIndex = 788
         Me.ID_lb.Text = "XX"
-        Me.ID_lb.Visible = False
         '
         '修改該筆資料_bt
         '
         Me.修改該筆資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.修改該筆資料_bt.ForeColor = System.Drawing.Color.Green
-        Me.修改該筆資料_bt.Location = New System.Drawing.Point(136, 37)
+        Me.修改該筆資料_bt.Location = New System.Drawing.Point(140, 37)
         Me.修改該筆資料_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.修改該筆資料_bt.Name = "修改該筆資料_bt"
         Me.修改該筆資料_bt.Size = New System.Drawing.Size(91, 39)
@@ -103,7 +102,7 @@ Partial Class 考勤明細表_編輯
         '
         Me.新增資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.新增資料_bt.ForeColor = System.Drawing.Color.Blue
-        Me.新增資料_bt.Location = New System.Drawing.Point(42, 37)
+        Me.新增資料_bt.Location = New System.Drawing.Point(46, 37)
         Me.新增資料_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.新增資料_bt.Name = "新增資料_bt"
         Me.新增資料_bt.Size = New System.Drawing.Size(91, 39)
@@ -115,12 +114,11 @@ Partial Class 考勤明細表_編輯
         '
         Me.ID1_lb.AutoSize = True
         Me.ID1_lb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.ID1_lb.Location = New System.Drawing.Point(11, 56)
+        Me.ID1_lb.Location = New System.Drawing.Point(3, 56)
         Me.ID1_lb.Name = "ID1_lb"
-        Me.ID1_lb.Size = New System.Drawing.Size(24, 16)
+        Me.ID1_lb.Size = New System.Drawing.Size(23, 16)
         Me.ID1_lb.TabIndex = 791
         Me.ID1_lb.Text = "XX"
-        Me.ID1_lb.Visible = False
         '
         '考勤明細表_編輯
         '

GRAMS-SYS/04、考勤管理/考勤明細表_編輯.vb

@@ -6,12 +6,20 @@
         ID1_lb.Text = PA7
     End Sub
     Private Sub 修改該筆資料_bt_Click(sender As Object, e As EventArgs) Handles 修改該筆資料_bt.Click
-        PA4 = ID_lb.Text : PA3 = 時間_dtp.Text : SQL_時間修改() : MsgBox("修改成功!") : Me.Close()
+        If ID_lb.Text = "" Then
+            MsgBox("該考勤位置沒有資料可以修改!!")
+        Else
+            PA4 = ID_lb.Text : PA3 = 時間_dtp.Text : SQL_時間修改() : MsgBox("修改成功!") : 考勤明細表.R_bt.PerformClick()
+        End If
     End Sub
     Private Sub 刪除該筆資料_bt_Click(sender As Object, e As EventArgs) Handles 刪除該筆資料_bt.Click
-        PA4 = ID_lb.Text : PA3 = 時間_dtp.Text : SQL_時間刪除() : MsgBox("刪除成功!") : Me.Close()
+        If ID_lb.Text = "" Then
+            MsgBox("該考勤位置沒有資料可以刪除!!")
+        Else
+            PA4 = ID_lb.Text : PA3 = 時間_dtp.Text : SQL_時間刪除() : MsgBox("刪除成功!") : 考勤明細表.R_bt.PerformClick()
+        End If
     End Sub
     Private Sub 新增資料_bt_Click(sender As Object, e As EventArgs) Handles 新增資料_bt.Click
-        PA4 = ID1_lb.Text : PA3 = 時間_dtp.Text : SQL_時間新增() : MsgBox("新增成功!") : Me.Close()
+        PA4 = ID1_lb.Text : PA3 = 時間_dtp.Text : SQL_時間新增() : MsgBox("新增成功!") : 考勤明細表.R_bt.PerformClick()
     End Sub
 End Class

GRAMS-SYS/10、系統管理/系統設定.Designer.vb

@@ -55,18 +55,7 @@ Partial Class 系統設定
         Me.Label4 = New System.Windows.Forms.Label()
         Me.FTP資料夾_wb = New System.Windows.Forms.WebBrowser()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.晚_tb = New System.Windows.Forms.TextBox()
-        Me.中_tb = New System.Windows.Forms.TextBox()
-        Me.早_tb = New System.Windows.Forms.TextBox()
-        Me.診別_tb = New System.Windows.Forms.TextBox()
-        Me.星期_tb = New System.Windows.Forms.TextBox()
-        Me.時間修改_bt = New System.Windows.Forms.Button()
-        Me.門診_dgv = New System.Windows.Forms.DataGridView()
-        Me.料庫_dgv = New System.Windows.Forms.DataGridView()
+        Me.FTP_dgv = New System.Windows.Forms.DataGridView()
         Me.GroupBox6 = New System.Windows.Forms.GroupBox()
         Me.位置_tb = New System.Windows.Forms.TextBox()
         Me.資料庫刪除_tb = New System.Windows.Forms.Button()
@@ -76,9 +65,6 @@ Partial Class 系統設定
         Me.帳號_tb = New System.Windows.Forms.TextBox()
         Me.地址_tb = New System.Windows.Forms.TextBox()
         Me.資料庫新增_tb = New System.Windows.Forms.Button()
-        Me.日期_dtp = New System.Windows.Forms.DateTimePicker()
-        Me.新增門診_bt = New System.Windows.Forms.Button()
-        Me.刪除門診_bt = New System.Windows.Forms.Button()
         Me.ID_tb = New System.Windows.Forms.TextBox()
         Me.時段_tb = New System.Windows.Forms.TextBox()
         Me.時段1_tb = New System.Windows.Forms.TextBox()
@@ -105,19 +91,32 @@ Partial Class 系統設定
         Me.職務_dgv = New System.Windows.Forms.DataGridView()
         Me.職務_tb = New System.Windows.Forms.TextBox()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.適應症_tb = New System.Windows.Forms.TextBox()
+        Me.適應症_dgv = New System.Windows.Forms.DataGridView()
+        Me.適應症_刪除_bt = New System.Windows.Forms.Button()
+        Me.適應症_修改_bt = New System.Windows.Forms.Button()
+        Me.適應症_新增_bt = New System.Windows.Forms.Button()
+        Me.適應症_編號_tb = New System.Windows.Forms.TextBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.Panel3 = New System.Windows.Forms.Panel()
         Me.GroupBox4.SuspendLayout()
         CType(Me.年份_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         CType(Me.資料夾清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox2.SuspendLayout()
-        Me.GroupBox3.SuspendLayout()
-        CType(Me.門診_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.料庫_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.FTP_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox6.SuspendLayout()
         CType(Me.時段_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox7.SuspendLayout()
         CType(Me.職務_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox5.SuspendLayout()
+        Me.GroupBox3.SuspendLayout()
+        CType(Me.適應症_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
+        Me.Panel2.SuspendLayout()
+        Me.Panel3.SuspendLayout()
         Me.SuspendLayout()
         '
         'GroupBox4
@@ -233,23 +232,21 @@ Partial Class 系統設定
         '
         '本機資料夾_wb
         '
-        Me.本機資料夾_wb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.本機資料夾_wb.Location = New System.Drawing.Point(5, 74)
+        Me.本機資料夾_wb.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.本機資料夾_wb.Location = New System.Drawing.Point(0, 0)
         Me.本機資料夾_wb.MinimumSize = New System.Drawing.Size(20, 20)
         Me.本機資料夾_wb.Name = "本機資料夾_wb"
-        Me.本機資料夾_wb.Size = New System.Drawing.Size(321, 187)
+        Me.本機資料夾_wb.Size = New System.Drawing.Size(323, 191)
         Me.本機資料夾_wb.TabIndex = 690
         Me.本機資料夾_wb.Url = New System.Uri("", System.UriKind.Relative)
         '
         'FTP執行檔_wb
         '
-        Me.FTP執行檔_wb.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.FTP執行檔_wb.Location = New System.Drawing.Point(5, 284)
+        Me.FTP執行檔_wb.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.FTP執行檔_wb.Location = New System.Drawing.Point(0, 0)
         Me.FTP執行檔_wb.MinimumSize = New System.Drawing.Size(20, 20)
         Me.FTP執行檔_wb.Name = "FTP執行檔_wb"
-        Me.FTP執行檔_wb.Size = New System.Drawing.Size(324, 151)
+        Me.FTP執行檔_wb.Size = New System.Drawing.Size(323, 150)
         Me.FTP執行檔_wb.TabIndex = 689
         Me.FTP執行檔_wb.Url = New System.Uri("", System.UriKind.Relative)
         '
@@ -285,16 +282,16 @@ Partial Class 系統設定
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.Panel1)
         Me.GroupBox1.Controls.Add(Me.Label2)
         Me.GroupBox1.Controls.Add(Me.資料庫版本號_lb)
         Me.GroupBox1.Controls.Add(Me.版本號_tb)
         Me.GroupBox1.Controls.Add(Me.修改1_bt)
         Me.GroupBox1.Controls.Add(Me.Label13)
-        Me.GroupBox1.Controls.Add(Me.FTP執行檔_wb)
         Me.GroupBox1.Controls.Add(Me.讀取資料夾路徑_bt)
-        Me.GroupBox1.Controls.Add(Me.本機資料夾_wb)
         Me.GroupBox1.Controls.Add(Me.Label12)
-        Me.GroupBox1.Location = New System.Drawing.Point(259, 2)
+        Me.GroupBox1.Controls.Add(Me.Panel2)
+        Me.GroupBox1.Location = New System.Drawing.Point(454, 2)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(334, 442)
         Me.GroupBox1.TabIndex = 695
@@ -387,13 +384,11 @@ Partial Class 系統設定
         '
         'FTP資料夾_wb
         '
-        Me.FTP資料夾_wb.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.FTP資料夾_wb.Location = New System.Drawing.Point(3, 221)
+        Me.FTP資料夾_wb.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.FTP資料夾_wb.Location = New System.Drawing.Point(0, 0)
         Me.FTP資料夾_wb.MinimumSize = New System.Drawing.Size(20, 20)
         Me.FTP資料夾_wb.Name = "FTP資料夾_wb"
-        Me.FTP資料夾_wb.Size = New System.Drawing.Size(533, 81)
+        Me.FTP資料夾_wb.Size = New System.Drawing.Size(531, 82)
         Me.FTP資料夾_wb.TabIndex = 696
         Me.FTP資料夾_wb.Url = New System.Uri("", System.UriKind.Relative)
         '
@@ -401,7 +396,6 @@ Partial Class 系統設定
         '
         Me.GroupBox2.Controls.Add(Me.資料夾名稱_tb)
         Me.GroupBox2.Controls.Add(Me.指定_tb)
-        Me.GroupBox2.Controls.Add(Me.FTP資料夾_wb)
         Me.GroupBox2.Controls.Add(Me.刪除_bt)
         Me.GroupBox2.Controls.Add(Me.Label4)
         Me.GroupBox2.Controls.Add(Me.修改_bt)
@@ -409,151 +403,27 @@ Partial Class 系統設定
         Me.GroupBox2.Controls.Add(Me.新增_bt)
         Me.GroupBox2.Controls.Add(Me.指定頁面_tb)
         Me.GroupBox2.Controls.Add(Me.備註_tb)
-        Me.GroupBox2.Location = New System.Drawing.Point(592, 135)
+        Me.GroupBox2.Controls.Add(Me.Panel3)
+        Me.GroupBox2.Location = New System.Drawing.Point(787, 135)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(541, 309)
         Me.GroupBox2.TabIndex = 706
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "FTP資料夾管理"
         '
-        'GroupBox3
-        '
-        Me.GroupBox3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GroupBox3.Controls.Add(Me.刪除門診_bt)
-        Me.GroupBox3.Controls.Add(Me.新增門診_bt)
-        Me.GroupBox3.Controls.Add(Me.日期_dtp)
-        Me.GroupBox3.Controls.Add(Me.Label6)
-        Me.GroupBox3.Controls.Add(Me.Label5)
-        Me.GroupBox3.Controls.Add(Me.Label1)
-        Me.GroupBox3.Controls.Add(Me.晚_tb)
-        Me.GroupBox3.Controls.Add(Me.中_tb)
-        Me.GroupBox3.Controls.Add(Me.早_tb)
-        Me.GroupBox3.Controls.Add(Me.診別_tb)
-        Me.GroupBox3.Controls.Add(Me.星期_tb)
-        Me.GroupBox3.Controls.Add(Me.時間修改_bt)
-        Me.GroupBox3.Controls.Add(Me.門診_dgv)
-        Me.GroupBox3.Location = New System.Drawing.Point(1132, 2)
-        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(520, 442)
-        Me.GroupBox3.TabIndex = 707
-        Me.GroupBox3.TabStop = False
-        Me.GroupBox3.Text = "門診資料"
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(443, 20)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(19, 16)
-        Me.Label6.TabIndex = 694
-        Me.Label6.Text = "晚"
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(342, 21)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(19, 16)
-        Me.Label5.TabIndex = 693
-        Me.Label5.Text = "中"
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(242, 21)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(19, 16)
-        Me.Label1.TabIndex = 692
-        Me.Label1.Text = "早"
-        '
-        '晚_tb
-        '
-        Me.晚_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.晚_tb.Location = New System.Drawing.Point(411, 40)
-        Me.晚_tb.Margin = New System.Windows.Forms.Padding(5)
-        Me.晚_tb.Name = "晚_tb"
-        Me.晚_tb.Size = New System.Drawing.Size(101, 23)
-        Me.晚_tb.TabIndex = 691
-        '
-        '中_tb
-        '
-        Me.中_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.中_tb.Location = New System.Drawing.Point(311, 40)
-        Me.中_tb.Margin = New System.Windows.Forms.Padding(5)
-        Me.中_tb.Name = "中_tb"
-        Me.中_tb.Size = New System.Drawing.Size(101, 23)
-        Me.中_tb.TabIndex = 690
-        '
-        '早_tb
-        '
-        Me.早_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.早_tb.Location = New System.Drawing.Point(211, 40)
-        Me.早_tb.Margin = New System.Windows.Forms.Padding(5)
-        Me.早_tb.Name = "早_tb"
-        Me.早_tb.Size = New System.Drawing.Size(101, 23)
-        Me.早_tb.TabIndex = 689
-        '
-        '診別_tb
-        '
-        Me.診別_tb.Enabled = False
-        Me.診別_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.診別_tb.Location = New System.Drawing.Point(110, 40)
-        Me.診別_tb.Margin = New System.Windows.Forms.Padding(5)
-        Me.診別_tb.Name = "診別_tb"
-        Me.診別_tb.Size = New System.Drawing.Size(101, 23)
-        Me.診別_tb.TabIndex = 688
-        '
-        '星期_tb
-        '
-        Me.星期_tb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.星期_tb.Location = New System.Drawing.Point(4, 40)
-        Me.星期_tb.Margin = New System.Windows.Forms.Padding(5)
-        Me.星期_tb.Name = "星期_tb"
-        Me.星期_tb.Size = New System.Drawing.Size(101, 23)
-        Me.星期_tb.TabIndex = 687
-        '
-        '時間修改_bt
-        '
-        Me.時間修改_bt.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.時間修改_bt.ForeColor = System.Drawing.Color.DarkGreen
-        Me.時間修改_bt.Location = New System.Drawing.Point(133, 14)
-        Me.時間修改_bt.Name = "時間修改_bt"
-        Me.時間修改_bt.Size = New System.Drawing.Size(39, 25)
-        Me.時間修改_bt.TabIndex = 225
-        Me.時間修改_bt.Text = "修改"
-        Me.時間修改_bt.UseVisualStyleBackColor = True
-        '
-        '門診_dgv
+        'FTP_dgv
         '
         DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.門診_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
-        Me.門診_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.門診_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.門診_dgv.BackgroundColor = System.Drawing.Color.White
-        Me.門診_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.門診_dgv.Location = New System.Drawing.Point(4, 64)
-        Me.門診_dgv.Name = "門診_dgv"
-        Me.門診_dgv.RowHeadersWidth = 5
-        Me.門診_dgv.RowTemplate.Height = 24
-        Me.門診_dgv.Size = New System.Drawing.Size(510, 372)
-        Me.門診_dgv.TabIndex = 223
-        '
-        '料庫_dgv
-        '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.料庫_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
-        Me.料庫_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.料庫_dgv.BackgroundColor = System.Drawing.Color.White
-        Me.料庫_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.料庫_dgv.Location = New System.Drawing.Point(6, 69)
-        Me.料庫_dgv.Name = "料庫_dgv"
-        Me.料庫_dgv.RowHeadersWidth = 5
-        Me.料庫_dgv.RowTemplate.Height = 24
-        Me.料庫_dgv.Size = New System.Drawing.Size(529, 55)
-        Me.料庫_dgv.TabIndex = 709
+        Me.FTP_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        Me.FTP_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.FTP_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.FTP_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.FTP_dgv.Location = New System.Drawing.Point(6, 69)
+        Me.FTP_dgv.Name = "FTP_dgv"
+        Me.FTP_dgv.RowHeadersWidth = 5
+        Me.FTP_dgv.RowTemplate.Height = 24
+        Me.FTP_dgv.Size = New System.Drawing.Size(529, 55)
+        Me.FTP_dgv.TabIndex = 709
         '
         'GroupBox6
         '
@@ -565,8 +435,8 @@ Partial Class 系統設定
         Me.GroupBox6.Controls.Add(Me.帳號_tb)
         Me.GroupBox6.Controls.Add(Me.地址_tb)
         Me.GroupBox6.Controls.Add(Me.資料庫新增_tb)
-        Me.GroupBox6.Controls.Add(Me.料庫_dgv)
-        Me.GroupBox6.Location = New System.Drawing.Point(592, 2)
+        Me.GroupBox6.Controls.Add(Me.FTP_dgv)
+        Me.GroupBox6.Location = New System.Drawing.Point(787, 2)
         Me.GroupBox6.Name = "GroupBox6"
         Me.GroupBox6.Size = New System.Drawing.Size(541, 133)
         Me.GroupBox6.TabIndex = 710
@@ -636,37 +506,6 @@ Partial Class 系統設定
         Me.資料庫新增_tb.Text = "新增"
         Me.資料庫新增_tb.UseVisualStyleBackColor = True
         '
-        '日期_dtp
-        '
-        Me.日期_dtp.CustomFormat = "yyyy/MM/dd"
-        Me.日期_dtp.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.日期_dtp.Location = New System.Drawing.Point(5, 15)
-        Me.日期_dtp.Name = "日期_dtp"
-        Me.日期_dtp.Size = New System.Drawing.Size(88, 23)
-        Me.日期_dtp.TabIndex = 695
-        '
-        '新增門診_bt
-        '
-        Me.新增門診_bt.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.新增門診_bt.ForeColor = System.Drawing.Color.Blue
-        Me.新增門診_bt.Location = New System.Drawing.Point(94, 14)
-        Me.新增門診_bt.Name = "新增門診_bt"
-        Me.新增門診_bt.Size = New System.Drawing.Size(39, 25)
-        Me.新增門診_bt.TabIndex = 696
-        Me.新增門診_bt.Text = "新增"
-        Me.新增門診_bt.UseVisualStyleBackColor = True
-        '
-        '刪除門診_bt
-        '
-        Me.刪除門診_bt.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.刪除門診_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除門診_bt.Location = New System.Drawing.Point(172, 14)
-        Me.刪除門診_bt.Name = "刪除門診_bt"
-        Me.刪除門診_bt.Size = New System.Drawing.Size(39, 25)
-        Me.刪除門診_bt.TabIndex = 697
-        Me.刪除門診_bt.Text = "刪除"
-        Me.刪除門診_bt.UseVisualStyleBackColor = True
-        '
         'ID_tb
         '
         Me.ID_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -897,8 +736,8 @@ Partial Class 系統設定
         '
         '職務_dgv
         '
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.職務_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.職務_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
         Me.職務_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.職務_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -932,16 +771,122 @@ Partial Class 系統設定
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "工作職務"
         '
+        'GroupBox3
+        '
+        Me.GroupBox3.Controls.Add(Me.適應症_編號_tb)
+        Me.GroupBox3.Controls.Add(Me.適應症_tb)
+        Me.GroupBox3.Controls.Add(Me.適應症_dgv)
+        Me.GroupBox3.Controls.Add(Me.適應症_刪除_bt)
+        Me.GroupBox3.Controls.Add(Me.適應症_修改_bt)
+        Me.GroupBox3.Controls.Add(Me.適應症_新增_bt)
+        Me.GroupBox3.Location = New System.Drawing.Point(259, 2)
+        Me.GroupBox3.Name = "GroupBox3"
+        Me.GroupBox3.Size = New System.Drawing.Size(196, 442)
+        Me.GroupBox3.TabIndex = 718
+        Me.GroupBox3.TabStop = False
+        Me.GroupBox3.Text = "適應症資料"
+        '
+        '適應症_tb
+        '
+        Me.適應症_tb.Location = New System.Drawing.Point(55, 17)
+        Me.適應症_tb.Name = "適應症_tb"
+        Me.適應症_tb.Size = New System.Drawing.Size(136, 23)
+        Me.適應症_tb.TabIndex = 229
+        '
+        '適應症_dgv
+        '
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.適應症_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+        Me.適應症_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.適應症_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.適應症_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.適應症_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.適應症_dgv.Location = New System.Drawing.Point(4, 122)
+        Me.適應症_dgv.Name = "適應症_dgv"
+        Me.適應症_dgv.RowHeadersWidth = 5
+        Me.適應症_dgv.RowTemplate.Height = 24
+        Me.適應症_dgv.Size = New System.Drawing.Size(187, 314)
+        Me.適應症_dgv.TabIndex = 227
+        '
+        '適應症_刪除_bt
+        '
+        Me.適應症_刪除_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.適應症_刪除_bt.ForeColor = System.Drawing.Color.Red
+        Me.適應症_刪除_bt.Location = New System.Drawing.Point(3, 94)
+        Me.適應症_刪除_bt.Name = "適應症_刪除_bt"
+        Me.適應症_刪除_bt.Size = New System.Drawing.Size(187, 25)
+        Me.適應症_刪除_bt.TabIndex = 226
+        Me.適應症_刪除_bt.Text = "刪除"
+        Me.適應症_刪除_bt.UseVisualStyleBackColor = True
+        '
+        '適應症_修改_bt
+        '
+        Me.適應症_修改_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.適應症_修改_bt.ForeColor = System.Drawing.Color.DarkGreen
+        Me.適應症_修改_bt.Location = New System.Drawing.Point(3, 67)
+        Me.適應症_修改_bt.Name = "適應症_修改_bt"
+        Me.適應症_修改_bt.Size = New System.Drawing.Size(187, 25)
+        Me.適應症_修改_bt.TabIndex = 225
+        Me.適應症_修改_bt.Text = "修改"
+        Me.適應症_修改_bt.UseVisualStyleBackColor = True
+        '
+        '適應症_新增_bt
+        '
+        Me.適應症_新增_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.適應症_新增_bt.ForeColor = System.Drawing.Color.Blue
+        Me.適應症_新增_bt.Location = New System.Drawing.Point(3, 41)
+        Me.適應症_新增_bt.Name = "適應症_新增_bt"
+        Me.適應症_新增_bt.Size = New System.Drawing.Size(187, 25)
+        Me.適應症_新增_bt.TabIndex = 224
+        Me.適應症_新增_bt.Text = "新增"
+        Me.適應症_新增_bt.UseVisualStyleBackColor = True
+        '
+        '適應症_編號_tb
+        '
+        Me.適應症_編號_tb.Enabled = False
+        Me.適應症_編號_tb.Location = New System.Drawing.Point(5, 17)
+        Me.適應症_編號_tb.Name = "適應症_編號_tb"
+        Me.適應症_編號_tb.Size = New System.Drawing.Size(50, 23)
+        Me.適應症_編號_tb.TabIndex = 230
+        '
+        'Panel1
+        '
+        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.本機資料夾_wb)
+        Me.Panel1.Location = New System.Drawing.Point(5, 68)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(325, 193)
+        Me.Panel1.TabIndex = 695
+        '
+        'Panel2
+        '
+        Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel2.Controls.Add(Me.FTP執行檔_wb)
+        Me.Panel2.Location = New System.Drawing.Point(5, 284)
+        Me.Panel2.Name = "Panel2"
+        Me.Panel2.Size = New System.Drawing.Size(325, 152)
+        Me.Panel2.TabIndex = 696
+        '
+        'Panel3
+        '
+        Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel3.Controls.Add(Me.FTP資料夾_wb)
+        Me.Panel3.Location = New System.Drawing.Point(3, 219)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(533, 84)
+        Me.Panel3.TabIndex = 706
+        '
         '系統設定
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(1656, 861)
+        Me.Controls.Add(Me.GroupBox3)
         Me.Controls.Add(Me.GroupBox7)
         Me.Controls.Add(Me.GroupBox6)
         Me.Controls.Add(Me.GroupBox5)
-        Me.Controls.Add(Me.GroupBox3)
         Me.Controls.Add(Me.GroupBox2)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.GroupBox4)
@@ -958,10 +903,7 @@ Partial Class 系統設定
         CType(Me.資料夾清單_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
-        Me.GroupBox3.ResumeLayout(False)
-        Me.GroupBox3.PerformLayout()
-        CType(Me.門診_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.料庫_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.FTP_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox6.ResumeLayout(False)
         Me.GroupBox6.PerformLayout()
         CType(Me.時段_dgv, System.ComponentModel.ISupportInitialize).EndInit()
@@ -970,6 +912,12 @@ Partial Class 系統設定
         CType(Me.職務_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox5.ResumeLayout(False)
         Me.GroupBox5.PerformLayout()
+        Me.GroupBox3.ResumeLayout(False)
+        Me.GroupBox3.PerformLayout()
+        CType(Me.適應症_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel2.ResumeLayout(False)
+        Me.Panel3.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -1001,18 +949,7 @@ Partial Class 系統設定
     Friend WithEvents Label4 As Label
     Friend WithEvents FTP資料夾_wb As WebBrowser
     Friend WithEvents GroupBox2 As GroupBox
-    Friend WithEvents GroupBox3 As GroupBox
-    Friend WithEvents 晚_tb As TextBox
-    Friend WithEvents 中_tb As TextBox
-    Friend WithEvents 早_tb As TextBox
-    Friend WithEvents 診別_tb As TextBox
-    Friend WithEvents 星期_tb As TextBox
-    Friend WithEvents 時間修改_bt As Button
-    Friend WithEvents 門診_dgv As DataGridView
-    Friend WithEvents Label6 As Label
-    Friend WithEvents Label5 As Label
-    Friend WithEvents Label1 As Label
-    Friend WithEvents 料庫_dgv As DataGridView
+    Friend WithEvents FTP_dgv As DataGridView
     Friend WithEvents GroupBox6 As GroupBox
     Friend WithEvents 資料庫刪除_tb As Button
     Friend WithEvents 資料庫修改_tb As Button
@@ -1022,9 +959,6 @@ Partial Class 系統設定
     Friend WithEvents 密碼_tb As TextBox
     Friend WithEvents 帳號_tb As TextBox
     Friend WithEvents 地址_tb As TextBox
-    Friend WithEvents 刪除門診_bt As Button
-    Friend WithEvents 新增門診_bt As Button
-    Friend WithEvents 日期_dtp As DateTimePicker
     Friend WithEvents ID_tb As TextBox
     Friend WithEvents 時段_tb As TextBox
     Friend WithEvents 時段1_tb As TextBox
@@ -1051,4 +985,14 @@ Partial Class 系統設定
     Friend WithEvents 職務_dgv As DataGridView
     Friend WithEvents 職務_tb As TextBox
     Friend WithEvents GroupBox5 As GroupBox
+    Friend WithEvents GroupBox3 As GroupBox
+    Friend WithEvents 適應症_tb As TextBox
+    Friend WithEvents 適應症_dgv As DataGridView
+    Friend WithEvents 適應症_刪除_bt As Button
+    Friend WithEvents 適應症_修改_bt As Button
+    Friend WithEvents 適應症_新增_bt As Button
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Panel2 As Panel
+    Friend WithEvents Panel3 As Panel
+    Friend WithEvents 適應症_編號_tb As TextBox
 End Class

GRAMS-SYS/10、系統管理/系統設定.vb

@@ -1,62 +1,61 @@
 Public Class 系統設定
-    ReadOnly ds, ds1, ds6, ds3, ds7, ds2 As New DataSet
+    Private Sub Set_適應症設定()
+        Dim ds2 As New DataSet
+        適應症_dgv.DataSource = Nothing : ds2.Clear()
+        適應症_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        適應症_dgv.ColumnHeadersHeight = 25 : 適應症_dgv.AllowUserToAddRows = False
+        SQL_適應症設定()
+        da.Fill(ds2) : 適應症_dgv.DataSource = ds2.Tables(0) : conn.Close()
+        適應症_dgv.Columns(0).FillWeight = 30
+    End Sub
     Private Sub Set_時段設定()
+        Dim ds2 As New DataSet
         時段_dgv.DataSource = Nothing : ds2.Clear()
         時段_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        時段_dgv.ColumnHeadersHeight = 25
-        時段_dgv.AllowUserToAddRows = False
+        時段_dgv.ColumnHeadersHeight = 25 : 時段_dgv.AllowUserToAddRows = False
         SQL_時段設定()
         da.Fill(ds2) : 時段_dgv.DataSource = ds2.Tables(0) : conn.Close()
         時段_dgv.Columns(0).FillWeight = 100
     End Sub
     Private Sub Set_FTP資料庫管理清單()
-        料庫_dgv.DataSource = Nothing : ds7.Clear()
-        料庫_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        料庫_dgv.ColumnHeadersHeight = 25
-        料庫_dgv.AllowUserToAddRows = False
+        Dim ds7 As New DataSet
+        FTP_dgv.DataSource = Nothing : ds7.Clear()
+        FTP_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        FTP_dgv.ColumnHeadersHeight = 25 : FTP_dgv.AllowUserToAddRows = False
         SQL_FTP資料庫管理()
-        da.Fill(ds7) : 料庫_dgv.DataSource = ds7.Tables(0) : conn.Close()
-        料庫_dgv.Columns(0).FillWeight = 100
+        da.Fill(ds7) : FTP_dgv.DataSource = ds7.Tables(0) : conn.Close()
+        FTP_dgv.Columns(0).FillWeight = 100
     End Sub
     Private Sub Set_年度清單()
+        Dim ds1 As New DataSet
         年份_dgv.DataSource = Nothing : ds1.Clear()
         年份_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        年份_dgv.ColumnHeadersHeight = 25
-        年份_dgv.AllowUserToAddRows = False
+        年份_dgv.ColumnHeadersHeight = 25 : 年份_dgv.AllowUserToAddRows = False
         SQL_年份清單()
         da.Fill(ds1) : 年份_dgv.DataSource = ds1.Tables(0) : conn.Close()
         年份_dgv.Columns(0).FillWeight = 100
     End Sub
     Private Sub Set_FTP資料夾清單()
+        Dim ds As New DataSet
         資料夾清單_dgv.DataSource = Nothing : ds.Clear()
         資料夾清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        資料夾清單_dgv.ColumnHeadersHeight = 25
-        資料夾清單_dgv.AllowUserToAddRows = False
+        資料夾清單_dgv.ColumnHeadersHeight = 25 : 資料夾清單_dgv.AllowUserToAddRows = False
         SQL_FTP資料夾路徑分配()
         da.Fill(ds) : 資料夾清單_dgv.DataSource = ds.Tables(0) : conn.Close()
         資料夾清單_dgv.Columns(0).Width = 70 : 資料夾清單_dgv.Columns(1).Width = 200 : 資料夾清單_dgv.Columns(2).Width = 200 : 資料夾清單_dgv.Columns(3).Width = 70
     End Sub
-    Private Sub Set_門診資料()
-        門診_dgv.DataSource = Nothing : ds6.Clear()
-        門診_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        門診_dgv.ColumnHeadersHeight = 50
-        門診_dgv.AllowUserToAddRows = False
-        SQL_門診資料()
-        da.Fill(ds6) : 門診_dgv.DataSource = ds6.Tables(0) : conn.Close()
-        門診_dgv.Columns(0).FillWeight = 70 : 門診_dgv.Columns(1).FillWeight = 50 : 門診_dgv.Columns(2).FillWeight = 40
-    End Sub
     Private Sub Set_工作職務()
+        Dim ds3 As New DataSet
         職務_dgv.DataSource = Nothing : ds3.Clear()
         職務_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        職務_dgv.ColumnHeadersHeight = 25
-        職務_dgv.AllowUserToAddRows = False
+        職務_dgv.ColumnHeadersHeight = 25 : 職務_dgv.AllowUserToAddRows = False
         SQL_工作職務()
         da.Fill(ds3) : 職務_dgv.DataSource = ds3.Tables(0) : conn.Close()
         職務_dgv.Columns(0).FillWeight = 100
     End Sub
     Private Sub 系統設定_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.AutoScroll = True
-        Set_年度清單() : Set_FTP資料夾清單() : Set_門診資料() : Set_工作職務() : Set_FTP資料庫管理清單() : Set_時段設定()
+        Set_年度清單() : Set_FTP資料夾清單() : Set_工作職務() : Set_適應症設定() : Set_FTP資料庫管理清單() : Set_時段設定()
         Target1 = Target : FTP資料夾_wb.Url = New Uri(Target1)
 
         SQL_系統版本號驗證()
@@ -69,13 +68,6 @@
             年份_tb.Text = 年份_dgv("年份", e.RowIndex).Value.ToString
         End If
     End Sub
-    Private Sub 門診_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 門診_dgv.CellClick
-        If e.RowIndex = -1 Then : Else
-            中_tb.Text = 門診_dgv("中", e.RowIndex).Value.ToString : 早_tb.Text = 門診_dgv("早", e.RowIndex).Value.ToString
-            星期_tb.Text = 門診_dgv("星期", e.RowIndex).Value.ToString : 診別_tb.Text = 門診_dgv("診別", e.RowIndex).Value.ToString
-            晚_tb.Text = 門診_dgv("晚", e.RowIndex).Value.ToString : 日期_dtp.Value = 門診_dgv("日期", e.RowIndex).Value.ToString
-        End If
-    End Sub
     Private Sub 資料夾清單_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 資料夾清單_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             資料夾名稱_tb.Text = 資料夾清單_dgv("資料夾名稱", e.RowIndex).Value.ToString : 指定頁面_tb.Text = 資料夾清單_dgv("指定頁面", e.RowIndex).Value.ToString
@@ -87,11 +79,16 @@
             職務_tb.Text = 職務_dgv("職務", e.RowIndex).Value.ToString
         End If
     End Sub
-    Private Sub 料庫_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 料庫_dgv.CellClick
+    Private Sub 適應症_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 適應症_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            地址_tb.Text = 料庫_dgv("FTP地址", e.RowIndex).Value.ToString : 帳號_tb.Text = 料庫_dgv("FTP帳號", e.RowIndex).Value.ToString
-            密碼_tb.Text = 料庫_dgv("FTP密碼", e.RowIndex).Value.ToString : 地區_tb.Text = 料庫_dgv("地區", e.RowIndex).Value.ToString
-            位置_tb.Text = 料庫_dgv("FTP物理位置", e.RowIndex).Value.ToString
+            適應症_編號_tb.Text = 適應症_dgv(0, e.RowIndex).Value.ToString : 適應症_tb.Text = 適應症_dgv(1, e.RowIndex).Value.ToString
+        End If
+    End Sub
+    Private Sub FTP_dgvCellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles FTP_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            地址_tb.Text = FTP_dgv("FTP地址", e.RowIndex).Value.ToString : 帳號_tb.Text = FTP_dgv("FTP帳號", e.RowIndex).Value.ToString
+            密碼_tb.Text = FTP_dgv("FTP密碼", e.RowIndex).Value.ToString : 地區_tb.Text = FTP_dgv("地區", e.RowIndex).Value.ToString
+            位置_tb.Text = FTP_dgv("FTP物理位置", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub 時段_dgv_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles 時段_dgv.CellClick
@@ -225,6 +222,33 @@
             End If
         End If
     End Sub
+    Private Sub 適應症_新增_bt_Click(sender As Object, e As EventArgs) Handles 適應症_新增_bt.Click
+        SQL_查詢最後一筆適應症()
+        If dr.Read() Then : 適應症_編號_tb.Text = dr("編號").ToString : Else : 適應症_編號_tb.Text = "0" : End If : conn.Close()
+        Dim NUM1 As Integer
+        NUM1 = Double.Parse(Strings.Right(適應症_編號_tb.Text, 2)) + 1
+        If NUM1 < 10 Then : 適應症_編號_tb.Text = "N" & "0" & NUM1
+        ElseIf NUM1 > 9 And NUM1 < 100 Then : 適應症_編號_tb.Text = "N" & NUM1 : End If
+        SQL_適應症新增() : Set_適應症設定() : conn.Close() : MsgBox("新增完成")
+    End Sub
+    Private Sub 適應症_修改_bt_Click(sender As Object, e As EventArgs) Handles 適應症_修改_bt.Click
+        If 適應症_編號_tb.Text = "" Then
+            MsgBox("沒有選擇修改內容")
+        Else
+            PA = 適應症_編號_tb.Text : PA1 = 適應症_tb.Text
+            SQL_適應症修改() : Set_適應症設定() : conn.Close() : MsgBox("修改完成")
+        End If
+    End Sub
+    Private Sub 適應症_刪除_bt_Click(sender As Object, e As EventArgs) Handles 適應症_刪除_bt.Click
+        If 適應症_編號_tb.Text = "" Then
+            MsgBox("沒有選擇刪除內容")
+        Else
+            Dim cc As MsgBoxResult = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
+            If cc = MsgBoxResult.Ok Then
+                SQL_適應症刪除() : conn.Close() : Set_適應症設定() : MsgBox("刪除完成")
+            End If
+        End If
+    End Sub
     '---------------------FTP資料夾管理-----------------------------------------------------------------------------------------------------------------
     Private Sub 新增_bt_Click(sender As Object, e As EventArgs) Handles 新增_bt.Click
         SQL_FTP資料夾管理新增() : conn.Close() : Set_FTP資料夾清單()
@@ -246,40 +270,4 @@
     Private Sub 讀取資料夾路徑_bt_Click(sender As Object, e As EventArgs) Handles 讀取資料夾路徑_bt.Click
         If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then : 本機資料夾_wb.Navigate(FolderBrowserDialog1.SelectedPath) : End If
     End Sub
-    Private Sub 時間修改_bt_Click(sender As Object, e As EventArgs) Handles 時間修改_bt.Click
-        If 星期_tb.Text = "" Or 診別_tb.Text = "" Then : MsgBox("沒有選擇修改內容") : Else
-            PA = 早_tb.Text : PA1 = 中_tb.Text : PA2 = 晚_tb.Text : PA3 = 星期_tb.Text : PA4 = 診別_tb.Text : PA5 = 日期_dtp.Text
-            SQL_門診修改() : Set_門診資料() : conn.Close() : MsgBox("修改完成")
-        End If
-    End Sub
-    Private Sub 新增門診_bt_Click(sender As Object, e As EventArgs) Handles 新增門診_bt.Click
-        If 星期_tb.Text = "" Or 診別_tb.Text = "" Then : MsgBox("沒有選擇新增內容") : Else
-            PA = 早_tb.Text : PA1 = 中_tb.Text : PA2 = 晚_tb.Text : PA3 = 星期_tb.Text : PA4 = 診別_tb.Text : PA5 = 日期_dtp.Text
-            SQL_門診資料_讀取()
-            If dr.Read Then : MsgBox("已有資料，無法新增!!")
-            Else : SQL_新增門診() : Set_門診資料() : conn.Close() : MsgBox("新增完成") : End If
-        End If
-    End Sub
-    Private Sub 刪除門診_bt_Click(sender As Object, e As EventArgs) Handles 刪除門診_bt.Click
-        If 星期_tb.Text = "" Or 診別_tb.Text = "" Then : MsgBox("沒有選擇刪除內容") : Else
-            PA = 早_tb.Text : PA1 = 中_tb.Text : PA2 = 晚_tb.Text : PA3 = 星期_tb.Text : PA4 = 診別_tb.Text : PA5 = 日期_dtp.Text
-            SQL_刪除門診() : Set_門診資料() : conn.Close() : MsgBox("刪除完成")
-        End If
-    End Sub
-    Private Sub 日期_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 日期_dtp.ValueChanged
-        Dim selectedDate As DateTime = 日期_dtp.Value : 星期_tb.Text = GetWeekDays(selectedDate)
-    End Sub
-    Private Function GetWeekDays(selectedDate As DateTime) As String
-        Dim dayOfWeek As DayOfWeek = selectedDate.DayOfWeek : Dim weekDayString As String = ""
-        Select Case dayOfWeek
-            Case DayOfWeek.Sunday : weekDayString = "星期日"
-            Case DayOfWeek.Monday : weekDayString = "星期一"
-            Case DayOfWeek.Tuesday : weekDayString = "星期二"
-            Case DayOfWeek.Wednesday : weekDayString = "星期三"
-            Case DayOfWeek.Thursday : weekDayString = "星期四"
-            Case DayOfWeek.Friday : weekDayString = "星期五"
-            Case DayOfWeek.Saturday : weekDayString = "星期六"
-        End Select
-        Return weekDayString
-    End Function
 End Class

GRAMS-SYS/HSKIN-MIS-SYS.Designer.vb

@@ -77,6 +77,7 @@ Partial Class GRAMS_SYS
         Me.FTP清單_dgv = New System.Windows.Forms.DataGridView()
         Me.加班單_dgv = New System.Windows.Forms.DataGridView()
         Me.休假單_dgv = New System.Windows.Forms.DataGridView()
+        Me.薪資資料設定_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.MenuStrip.SuspendLayout()
         Me.StatusStrip.SuspendLayout()
         CType(Me.FTP清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -242,39 +243,39 @@ Partial Class GRAMS_SYS
         '
         Me.加班申請_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.pen
         Me.加班申請_tsm.Name = "加班申請_tsm"
-        Me.加班申請_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.加班申請_tsm.Size = New System.Drawing.Size(175, 22)
         Me.加班申請_tsm.Text = "加班申請"
         '
         '加班核准_tsm
         '
         Me.加班核准_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.check
         Me.加班核准_tsm.Name = "加班核准_tsm"
-        Me.加班核准_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.加班核准_tsm.Size = New System.Drawing.Size(175, 22)
         Me.加班核准_tsm.Text = "加班核准"
         '
         '加班申請資料_tsm
         '
         Me.加班申請資料_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.加班申請資料_tsm.Name = "加班申請資料_tsm"
-        Me.加班申請資料_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.加班申請資料_tsm.Size = New System.Drawing.Size(175, 22)
         Me.加班申請資料_tsm.Text = "加班申請-歷史資料"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(172, 6)
         '
         '醫師下診時間紀錄_tsm
         '
         Me.醫師下診時間紀錄_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.check_icon
         Me.醫師下診時間紀錄_tsm.Name = "醫師下診時間紀錄_tsm"
-        Me.醫師下診時間紀錄_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.醫師下診時間紀錄_tsm.Size = New System.Drawing.Size(175, 22)
         Me.醫師下診時間紀錄_tsm.Text = "醫師下診時間紀錄"
         Me.醫師下診時間紀錄_tsm.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         '
         '考勤管理_tsm
         '
-        Me.考勤管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.考勤明細表_tsm, Me.ToolStripSeparator3, Me.到離職管理_tsm})
+        Me.考勤管理_tsm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.考勤明細表_tsm, Me.ToolStripSeparator3, Me.到離職管理_tsm, Me.薪資資料設定_tsm})
         Me.考勤管理_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.考勤管理_tsm.Name = "考勤管理_tsm"
         Me.考勤管理_tsm.Size = New System.Drawing.Size(83, 20)
@@ -284,19 +285,19 @@ Partial Class GRAMS_SYS
         '
         Me.考勤明細表_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.考勤明細表_tsm.Name = "考勤明細表_tsm"
-        Me.考勤明細表_tsm.Size = New System.Drawing.Size(134, 22)
+        Me.考勤明細表_tsm.Size = New System.Drawing.Size(180, 22)
         Me.考勤明細表_tsm.Text = "考勤明細表"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(131, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
         '
         '到離職管理_tsm
         '
         Me.到離職管理_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.pen
         Me.到離職管理_tsm.Name = "到離職管理_tsm"
-        Me.到離職管理_tsm.Size = New System.Drawing.Size(134, 22)
+        Me.到離職管理_tsm.Size = New System.Drawing.Size(180, 22)
         Me.到離職管理_tsm.Text = "到離職管理"
         '
         '業務管理系統_tsm
@@ -311,47 +312,47 @@ Partial Class GRAMS_SYS
         '
         Me.業績獎金計算表_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.業績獎金計算表_tsm.Name = "業績獎金計算表_tsm"
-        Me.業績獎金計算表_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.業績獎金計算表_tsm.Size = New System.Drawing.Size(180, 22)
         Me.業績獎金計算表_tsm.Text = "業績獎金計算表"
         '
         '產品銷售分析表_tsm
         '
         Me.產品銷售分析表_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.產品銷售分析表_tsm.Name = "產品銷售分析表_tsm"
-        Me.產品銷售分析表_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.產品銷售分析表_tsm.Size = New System.Drawing.Size(180, 22)
         Me.產品銷售分析表_tsm.Text = "產品銷售分析表"
         '
         '來客資料分析表_tsm
         '
         Me.來客資料分析表_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.來客資料分析表_tsm.Name = "來客資料分析表_tsm"
-        Me.來客資料分析表_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.來客資料分析表_tsm.Size = New System.Drawing.Size(180, 22)
         Me.來客資料分析表_tsm.Text = "來客資料分析表"
         '
         '人員貢獻分析表_tsm
         '
         Me.人員貢獻分析表_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Report
         Me.人員貢獻分析表_tsm.Name = "人員貢獻分析表_tsm"
-        Me.人員貢獻分析表_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.人員貢獻分析表_tsm.Size = New System.Drawing.Size(180, 22)
         Me.人員貢獻分析表_tsm.Text = "人員貢獻分析表"
         '
         'ToolStripSeparator24
         '
         Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
-        Me.ToolStripSeparator24.Size = New System.Drawing.Size(167, 6)
+        Me.ToolStripSeparator24.Size = New System.Drawing.Size(177, 6)
         '
         '業務系統資料管理_tsm
         '
         Me.業務系統資料管理_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Sys_Command
         Me.業務系統資料管理_tsm.Name = "業務系統資料管理_tsm"
-        Me.業務系統資料管理_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.業務系統資料管理_tsm.Size = New System.Drawing.Size(180, 22)
         Me.業務系統資料管理_tsm.Text = "業務系統資料管理"
         '
         '交易明細表導入_tsm
         '
         Me.交易明細表導入_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.pen
         Me.交易明細表導入_tsm.Name = "交易明細表導入_tsm"
-        Me.交易明細表導入_tsm.Size = New System.Drawing.Size(170, 22)
+        Me.交易明細表導入_tsm.Size = New System.Drawing.Size(180, 22)
         Me.交易明細表導入_tsm.Text = "交易明細表導入"
         '
         '系統設定_tsm
@@ -452,6 +453,13 @@ Partial Class GRAMS_SYS
         Me.休假單_dgv.TabIndex = 667
         Me.休假單_dgv.Visible = False
         '
+        '薪資資料設定_tsm
+        '
+        Me.薪資資料設定_tsm.Image = Global.HSKIN_MIS_SYS.My.Resources.Resources.Sys_Command
+        Me.薪資資料設定_tsm.Name = "薪資資料設定_tsm"
+        Me.薪資資料設定_tsm.Size = New System.Drawing.Size(180, 22)
+        Me.薪資資料設定_tsm.Text = "薪資資料設定"
+        '
         'GRAMS_SYS
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
@@ -535,4 +543,5 @@ Partial Class GRAMS_SYS
     Friend WithEvents 醫生班表修改_tsm As ToolStripMenuItem
     Friend WithEvents 人員排班條件設定_tsm As ToolStripMenuItem
     Friend WithEvents 個人班表_tsm As ToolStripMenuItem
+    Friend WithEvents 薪資資料設定_tsm As ToolStripMenuItem
 End Class

GRAMS-SYS/HSKIN-MIS-SYS.vb

@@ -158,6 +158,11 @@ Public Class GRAMS_SYS
     Private Sub 加班核准_tsm_Click(sender As Object, e As EventArgs) Handles 加班核准_tsm.Click
         PA = "" : 加班審核.ShowDialog()
     End Sub
+
+    Private Sub 薪資資料設定ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 薪資資料設定_tsm.Click
+        PA = "" : 薪資資料設定.ShowDialog()
+    End Sub
+
     Private Sub 業績獎金計算表_tsm_Click(sender As Object, e As EventArgs) Handles 業績獎金計算表_tsm.Click
         PA = "" : 業績獎金計算表.Show() : 業績獎金計算表.BringToFront()
     End Sub

GRAMS-SYS/HSKIN-MIS-SYS.vbproj

@@ -152,6 +152,12 @@
     <Compile Include="04、考勤管理\到離職管理.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="04、考勤管理\薪資資料設定.Designer.vb">
+      <DependentUpon>薪資資料設定.vb</DependentUpon>
+    </Compile>
+    <Compile Include="04、考勤管理\薪資資料設定.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="05、業務管理\交易明細表導入.Designer.vb">
       <DependentUpon>交易明細表導入.vb</DependentUpon>
     </Compile>
@@ -320,6 +326,9 @@
     <EmbeddedResource Include="04、考勤管理\到離職管理.resx">
       <DependentUpon>到離職管理.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="04、考勤管理\薪資資料設定.resx">
+      <DependentUpon>薪資資料設定.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="05、業務管理\交易明細表導入.resx">
       <DependentUpon>交易明細表導入.vb</DependentUpon>
     </EmbeddedResource>

GRAMS-SYS/obj/Debug/HSKIN-MIS-SYS.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-40ceea424cdcff551684f1732d6325c50cede1a38cbceb2701498ba6abb51315
+4b90ba3bcfb68eab8df0ab9bb90a50c657e56da5fab66d4ca7111a798af18b0b

GRAMS-SYS/obj/Debug/HSKIN-MIS-SYS.vbproj.FileListAbsolute.txt

@@ -111,3 +111,4 @@ D:\工巧明\HSKIN\HSKIN-MIS-SYS\GRAMS-SYS\bin\Debug\HSKIN-MIS-SYS.pdb
 D:\工巧明\HSKIN\HSKIN-MIS-SYS\GRAMS-SYS\bin\Debug\HSKIN-MIS-SYS.xml
 D:\工巧明\HSKIN\HSKIN-MIS-SYS\GRAMS-SYS\obj\Debug\HSKIN_MIS_SYS.醫生班表設定.resources
 D:\工巧明\HSKIN\HSKIN-MIS-SYS\GRAMS-SYS\obj\Debug\HSKIN_MIS_SYS.人員排班條件設定.resources
+D:\工巧明\HSKIN\HSKIN-MIS-SYS\GRAMS-SYS\obj\Debug\HSKIN_MIS_SYS.薪資資料設定.resources