ปรับIcon และตำแหน่งที่แสดง(edit,delete)

This commit is contained in:
oat 2024-02-15 13:27:38 +07:00
parent 1aceedf3d9
commit d1fadacacb
14 changed files with 418 additions and 578 deletions

View file

@ -332,56 +332,42 @@ const dialogOrder = ref<boolean>(false);
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
name = props.row.name;
shortName = props.row.shortName;
note = props.row.note;
isActive = props.row.isActive;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
name = props.row.name; @click.stop="
shortName = props.row.shortName; dialogRemove($q, async () => await deleteData(props.row.id))
note = props.row.note; "
isActive = props.row.isActive; v-close-popup
} >
" <q-tooltip>ลบขอม</q-tooltip>
>
<q-item-section>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -246,54 +246,40 @@ async function onSubmit() {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
name = props.row.name;
isActive = props.row.isActive;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
name = props.row.name; @click.stop="
isActive = props.row.isActive; dialogRemove($q, async () => await deleteData(props.row.id))
} "
" v-close-popup
> >
<q-item-section> <q-tooltip>ลบขอม</q-tooltip>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -200,53 +200,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
prefix = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
prefix = props.row.name; clickable
editId = props.row.id; @click.stop="
} dialogRemove($q, async () => await deleteData(props.row.id))
" "
> v-close-popup
<q-item-section> >
<div class="row items-center white"> <q-tooltip>ลบขอม</q-tooltip>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -182,53 +182,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
rank = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
rank = props.row.name; clickable
editId = props.row.id; @click.stop="
} dialogRemove($q, async () => await deleteData(props.row.id))
" "
> v-close-popup
<q-item-section> >
<div class="row items-center white"> <q-tooltip>ลบขอม</q-tooltip>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -182,53 +182,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
bloodGroup = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
bloodGroup = props.row.name; clickable
editId = props.row.id; @click.stop="
} dialogRemove($q, async () => await deleteData(props.row.id))
" "
> v-close-popup
<q-item-section> >
<div class="row items-center white"> <q-tooltip>ลบขอม</q-tooltip>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -182,53 +182,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
gender = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
gender = props.row.name; clickable
editId = props.row.id; @click.stop="
} dialogRemove($q, async () => await deleteData(props.row.id))
" "
> v-close-popup
<q-item-section> >
<div class="row items-center white"> <q-tooltip>ลบขอม</q-tooltip>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -182,53 +182,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
religion = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
religion = props.row.name; clickable
editId = props.row.id; @click.stop="
} dialogRemove($q, async () => await deleteData(props.row.id))
" "
> v-close-popup
<q-item-section> >
<div class="row items-center white"> <q-tooltip>ลบขอม</q-tooltip>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -211,52 +211,39 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
relationship = props.row.name;
editId = props.row.id;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
} @click.stop="
" dialogRemove($q, async () => await deleteData(props.row.id))
> "
<q-item-section> v-close-popup
<div class="row items-center white"> >
<q-icon name="o_edit" color="positive" /> <q-tooltip>ลบขอม</q-tooltip>
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -196,54 +196,40 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
educationLevel = props.row.name;
educationRank = props.row.rank;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
educationLevel = props.row.name; @click.stop="
educationRank = props.row.rank; dialogRemove($q, async () => await deleteData(props.row.id))
} "
" v-close-popup
> >
<q-item-section> <q-tooltip>ลบขอม</q-tooltip>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -360,30 +360,34 @@ onMounted(() => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="edit"
flat flat
dense dense
icon="mdi-dots-vertical" round
class="q-pa-none q-ml-xs" class="q-mr-xs"
color="grey-13" size="12px"
icon="mdi-content-copy"
clickable
@click.stop="
() => {
copyDetiail(props.row);
}
"
> >
<q-menu anchor="bottom middle" self="top middle"> <q-tooltip>ดลอกขอม</q-tooltip>
<q-list dense v-for="(item, index) in listMenu" :key="index"> </q-btn>
<q-item <q-btn
clickable color="red"
v-close-popup flat
@click=" dense
item.type === 'copy' round
? copyDetiail(props.row) size="12px"
: deletePos(props.row.id) icon="mdi-delete"
" clickable
> @click.stop="deletePos(props.row.id)"
<q-item-section avatar> v-close-popup
<q-icon :color="item.color" :name="item.icon" size="sm" /> >
</q-item-section> <q-tooltip>ลบขอม</q-tooltip>
<q-item-section>{{ item.label }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -235,54 +235,40 @@ async function onSubmit() {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
posTypeName = props.row.posTypeName;
posTypeRank = props.row.posTypeRank;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
posTypeName = props.row.posTypeName; @click.stop="
posTypeRank = props.row.posTypeRank; dialogRemove($q, async () => await deleteData(props.row.id))
} "
" v-close-popup
> >
<q-item-section> <q-tooltip>ลบขอม</q-tooltip>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -10,10 +10,9 @@ import type {
import http from "@/plugins/http"; import http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
import DialogAdd from '@/modules/01_metadataNew/components/position/DialogAddExecutive.vue' import DialogAdd from "@/modules/01_metadataNew/components/position/DialogAddExecutive.vue";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar(); const $q = useQuasar();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { const {
@ -113,7 +112,7 @@ function deletePos(id: string) {
.delete(config.API.orgPosExecutiveById(id)) .delete(config.API.orgPosExecutiveById(id))
.then(() => { .then(() => {
success($q, "ลบข้อมูลสำเร็จ"); success($q, "ลบข้อมูลสำเร็จ");
getData() getData();
}) })
.catch((err) => { .catch((err) => {
messageError($q, err); messageError($q, err);
@ -199,30 +198,34 @@ onMounted(() => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="edit"
flat flat
dense dense
icon="mdi-dots-vertical" round
class="q-pa-none q-ml-xs" class="q-mr-xs"
color="grey-13" size="12px"
icon="edit"
clickable
@click.stop="
() => {
editPopUp(props.row);
}
"
> >
<q-menu anchor="bottom middle" self="top middle"> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense v-for="(item, index) in listMenu" :key="index"> </q-btn>
<q-item <q-btn
clickable color="red"
v-close-popup flat
@click=" dense
item.type === 'copy' round
? editPopUp(props.row) size="12px"
: deletePos(props.row.id) icon="mdi-delete"
" clickable
> @click.stop="deletePos(props.row.id)"
<q-item-section avatar> v-close-popup
<q-icon :color="item.color" :name="item.icon" size="sm" /> >
</q-item-section> <q-tooltip>ลบขอม</q-tooltip>
<q-item-section>{{ item.label }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>
@ -231,9 +234,9 @@ onMounted(() => {
</div> </div>
<DialogAdd <DialogAdd
v-model:executive="modalAdd" v-model:executive="modalAdd"
v-model:form-data="dataEdit" v-model:form-data="dataEdit"
v-model:edit="isEdit" v-model:edit="isEdit"
:get-data="getData" :get-data="getData"
/> />
</template> </template>

View file

@ -303,55 +303,41 @@ async function fetchName() {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
posLevelName = props.row.posLevelName;
posLevelRank = props.row.posLevelRank;
posLevelAuthority = props.row.posLevelAuthority;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
posLevelName = props.row.posLevelName; @click.stop="
posLevelRank = props.row.posLevelRank; dialogRemove($q, async () => await deleteData(props.row.id))
posLevelAuthority = props.row.posLevelAuthority; "
} v-close-popup
" >
> <q-tooltip>ลบขอม</q-tooltip>
<q-item-section>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>

View file

@ -388,59 +388,45 @@ async function changeCardID(citizenId: string | number | null) {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
color="grey" color="edit"
flat flat
dense dense
round round
size="14px" class="q-mr-xs"
icon="more_vert" size="12px"
@click.stop icon="edit"
clickable
@click.stop="
() => {
dialogStatus = 'edit';
dialog = true;
editId = props.row.id;
prefix = props.row.prefix;
firstName = props.row.firstName;
lastName = props.row.lastName;
citizenId = props.row.citizenId;
position = props.row.position;
posTypeId = props.row.posTypeId;
posLevelId = props.row.posLevelId;
}
"
> >
<q-menu> <q-tooltip>แกไขขอม</q-tooltip>
<q-list dense> </q-btn>
<q-item <q-btn
v-close-popup color="red"
clickable flat
@click.stop=" dense
() => { round
dialogStatus = 'edit'; size="12px"
dialog = true; icon="mdi-delete"
editId = props.row.id; clickable
prefix = props.row.prefix; @click.stop="
firstName = props.row.firstName; dialogRemove($q, async () => await deleteData(props.row.id))
lastName = props.row.lastName; "
citizenId = props.row.citizenId; v-close-popup
position = props.row.position; >
posTypeId = props.row.posTypeId; <q-tooltip>ลบขอม</q-tooltip>
posLevelId = props.row.posLevelId;
}
"
>
<q-item-section>
<div class="row items-center white">
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm">แกไข</span>
</div>
</q-item-section>
</q-item>
<q-item clickable>
<q-item-section
@click="
dialogRemove(
$q,
async () => await deleteData(props.row.id)
)
"
v-close-popup
>
<div class="row items-center white">
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>