diff --git a/src/pages/Ticket/Card/TicketMassiveUpdate.vue b/src/components/common/VnPopupProxy.vue similarity index 77% rename from src/pages/Ticket/Card/TicketMassiveUpdate.vue rename to src/components/common/VnPopupProxy.vue index 43e6993bc..7f3361b7a 100644 --- a/src/pages/Ticket/Card/TicketMassiveUpdate.vue +++ b/src/components/common/VnPopupProxy.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue index 70d89af97..1fbc056e7 100644 --- a/src/pages/Ticket/Negative/TicketLackDetail.vue +++ b/src/pages/Ticket/Negative/TicketLackDetail.vue @@ -1,23 +1,21 @@ + + - - - + +
-
+
-
- - {{ item.longName }} - - - +
+ + {{ item?.longName ?? item.name }} + + + +
diff --git a/src/pages/Ticket/Negative/TicketLackTable.vue b/src/pages/Ticket/Negative/TicketLackTable.vue index 4d34c8636..4cc3283ce 100644 --- a/src/pages/Ticket/Negative/TicketLackTable.vue +++ b/src/pages/Ticket/Negative/TicketLackTable.vue @@ -23,7 +23,7 @@ watch( (v) => { filterLack.value.where = v; tableRef.value.reload(filterLack); - } + }, ); const filterLack = ref({ @@ -78,8 +78,38 @@ const saveChange = async (field, { rowIndex, row }) => { }; const entityId = computed(() => route.params.id); const item = ref({}); - +const rowColor = (row) => { + if (!row.hasToIgnore) return 'negative'; + return 'transparent'; +}; +// const textRowColor = (row) => { +// if (row.hasToIgnore) return 'black'; +// return 'white'; +// }; const columns = computed(() => [ + { + align: 'left', + label: t('negative.detail.isBasket'), + name: 'isBasket', + cardVisible: true, + create: true, + component: 'checkbox', + attrs: ({ row }) => { + return { + 'toggle-indeterminate': true, + }; + }, + columnClass: 'shrink', + }, + { + align: 'left', + label: t('negative.detail.hasSubstitution'), + name: 'hasSubstitution', + cardVisible: true, + create: true, + component: 'checkbox', + columnClass: 'shrink', + }, { name: 'status', align: 'left', @@ -139,19 +169,6 @@ const columns = computed(() => [ align: 'left', sortable: true, - - // columnFilter: { - // columnField: { - // component: 'select', - // event: getInputEvents, - // attrs: { - // event: (v) => console.error(v), - // options: editableStates.value, - // 'option-value': 'id', - // 'option-label': 'name', - // // }, - // }, - // }, }, { name: 'zoneName', @@ -177,13 +194,7 @@ const columns = computed(() => [ type: 'number', }, ]); -const itemLackForm = ref(); -const reload = async (data) => { - // window.location.reload(); - console.error(data); -}; -defineExpose({ reload }); const emit = defineEmits(['update:selection']); const tableRef = ref(null); @@ -291,8 +302,10 @@ function onTicketLackFetched(data) { -