Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop
This commit is contained in:
commit
91fd6950cb
3 changed files with 18 additions and 7 deletions
|
|
@ -18,6 +18,7 @@ import type {
|
|||
ResListSalary,
|
||||
ResType,
|
||||
} from "@/modules/04_registryPerson/interface/response/Salary";
|
||||
import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue";
|
||||
|
|
@ -338,7 +339,7 @@ const posExecutiveOptionMain = ref<DataOption[]>([]);
|
|||
|
||||
const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
|
||||
|
||||
const cardData = ref<any[]>([
|
||||
const cardData = ref<DataCardPos[]>([
|
||||
{
|
||||
label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
|
||||
data: [],
|
||||
|
|
@ -827,9 +828,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<q-card-section class="q-pt-none" style="min-height: 200px">
|
||||
<li v-for="data in item.data" :key="data.id">
|
||||
{{ data.name }} {{ data.time }}
|
||||
</li>
|
||||
<li v-for="data in item.data">{{ data.name }} {{ data.time }}</li>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue