Merge branch 'develop' into dev
* develop: fix ข้อความ fix(command): disable button delete
This commit is contained in:
commit
5ad9010654
2 changed files with 11 additions and 7 deletions
|
|
@ -248,7 +248,7 @@ onMounted(() => {
|
|||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<!-- หมอบหมายคำสั่ง -->
|
||||
<!-- มอบหมายคำสั่ง -->
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
|
|
@ -262,7 +262,7 @@ onMounted(() => {
|
|||
size="xs"
|
||||
name="mdi-account-check"
|
||||
/>
|
||||
<div class="q-pl-md">หมอบหมายคำสั่ง</div>
|
||||
<div class="q-pl-md">มอบหมายคำสั่ง</div>
|
||||
</div>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup lang="ts">
|
||||
import { onMounted, reactive, ref } from "vue";
|
||||
import { onMounted, reactive, ref, computed } from "vue";
|
||||
import { useQuasar, type QTableProps } from "quasar";
|
||||
import { useRoute } from "vue-router";
|
||||
|
||||
|
|
@ -37,6 +37,12 @@ const props = defineProps({
|
|||
formCommandList: { type: Object, required: true },
|
||||
});
|
||||
|
||||
const isCanDelete = computed(
|
||||
() => (role: string) =>
|
||||
rows.value.filter((row) => row.roleName === "เจ้าหน้าที่ดำเนินการ")
|
||||
.length === 1 && role === "เจ้าหน้าที่ดำเนินการ"
|
||||
); //เช็คสามารถลบรายชื่อผู้ลงนามในแนบท้ายคำสั่ง ได้หรือไม่
|
||||
|
||||
const commandId = ref<string>(route.params.id.toString()); //ID คำสั่ง
|
||||
const commandCode = ref<string>(""); //รหัสคำสั่ง
|
||||
const createdUserId = ref<string>(""); //ID ผู้สร้างคำสั่ง
|
||||
|
|
@ -597,14 +603,12 @@ onMounted(async () => {
|
|||
<q-btn
|
||||
icon="mdi-delete"
|
||||
:color="
|
||||
props.row.roleName === 'เจ้าหน้าที่ดำเนินการ'
|
||||
? 'grey'
|
||||
: 'red'
|
||||
isCanDelete(props.row.roleName) ? 'grey' : 'red'
|
||||
"
|
||||
flat
|
||||
dense
|
||||
round
|
||||
:disable="props.row.roleName === 'เจ้าหน้าที่ดำเนินการ'"
|
||||
:disable="isCanDelete(props.row.roleName)"
|
||||
@click.prevent.stop="onDeleteData(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue