This commit is contained in:
Warunee Tamkoo 2024-06-21 13:14:11 +07:00
parent 242af9444d
commit f5fe7f424c
10 changed files with 23 additions and 19 deletions

View file

@ -340,10 +340,12 @@ async function getTable() {
statusNameCheck: convertContainStatus(data.statusId),
statusName:
convertContainStatus(data.statusId) +
(data.typeCommand != ""
? convertTypeCommand(data.typeCommand)
: ""),
data.statusId == "CONTAIN"
? convertTypeCommand(data.typeCommand) + "แล้ว"
: convertContainStatus(data.statusId) +
(data.typeCommand != ""
? convertTypeCommand(data.typeCommand)
: ""),
organizationName:
data.root +
" " +
@ -895,7 +897,7 @@ onMounted(async () => {
dense
>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-list dense style="min-width: 180px">
<q-item
v-if="
roleAdmin &&
@ -929,9 +931,8 @@ onMounted(async () => {
</q-item>
<q-item
v-if="
roleAdmin &&
props.row.draft === 'รอส่งตัว' &&
props.row.nodeName !== null
props.row.nodeName !== null &&
props.row.statusId !== 'CONTAIN'
"
clickable
v-close-popup