Merge branch 'develop' into devTee
This commit is contained in:
commit
5b89adca00
16 changed files with 117 additions and 197 deletions
|
|
@ -93,7 +93,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
|
||||
const modalCommand = ref<boolean>(false);
|
||||
|
||||
/** popup ยืนยันส่งัว */
|
||||
/** popup ยืนยันส่งไปออกคำสั่ง */
|
||||
function saveOrder() {
|
||||
dialogConfirm(
|
||||
$q,
|
||||
|
|
@ -122,7 +122,7 @@ function convertText(val: string) {
|
|||
case "PENDING":
|
||||
return "รอดำเนินการ";
|
||||
case "REPORT":
|
||||
return "ส่งไปเเต่งตั้ง";
|
||||
return "ส่งไปออกคำสั่ง";
|
||||
case "DONE":
|
||||
return "เสร็จสิ้น";
|
||||
default:
|
||||
|
|
@ -136,6 +136,7 @@ watchEffect(() => {
|
|||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<q-dialog v-model="props.modal">
|
||||
<q-card style="width: 1200px; max-width: 80vw">
|
||||
|
|
@ -190,7 +191,7 @@ watchEffect(() => {
|
|||
:filter="filterKeyword"
|
||||
row-key="id"
|
||||
:visible-columns="visibleColumns"
|
||||
selection="multiple"
|
||||
selection="single"
|
||||
v-model:selected="selected"
|
||||
>
|
||||
<template v-slot:header-selection="scope">
|
||||
|
|
@ -243,7 +244,6 @@ watchEffect(() => {
|
|||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
<DialogCreateCommand
|
||||
v-model:modal="modalCommand"
|
||||
:command-type-code="'C-PM-10'"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue