Merge branch 'develop' into dev-tee
This commit is contained in:
commit
98e7302b09
3 changed files with 12 additions and 6 deletions
|
|
@ -27,7 +27,7 @@ const name = ref<string>("");
|
|||
const position_line = ref<string>("");
|
||||
const position_level = ref<string>("");
|
||||
const organization = ref<string>("");
|
||||
const probation_status = ref<string>("");
|
||||
const probation_status = ref<number>();
|
||||
const probation_statusold = ref<string>("");
|
||||
const avatarprofile = ref<string>("");
|
||||
|
||||
|
|
@ -95,10 +95,12 @@ const probation_statusOP = ref<any>([
|
|||
{
|
||||
id: 2,
|
||||
label: "พ้นการทดลองปฏิบัติหน้าที่ราชการ",
|
||||
disable: true
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
label: "ไม่พ้นการทดลองปฏิบัติหน้าที่ราชการ",
|
||||
disable: true
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
|
|
@ -115,10 +117,12 @@ const probation_statusOP = ref<any>([
|
|||
{
|
||||
id: 7,
|
||||
label: "ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการ",
|
||||
disable: true
|
||||
},
|
||||
{
|
||||
id: 8,
|
||||
label: "ดึงรายชื่อไปออกคำสั่งแล้ว",
|
||||
disable: true
|
||||
},
|
||||
]);
|
||||
|
||||
|
|
@ -279,6 +283,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
|
|||
<div class="col-12 text-top">สถานะการทดลองปฏิบัติหน้าที่ราชการ</div>
|
||||
<div class="col-12 text-detail">
|
||||
<q-select
|
||||
:disable="probation_status==2 || probation_status==3 || probation_status==7 || probation_status==8"
|
||||
dense
|
||||
borderless
|
||||
v-model="probation_status"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue