Merge branch 'dev/phatt' into develop
This commit is contained in:
commit
eae757edc8
5 changed files with 26 additions and 9 deletions
|
|
@ -16,7 +16,7 @@ defineProps<{
|
||||||
round
|
round
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="row q-mt-sm color-text">{{ label }}</div>
|
<div v-if="label" class="row q-mt-sm color-text">{{ $t(label) }}</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ defineProps<{
|
||||||
"
|
"
|
||||||
@click="selector = v.label"
|
@click="selector = v.label"
|
||||||
>
|
>
|
||||||
<q-item-section>{{ v.label }}</q-item-section>
|
<q-item-section>{{ $t(v.label) }}</q-item-section>
|
||||||
<div class="dot text-weight-bold">1</div>
|
<div class="dot text-weight-bold">1</div>
|
||||||
</q-item>
|
</q-item>
|
||||||
</q-list>
|
</q-list>
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,12 @@ export default {
|
||||||
personnelManagement: 'Personnel Management',
|
personnelManagement: 'Personnel Management',
|
||||||
personnelTooltipTitle: 'No personnel yet?',
|
personnelTooltipTitle: 'No personnel yet?',
|
||||||
personnelTooltipCaption: 'Click + to add a personnel',
|
personnelTooltipCaption: 'Click + to add a personnel',
|
||||||
|
personnelAdd: 'Add personnel',
|
||||||
|
|
||||||
|
personnelSelector1: 'Employee',
|
||||||
|
personnelSelector2: 'Courier',
|
||||||
|
personnelSelector3: 'Agent',
|
||||||
|
personnelSelector4: 'Agency',
|
||||||
|
|
||||||
|
personnelStatTitle: 'Summary of data'
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,12 @@ export default {
|
||||||
personnelManagement: 'จัดการบุคลากร',
|
personnelManagement: 'จัดการบุคลากร',
|
||||||
personnelTooltipTitle: 'ยังไม่มีข้อมูลบุคลากร',
|
personnelTooltipTitle: 'ยังไม่มีข้อมูลบุคลากร',
|
||||||
personnelTooltipCaption: 'คลิก + เพื่อเพิ่มบุคลากร',
|
personnelTooltipCaption: 'คลิก + เพื่อเพิ่มบุคลากร',
|
||||||
|
personnelAdd: 'เพิ่มข้อมูลบุคลากร',
|
||||||
|
|
||||||
|
personnelSelector1: 'พนักงาน',
|
||||||
|
personnelSelector2: 'พนักงานส่งเอกสาร',
|
||||||
|
personnelSelector3: 'ตัวแทน',
|
||||||
|
personnelSelector4: 'เอเจนซี่',
|
||||||
|
|
||||||
|
personnelStatTitle: 'สรุปจำนวนข้อมูล',
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -102,19 +102,19 @@ const branchStat = ref<
|
||||||
|
|
||||||
const selectorList = [
|
const selectorList = [
|
||||||
{
|
{
|
||||||
label: 'พนักงาน',
|
label: 'personnelSelector1',
|
||||||
count: 0,
|
count: 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'พนักงานส่งเอกสาร',
|
label: 'personnelSelector2',
|
||||||
count: 0,
|
count: 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'ตัวแทน',
|
label: 'personnelSelector3',
|
||||||
count: 0,
|
count: 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'เอเจนซี่',
|
label: 'personnelSelector4',
|
||||||
count: 0,
|
count: 0,
|
||||||
},
|
},
|
||||||
] satisfies InstanceType<typeof SelectorList>['$props']['list'];
|
] satisfies InstanceType<typeof SelectorList>['$props']['list'];
|
||||||
|
|
@ -137,7 +137,7 @@ const selectorList = [
|
||||||
<!-- stat -->
|
<!-- stat -->
|
||||||
<AppBox bordered class="column full-width" style="overflow-x: auto">
|
<AppBox bordered class="column full-width" style="overflow-x: auto">
|
||||||
<span class="text-weight-bold text-subtitle1">
|
<span class="text-weight-bold text-subtitle1">
|
||||||
สรุปจำนวนข้อมูล{{ selectorLabel }}
|
{{ $t('personnelStatTitle') + selectorLabel }}
|
||||||
</span>
|
</span>
|
||||||
<div class="row q-pt-lg">
|
<div class="row q-pt-lg">
|
||||||
<stat-card-componet :branch="branchStat" class="no-wrap" />
|
<stat-card-componet :branch="branchStat" class="no-wrap" />
|
||||||
|
|
@ -147,7 +147,8 @@ const selectorList = [
|
||||||
|
|
||||||
<!-- main -->
|
<!-- main -->
|
||||||
<AppBox bordered style="width: 100%; height: 580px; overflow-y: auto">
|
<AppBox bordered style="width: 100%; height: 580px; overflow-y: auto">
|
||||||
<PersonCard :list="person" class="q-mb-md" />
|
<!-- <PersonCard :list="person" class="q-mb-md" /> -->
|
||||||
|
|
||||||
<div class="column" style="height: 100%">
|
<div class="column" style="height: 100%">
|
||||||
<div class="col-1 self-end">
|
<div class="col-1 self-end">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -161,7 +162,7 @@ const selectorList = [
|
||||||
|
|
||||||
<div class="col self-center" style="display: flex; align-items: center">
|
<div class="col self-center" style="display: flex; align-items: center">
|
||||||
<btn-add-componet
|
<btn-add-componet
|
||||||
:label="'เพิ่มข้อมูลบุคลากร'"
|
:label="'personnelAdd'"
|
||||||
@trigger="
|
@trigger="
|
||||||
() => {
|
() => {
|
||||||
console.log('test');
|
console.log('test');
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue