เพิ่มแสดง info
This commit is contained in:
parent
8da2bcc2a3
commit
96d228ccd7
4 changed files with 101 additions and 2 deletions
|
|
@ -30,6 +30,7 @@ import DialogHistoryPos from "@/modules/02_organization/components/DialogHistory
|
|||
import DialogSelectPerson from "@/modules/02_organization/components/DialogSelectPerson.vue"; // เลือกคนครอง
|
||||
import DialogSuccession from "@/modules/02_organization/components/DialogSuccession.vue"; // สืบทอดตำแหน่ง
|
||||
import DialogCondition from "@/modules/19_condition/components/DialogCondition.vue";
|
||||
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
|
||||
|
||||
const $q = useQuasar();
|
||||
const store = useOrganizational();
|
||||
|
|
@ -64,6 +65,8 @@ const props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const modalPerson = ref<boolean>(false); //ตัวแปร popup ข้อมูลทะเบียนประวัติ
|
||||
const personalId = ref<string>(""); //ตัวแปร id ข้อมูลทะเบียนประวัติ
|
||||
const modalSelectPerson = ref<boolean>(false); //เลือกคนครอล
|
||||
const rowId = ref<string>(""); //id ที่ต้องการกระทำ
|
||||
const actionType = ref<string>(""); //ประเภทการกระทำ
|
||||
|
|
@ -819,6 +822,24 @@ watch(
|
|||
: "-"
|
||||
}}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'positionIsSelected'">
|
||||
{{
|
||||
props.row.positionIsSelected
|
||||
? props.row.positionIsSelected
|
||||
: "-"
|
||||
}}
|
||||
<q-btn
|
||||
size="12px"
|
||||
dense
|
||||
flat
|
||||
icon="info"
|
||||
color="info"
|
||||
round
|
||||
@click="(modalPerson = true), (personalId = props.row.current_holderId)"
|
||||
>
|
||||
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
|
|
@ -973,6 +994,13 @@ watch(
|
|||
:fetch-data="fetchDataCondition"
|
||||
:data-condition="dataCondition"
|
||||
/>
|
||||
|
||||
<!-- ข้อมูลทะเบียนประวัติ -->
|
||||
<PopupPersonal
|
||||
:modal="modalPerson"
|
||||
:id="personalId"
|
||||
@update:modal="(value:any)=>{modalPerson = value}"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import DialogMovePos from "@/modules/16_positionEmployee/components/DialogMovePo
|
|||
import DialogHistoryPos from "@/modules/16_positionEmployee/components/DialogHistoryPos.vue";
|
||||
import DialogSelectPerson from "@/modules/16_positionEmployee/components/DialogSelectPerson.vue";
|
||||
import DialogSuccession from "@/modules/16_positionEmployee/components/DialogSuccession.vue";
|
||||
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
|
||||
|
||||
/**
|
||||
* ues
|
||||
|
|
@ -73,6 +74,8 @@ const props = defineProps({
|
|||
/**
|
||||
* modal popup
|
||||
*/
|
||||
const modalPerson = ref<boolean>(false); //ตัวแปร popup ข้อมูลทะเบียนประวัติ
|
||||
const personalId = ref<string>(""); //ตัวแปร id ข้อมูลทะเบียนประวัติ
|
||||
const dialogDetail = ref<boolean>(false); // รายละเอียดตำแหน่ง
|
||||
const modalSelectPerson = ref<boolean>(false); // เลือกคนครอง
|
||||
const dialogPosition = ref<boolean>(false); // อัตรากำลัง
|
||||
|
|
@ -628,6 +631,28 @@ watch(
|
|||
: "-"
|
||||
}}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'positionIsSelected'">
|
||||
{{
|
||||
props.row.positionIsSelected
|
||||
? props.row.positionIsSelected
|
||||
: "-"
|
||||
}}
|
||||
<q-btn
|
||||
v-if="
|
||||
props.row.positionIsSelected !== 'ว่าง' &&
|
||||
props.row.positionIsSelected
|
||||
"
|
||||
size="12px"
|
||||
dense
|
||||
flat
|
||||
icon="info"
|
||||
color="info"
|
||||
round
|
||||
@click="(modalPerson = true), (personalId = props.row.current_holderId)"
|
||||
>
|
||||
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
|
|
@ -704,6 +729,14 @@ watch(
|
|||
|
||||
<!-- สืบทอดตำแหน่ง -->
|
||||
<DialogSuccession v-model:modal="modalDialogSuccession" :rowId="rowId" />
|
||||
|
||||
<!-- ข้อมูลทะเบียนประวัติ -->
|
||||
<PopupPersonal
|
||||
:modal="modalPerson"
|
||||
:id="personalId"
|
||||
@update:modal="(value:any)=>{modalPerson = value}"
|
||||
:type="'employee'"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import DialogMovePos from "@/modules/20_positionTemp/components/DialogMovePos.vu
|
|||
import DialogHistoryPos from "@/modules/20_positionTemp/components/DialogHistoryPos.vue";
|
||||
import DialogSelectPerson from "@/modules/20_positionTemp/components/DialogSelectPerson.vue";
|
||||
import DialogSuccession from "@/modules/20_positionTemp/components/DialogSuccession.vue";
|
||||
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
|
||||
|
||||
/**
|
||||
* ues
|
||||
|
|
@ -73,6 +74,9 @@ const props = defineProps({
|
|||
/**
|
||||
* modal popup
|
||||
*/
|
||||
const modalPerson = ref<boolean>(false); //ตัวแปร popup ข้อมูลทะเบียนประวัติ
|
||||
const personalId = ref<string>(""); //ตัวแปร id ข้อมูลทะเบียนประวัติ
|
||||
|
||||
const dialogDetail = ref<boolean>(false); // รายละเอียดตำแหน่ง
|
||||
const modalSelectPerson = ref<boolean>(false); // เลือกคนครอง
|
||||
const dialogPosition = ref<boolean>(false); // อัตรากำลัง
|
||||
|
|
@ -628,6 +632,28 @@ watch(
|
|||
: "-"
|
||||
}}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'positionIsSelected'">
|
||||
{{
|
||||
props.row.positionIsSelected
|
||||
? props.row.positionIsSelected
|
||||
: "-"
|
||||
}}
|
||||
<q-btn
|
||||
v-if="
|
||||
props.row.positionIsSelected !== 'ว่าง' &&
|
||||
props.row.positionIsSelected
|
||||
"
|
||||
size="12px"
|
||||
dense
|
||||
flat
|
||||
icon="info"
|
||||
color="info"
|
||||
round
|
||||
@click="(modalPerson = true), (personalId = props.row.current_holderId)"
|
||||
>
|
||||
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
|
|
@ -704,6 +730,14 @@ watch(
|
|||
|
||||
<!-- สืบทอดตำแหน่ง -->
|
||||
<DialogSuccession v-model:modal="modalDialogSuccession" :rowId="rowId" />
|
||||
|
||||
<!-- ข้อมูลทะเบียนประวัติ -->
|
||||
<PopupPersonal
|
||||
:modal="modalPerson"
|
||||
:id="personalId"
|
||||
@update:modal="(value:any)=>{modalPerson = value}"
|
||||
:type="'employee'"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue