no message
This commit is contained in:
parent
3d0028dfa8
commit
40300cf4ce
3 changed files with 53 additions and 9 deletions
|
|
@ -1305,7 +1305,7 @@
|
|||
</div>
|
||||
<div class="col-12 row q-col-gutter-md">
|
||||
<q-select
|
||||
:options="OPcaretaker"
|
||||
:options="filtermantor(OPcaretaker, [caretaker2])"
|
||||
option-value="personal_id"
|
||||
option-label="name"
|
||||
class="col-xs-12 col-sm-8"
|
||||
|
|
@ -1358,7 +1358,7 @@
|
|||
</datepicker>
|
||||
</div>
|
||||
<q-select
|
||||
:options="OPcaretaker"
|
||||
:options="filtermantor(OPcaretaker, [caretaker1])"
|
||||
option-value="personal_id"
|
||||
option-label="name"
|
||||
class="col-xs-12 col-sm-8"
|
||||
|
|
@ -1474,6 +1474,27 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 row">
|
||||
<div class="col-12 text-top2 row items-center">
|
||||
<q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
|
||||
ประธานกรรมการ
|
||||
</div>
|
||||
<div class="col-12 row q-col-gutter-md">
|
||||
<q-select
|
||||
:options="OPchairman"
|
||||
option-value="personal_id"
|
||||
option-label="name"
|
||||
class="col-xs-12 col-sm-8"
|
||||
:readonly="routeName != 'probationWorkAdd'"
|
||||
dense
|
||||
borderless
|
||||
:outlined="routeName == 'probationWorkAdd'"
|
||||
v-model="chairman"
|
||||
label="ประธานกรรมการ"
|
||||
/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-separator v-show="routeName == 'probationWorkAdd'" />
|
||||
|
|
@ -1572,6 +1593,7 @@ const main5 = ref<any>();
|
|||
const assignId = ref<string>(route.params.form as string);
|
||||
const Other = ref<string>("");
|
||||
const commander = ref<string>("");
|
||||
const chairman = ref<string>("");
|
||||
|
||||
const date1 = ref<Date>();
|
||||
const date2 = ref<Date>();
|
||||
|
|
@ -1633,6 +1655,16 @@ const OPcommander = ref<
|
|||
OrganizationOrganization: string;
|
||||
}[]
|
||||
>([]);
|
||||
const OPchairman = ref<
|
||||
{
|
||||
personal_id: string;
|
||||
name: string;
|
||||
PositionId: string;
|
||||
PositionLevelId: string;
|
||||
PositionLineId: string;
|
||||
OrganizationOrganization: string;
|
||||
}[]
|
||||
>([]);
|
||||
interface MonthOption {
|
||||
value: number;
|
||||
label: string;
|
||||
|
|
@ -1731,6 +1763,7 @@ const getAssignNew = async (id: string) => {
|
|||
monthSelect.value = `${data.assign_month} เดือน`;
|
||||
OPcaretaker.value = data.mentors;
|
||||
OPcommander.value = [data.commander];
|
||||
OPchairman.value = [data.chairman];
|
||||
fullname.value = data.person.name;
|
||||
position.value = data.person.OrganizationOrganization;
|
||||
});
|
||||
|
|
@ -1863,6 +1896,10 @@ const putData = (id: string) => {
|
|||
role: "commander",
|
||||
dated: date4.value instanceof Date ? dateToISO(date4.value) : null,
|
||||
},
|
||||
{
|
||||
personal_id: chairman.value.personal_id,
|
||||
role: "chairman"
|
||||
},
|
||||
];
|
||||
|
||||
const data = {
|
||||
|
|
@ -1996,7 +2033,7 @@ const getAssign = async () => {
|
|||
activityCount.value = data.jobs.length
|
||||
caretaker1.value = data.mentors[0];
|
||||
caretaker2.value = data.mentors[1];
|
||||
|
||||
chairman.value = data.chairman.name;
|
||||
commander.value = data.commander.name
|
||||
knowledge.value = data.knowledges.map((id:any)=> id.id)
|
||||
knowledgeCount.value = data.knowledges.length
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue