Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mySkill-x
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
angular
mySkill-x
Commits
ba632578
Commit
ba632578
authored
Feb 13, 2025
by
Nattana Chaiyamat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ทะเบียนแผนก
parent
e5a9079a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
35 deletions
+55
-35
department-list.component.html
...iness-unit/department-list/department-list.component.html
+47
-31
department-register.component.html
...it/department-register/department-register.component.html
+2
-2
department-register.component.ts
...unit/department-register/department-register.component.ts
+6
-2
No files found.
src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.html
View file @
ba632578
...
...
@@ -4,7 +4,7 @@
<!-- Content ของ div แรก -->
<div
class=
"px-1"
>
<button
type=
"button"
class=
"ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
data-hs-overlay=
"#department-list-upload-modal
"
>
data-hs-overlay=
"#department-list-upload-modal"
(
click
)="
selectedFileName =
'กรุณาเลือกไฟล์'
"
>
<i
class=
"ri-add-line"
></i>
นำเข้าข้อมูล
</button>
...
...
@@ -48,7 +48,7 @@
</div>
</div>
</div>
</div>
</div>
<div
class=
"page px-rem"
>
<div
class=
"overflow-auto shadow-md rounded-t-md"
>
...
...
@@ -96,7 +96,8 @@
<i
class=
"ti ti-edit cursor-pointer i-gray fs-l px-1"
(
click
)="
selectBu2
(
item
);
currentModal=
'edit'
"
data-hs-overlay=
"#department-list-modal-edit"
></i>
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
(
click
)="
selectBu2
(
item
)"
data-hs-overlay=
"#department-list-alert-delete-modal"
></i>
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
(
click
)="
selectBu2
(
item
)"
data-hs-overlay=
"#department-list-alert-delete-modal"
></i>
</td>
</tr>
</tbody>
...
...
@@ -111,11 +112,13 @@
</a>
</li>
<li
*
ngFor=
"let item of bu2Table.page;let f = first;let l = last"
>
<ng-container
*
ngIf=
"item==3&&bu2Table.currentPage!=1&&bu2Table.currentPage!=2&&bu2Table.currentPage!=3"
>
<ng-container
*
ngIf=
"item==3&&bu2Table.currentPage!=1&&bu2Table.currentPage!=2&&bu2Table.currentPage!=3"
>
<a
aria-label=
"anchor"
class=
"page-link"
href=
"javascript:void(0);"
><i
class=
"ri-more-line"
></i>
</a>
</ng-container>
<ng-container
*
ngIf=
"(f||l)||(item==bu2Table.currentPage-1||item==bu2Table.currentPage||item==bu2Table.currentPage+1)"
>
<ng-container
*
ngIf=
"(f||l)||(item==bu2Table.currentPage-1||item==bu2Table.currentPage||item==bu2Table.currentPage+1)"
>
<a
class=
"page-link"
href=
"javascript:void(0);"
[
class
.
active
]="
item=
=bu2Table.currentPage"
(
click
)="
bu2Table
.
currentPage=
item"
>
{{item}}
</a>
...
...
@@ -134,7 +137,7 @@
</li>
</ul>
</nav>
</div>
</div>
<div
id=
"department-list-modal-add"
class=
"hs-overlay hidden ti-modal"
>
...
...
@@ -181,16 +184,20 @@
</div>
</div>
<div
class=
"ti-modal-body"
>
<label
class=
"ti-form-label"
>
อยู่ภายใต้หน่วยงาน
</label>
<label
class=
"ti-form-label"
>
อยู่ภายใต้หน่วยงาน
*
</label>
<div
class=
"flex"
>
<div
class=
"relative flex rounded-md"
>
<input
type=
"text"
id=
"hs-leading-button-add-on-with-icon-and-button"
name=
"hs-leading-button-add-on-with-icon-and-button"
class=
"ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
style=
"padding-right: 3.5rem;"
[(
ngModel
)]="
bu1
.
bu1id
"
(
ngModelChange
)="
bu1idChange
()"
>
<div
class=
"absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2"
>
<input
type=
"text"
id=
"hs-leading-button-add-on-with-icon-and-button"
name=
"hs-leading-button-add-on-with-icon-and-button"
class=
"ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
style=
"padding-right: 3.5rem;"
[(
ngModel
)]="
bu1
.
bu1id
"
(
ngModelChange
)="
bu1idChange
()"
>
<div
class=
"absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2"
>
<button
type=
"button"
class=
"flex items-center text-red-500"
(
click
)="
selectBu1
()"
>
<i
class=
"ti ti-circle-x cursor-pointer"
></i>
</button>
<button
type=
"button"
class=
"flex items-center text-gray-500 dark:text-white/70"
data-hs-overlay=
"#department-list-bu1-table-modal"
>
<button
type=
"button"
class=
"flex items-center text-gray-500 dark:text-white/70"
data-hs-overlay=
"#department-list-bu1-table-modal"
>
<i
class=
"ri-search-line cursor-pointer text-gray"
></i>
</button>
</div>
...
...
@@ -200,8 +207,11 @@
readonly
[
value
]="
bu1
.
tdesc
"
>
</div>
</div>
<label
class=
"ti-form-label mt-2rem"
>
เเผนก
</label>
<label
class=
"ti-form-label mt-2rem"
>
เเผนก
*
</label>
<div
class=
"relative flex rounded-md w-1/2"
>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input h-16"
[(
ngModel
)]="
bu2
.
bu2id
"
>
</div>
<!-- <div class="relative flex rounded-md w-1/2">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10" style="padding-right: 3.5rem;"
[(ngModel)]="bu2.bu2id" (ngModelChange)="bu2idChange()">
<div class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
...
...
@@ -212,10 +222,10 @@
<i class="ri-search-line cursor-pointer text-gray"></i>
</button>
</div>
</div>
<label
for=
"detail_th"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
(ไทย)
</label>
</div>
-->
<label
for=
"detail_th"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
แผนก (ไทย)*
</label>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input h-16"
[(
ngModel
)]="
bu2
.
tdesc
"
>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
(อังกฤษ)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
แผนก (อังกฤษ)*
</label>
<input
type=
"text"
id=
"detail_eng"
class=
"ti-form-input h-16"
[(
ngModel
)]="
bu2
.
edesc
"
>
<div
class=
"flex justify-end mt-2rem mb-1rem space-x-4"
>
<button
type=
"button"
...
...
@@ -223,10 +233,11 @@
data-hs-overlay=
"#department-list-modal-add"
>
ย้อนกลับ
</button>
<a
class=
"ti-btn ti-btn-success"
href=
"javascript:void(0);"
data-hs-overlay=
"#department-list-alert-modal"
>
<button
class=
"ti-btn ti-btn-success"
type=
"button"
data-hs-overlay=
"#department-list-alert-modal"
[
class
.
ti-btn-disabled
]="!
bu1
.
bu1id
||!
bu2
.
bu2id
||!
bu2
.
tdesc
"
[
disabled
]="!
bu1
.
bu1id
||!
bu2
.
bu2id
||!
bu2
.
tdesc
"
>
บันทึกข้อมูล
</
a
>
</
button
>
</div>
</div>
</div>
...
...
@@ -277,17 +288,20 @@
</div>
</div>
<div
class=
"ti-modal-body"
>
<label
for=
"hs-trailing-button-add-on-with-icon"
class=
"ti-form-label"
>
อยู่ภายใต้หน่วยงาน
</label>
<label
for=
"hs-trailing-button-add-on-with-icon"
class=
"ti-form-label"
>
อยู่ภายใต้หน่วยงาน*
</label>
<div
class=
"flex"
>
<div
class=
"relative flex rounded-md"
>
<input
type=
"text"
id=
"hs-leading-button-add-on-with-icon-and-button"
name=
"hs-leading-button-add-on-with-icon-and-button"
class=
"ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
style=
"padding-right: 3.5rem;"
[(
ngModel
)]="
bu1
.
bu1id
"
(
ngModelChange
)="
bu1idChange
()"
>
<div
class=
"absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2"
>
<input
type=
"text"
id=
"hs-leading-button-add-on-with-icon-and-button"
name=
"hs-leading-button-add-on-with-icon-and-button"
class=
"ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
style=
"padding-right: 3.5rem;"
[(
ngModel
)]="
bu1
.
bu1id
"
(
ngModelChange
)="
bu1idChange
()"
>
<div
class=
"absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2"
>
<button
type=
"button"
class=
"flex items-center text-red-500"
(
click
)="
selectBu1
()"
>
<i
class=
"ti ti-circle-x cursor-pointer"
></i>
</button>
<button
type=
"button"
class=
"flex items-center text-gray-500 dark:text-white/70"
data-hs-overlay=
"#department-list-bu1-table-modal"
>
<button
type=
"button"
class=
"flex items-center text-gray-500 dark:text-white/70"
data-hs-overlay=
"#department-list-bu1-table-modal"
>
<i
class=
"ri-search-line cursor-pointer text-gray"
></i>
</button>
</div>
...
...
@@ -297,27 +311,29 @@
readonly
[
value
]="
bu1
.
tdesc
"
>
</div>
</div>
<label
for=
"input-label"
class=
"ti-form-label mt-2rem"
>
เเผนก
</label>
<label
for=
"input-label"
class=
"ti-form-label mt-2rem"
>
เเผนก
*
</label>
<div
class=
"sm:grid grid-cols-2 gap-1"
>
<div
class=
"relative w-full"
>
<input
type=
"text"
id=
"input-label"
class=
"ti-form-input w-full pr-10 bg-input-readonly"
readonly
[
value
]="
bu2
.
bu2id
"
>
</div>
</div>
<label
for=
"detail_th"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
(ไทย)
</label>
<label
for=
"detail_th"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
แผนก (ไทย)*
</label>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input h-16"
[(
ngModel
)]="
bu2
.
tdesc
"
>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
รายละเอียด (อังกฤษ)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
รายละเอียด
แผนก
(อังกฤษ)
</label>
<input
type=
"text"
id=
"detail_eng"
class=
"ti-form-input h-16"
[(
ngModel
)]="
bu2
.
edesc
"
>
<div
class=
"flex justify-end mt-2rem mb-1rem space-x-4 "
>
<button
type=
"button"
<button
type=
"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=
"#department-list-modal-edit"
>
ย้อนกลับ
</button>
<a
class=
"ti-btn ti-btn-success"
href=
"javascript:void(0);"
data-hs-overlay=
"#department-list-alert-edit-modal"
>
<button
class=
"ti-btn ti-btn-success"
type=
"button"
data-hs-overlay=
"#department-list-alert-edit-modal"
[
class
.
ti-btn-disabled
]="!
bu1
.
bu1id
||!
bu2
.
bu2id
||!
bu2
.
tdesc
"
[
disabled
]="!
bu1
.
bu1id
||!
bu2
.
bu2id
||!
bu2
.
tdesc
"
>
บันทึกข้อมูล
</
a
>
</
button
>
</div>
</div>
</div>
...
...
src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html
View file @
ba632578
...
...
@@ -3,7 +3,7 @@
<div
class=
"flex pr-2"
>
<div
class=
"px-1"
>
<button
type=
"button"
class=
"ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
data-hs-overlay=
"#department-register-upload-modal"
>
data-hs-overlay=
"#department-register-upload-modal"
(
click
)="
selectedFileName =
'กรุณาเลือกไฟล์'
"
>
<i
class=
"ri-add-line"
></i>
นำเข้าข้อมูล
</button>
...
...
@@ -219,7 +219,7 @@
<div
class=
"absolute flex"
>
<div
class=
"px-1"
>
<button
type=
"button"
class=
"ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
(
click
)="
selectBu1
(
undefined
,
bu1
.
bu1id
)
"
>
(
click
)="
bu1
.
tdesc=
''
;
bu1
.
edesc=
''
"
>
<svg
class=
"svg-indigo"
width=
"16"
height=
"16"
viewBox=
"0 0 64.00 64.00"
xmlns=
"http://www.w3.org/2000/svg"
fill=
"none"
stroke=
"#595BEA"
stroke-width=
"3.84"
transform=
"rotate(45)matrix(-1, 0, 0, 1, 0, 0)"
>
...
...
src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.ts
View file @
ba632578
...
...
@@ -96,8 +96,8 @@ export class DepartmentRegisterComponent implements OnInit {
x
.
tdesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
())
||
x
.
edesc
.
toLowerCase
().
includes
(
this
.
search
.
toLowerCase
()))
}
selectBu1
(
bu1
?:
Bu1Model
,
bu1id
?:
string
)
{
this
.
bu1
=
new
MyBu1Model
(
bu1
||
{
bu1id
:
bu1id
})
selectBu1
(
bu1
?:
Bu1Model
)
{
this
.
bu1
=
new
MyBu1Model
(
bu1
||
{})
}
showAlert
(
text
:
string
,
type
:
'success'
|
'error'
)
{
...
...
@@ -107,6 +107,7 @@ export class DepartmentRegisterComponent implements OnInit {
})
}
addBu1
()
{
this
.
bu1ListLoading
=
true
this
.
bu1Service
.
post
(
this
.
bu1
).
subscribe
({
next
:
response
=>
{
if
(
response
.
success
)
{
...
...
@@ -116,11 +117,13 @@ export class DepartmentRegisterComponent implements OnInit {
this
.
showAlert
(
response
.
message
,
'error'
)
}
},
error
:
error
=>
{
this
.
bu1ListLoading
=
false
this
.
showAlert
(
error
.
message
,
'error'
)
}
})
}
deleteBu1
()
{
this
.
bu1ListLoading
=
true
this
.
bu1Service
.
delete
(
this
.
bu1
).
subscribe
({
next
:
response
=>
{
if
(
response
.
success
)
{
...
...
@@ -130,6 +133,7 @@ export class DepartmentRegisterComponent implements OnInit {
this
.
showAlert
(
response
.
message
,
'error'
)
}
},
error
:
error
=>
{
this
.
bu1ListLoading
=
false
this
.
showAlert
(
error
.
message
,
'error'
)
}
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment