Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

8c1a1796 · LAPTOP-CV4JFSHE\kantavee · eedd7879 · c4ecf229 · 8c1a1796 · 8c1a1796
Commit 8c1a1796 authored Nov 25, 2024 by $LAPTOP-CV4JFSHE\kantavee's avatar$ LAPTOP-CV4JFSHE\kantavee
3 changed files
--- a/src/app/components/company-registration/branch-business-unit/section-registration/section-registration.component.html
+++ b/src/app/components/company-registration/branch-business-unit/section-registration/section-registration.component.html
@@ -89,7 +89,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    เพิ่มข้อมูลทะเบียนฝ่าย
+                    เพิ่มข้อมูลทะเบียนส่วน
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -122,14 +122,40 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2" placeholder="">
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วน</label>
+                <div class="relative w-1/2">
+                    <input type="text" id="part" class="ti-form-input w-full pr-10" placeholder="">
+                    <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                        <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                        <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                    </div>
+                </div>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
                        data-hs-overlay="#section-registration-modal-add">
@@ -149,7 +175,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    แก้ไขข้อมูลทะเบียนฝ่าย
+                    แก้ไขข้อมูลทะเบียนส่วน
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -182,17 +208,37 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" placeholder="" readonly>
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="" value="01">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled value="แผนก 1">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วน</label>
+                <input type="text" id="part" class="ti-form-input w-1/2 pr-10" placeholder="" style="background-color: #B3B3B3;" disabled value="01">
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="" value="ส่วน 1">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#section-registration-modal-edit">
+                        data-hs-overlay="#section-registration-modal-add">
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-success" href="javascript:void(0);">

--- a/src/app/components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.html
+++ b/src/app/components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.html
@@ -89,7 +89,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    เพิ่มข้อมูลทะเบียนฝ่าย
+                    เพิ่มข้อมูลทะเบียนส่วนย่อย 4
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -122,14 +122,40 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2" placeholder="">
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วนย่อย4</label>
+                <div class="relative w-1/2">
+                    <input type="text" id="part" class="ti-form-input w-full pr-10" placeholder="">
+                    <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                        <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                        <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                    </div>
+                </div>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
                        data-hs-overlay="#sub-department-four-modal-add">
@@ -149,7 +175,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    แก้ไขข้อมูลทะเบียนฝ่าย
+                    แก้ไขข้อมูลทะเบียนส่วนย่อย 4
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -182,17 +208,37 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" placeholder="" readonly>
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="" value="01">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled value="ส่วนย่อย 3">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วนย่อย4</label>
+                <input type="text" id="part" class="ti-form-input w-1/2 pr-10" placeholder="" style="background-color: #B3B3B3;" disabled value="01">
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="" value="ส่วนย่อย 4">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#sub-department-four-modal-edit">
+                        data-hs-overlay="#sub-department-four-modal-add">
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-success" href="javascript:void(0);">

--- a/src/app/components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.html
+++ b/src/app/components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.html
@@ -89,7 +89,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    เพิ่มข้อมูลทะเบียนฝ่าย
+                    เพิ่มข้อมูลทะเบียนส่วนย่อย 2
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -122,14 +122,40 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2" placeholder="">
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วนย่อย2</label>
+                <div class="relative w-1/2">
+                    <input type="text" id="part" class="ti-form-input w-full pr-10" placeholder="">
+                    <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                        <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                        <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                    </div>
+                </div>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
                        data-hs-overlay="#sub-department-two-modal-add">
@@ -149,7 +175,7 @@
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
-                    แก้ไขข้อมูลทะเบียนฝ่าย
+                    แก้ไขข้อมูลทะเบียนส่วนย่อย 2
                </h3>
                <div class="flex justify-end">
                    <div class="button-clear">
@@ -182,17 +208,37 @@
                    </button>
                </div>
            </div>
-            <div class="ti-modal-body ">
+            <div class="ti-modal-body" style="margin-top: 40px;">
-                <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
+                <label for="part" class="ti-form-label mt-2rem">อยู่ภายใต้หน่วยงาน</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" placeholder="" readonly>
+                <div class="relative">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
+                    <div class="relative rounded-xl overflow-auto">
-                <input type="text" id="detail_th" class="ti-form-input" placeholder="">
+                        <div class="sm:grid grid-cols-2 gap-1">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
+                            <div class="relative w-full">
-                <input type="text" id="detail_eng" class="ti-form-input" placeholder="">
+                                <input type="text" id="input-label" class="ti-form-input w-full pr-10" placeholder="" value="01">
-                <div class="flex justify-end mt-2rem mb-1rem">
+                                <div class="absolute inset-y-0 right-0 flex items-center pr-3 space-x-2">
+                                    <i class="ti ti-circle-x text-red-500 cursor-pointer"></i>
+                                    <i class="ri-search-line text-gray-300 cursor-pointer"></i>
+                                </div>
+                            </div>
+                            <div class="flex flex-col-6">
+                                <input type="text" id="part2" class="ti-form-input w-full" placeholder="" style="background-color: #B3B3B3; margin-left: 10px;" disabled value="ส่วนย่อย 1">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <label for="part" class="ti-form-label mt-2rem">ส่วนย่อย2</label>
+                <input type="text" id="part" class="ti-form-input w-1/2 pr-10" placeholder="" style="background-color: #B3B3B3;" disabled value="01">
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)</label>
+                <input type="text" id="detail_th" class="ti-form-input h-16" placeholder="" value="ส่วนย่อย 2">
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <input type="text" id="detail_eng" class="ti-form-input h-16" placeholder="">
+                <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#sub-department-two-modal-edit">
+                        data-hs-overlay="#sub-department-two-modal-add">
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-success" href="javascript:void(0);">