This commit is contained in:
STW_TTTY\stwtt 2024-07-12 13:22:35 +07:00
parent 82b6f07897
commit 74bd72c70c
9 changed files with 123 additions and 75 deletions

View file

@ -56,8 +56,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ตัวชี้วัด",
sortable: true,
field: "includingName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
headerStyle: "font-size: 14px;width:200px",
style: "font-size: 14px;",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
@ -334,6 +334,9 @@ const isEditStep3 = computed(() => {
<div v-else-if="col.name === 'achievement'">
{{ props.row.point ? `ระดับ ${props.row.point}` : "" }}
</div>
<div v-else-if="col.name === 'includingName'" style="width: 200px; white-space: normal;">
{{ props.row.includingName ? props.row.includingName : "-" }}
</div>
<div v-else-if="col.name === 'evaluationResults'">
{{
parseFloat(
@ -347,9 +350,10 @@ const isEditStep3 = computed(() => {
</q-td>
<td>
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
v-if="
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2') ||
store.tabMain === '3'
"
>
<q-btn
@ -437,8 +441,9 @@ const isEditStep3 = computed(() => {
<q-card-actions
align="around"
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2') ||
store.tabMain === '3'
"
>
<q-btn

View file

@ -349,7 +349,7 @@ onMounted(() => {
<d-table
ref="table"
:columns="columns"
:rows="rows[item.id].length !== 0 ? rows[item.id]:[]"
:rows="rows[item.id]?.length !== 0 ? rows[item.id]:[]"
row-key="id"
flat
bordered
@ -439,9 +439,10 @@ onMounted(() => {
</q-td>
<q-td>
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
v-if="
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2') ||
store.tabMain === '3'
"
>
<q-btn
@ -463,13 +464,16 @@ onMounted(() => {
round
:icon="
item.id == 'HEAD' || item.id == 'GROUP'
? 'edit'
? 'mdi-eye'
: 'edit'
"
color="info"
@click.stop.pervent="onEdit(props.row, item.id)"
>
<q-tooltip>แกไข </q-tooltip>
<q-tooltip v-if="item.id == 'HEAD' || item.id == 'GROUP'"
>รายละเอยด</q-tooltip
>
<q-tooltip v-else>แก้ไข</q-tooltip>
</q-btn>
<q-btn
flat
@ -530,8 +534,9 @@ onMounted(() => {
<q-card-actions
align="around"
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2') ||
store.tabMain === '3'
"
>
<q-btn

View file

@ -309,23 +309,24 @@ onMounted(() => {
</q-td>
<q-td>
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
v-if="
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2') ||
store.tabMain === '3'
"
>
<q-btn
flat
round
icon="mdi-developer-board"
icon="mdi-account-details"
color="blue-6"
size="12px"
dense
@click="openPopupProgress(props.row.id)"
>
<q-tooltip>รายงานความกาวหน</q-tooltip>
<q-tooltip>นทกเหตการณ/พฤตกรรม</q-tooltip>
</q-btn>
<q-btn
<!-- <q-btn
flat
round
icon="warning"
@ -336,7 +337,7 @@ onMounted(() => {
@click="openPopupProblem(props.row.id)"
>
<q-tooltip>รายงานปญหา</q-tooltip>
</q-btn>
</q-btn> -->
</div>
<div v-if="isEditStep1">