Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
flat
|
||||
bordered
|
||||
dense
|
||||
row-key="urun_ilk_grubu"
|
||||
row-key="group_code"
|
||||
:loading="store.loading"
|
||||
:rows="store.rows"
|
||||
:columns="columns"
|
||||
@@ -25,8 +25,8 @@
|
||||
<template #body-cell-mail_selector="props">
|
||||
<q-td :props="props">
|
||||
<q-select
|
||||
:model-value="editableByGroup[props.row.urun_ilk_grubu] || []"
|
||||
:options="mailOptionsByGroup[props.row.urun_ilk_grubu] || allMailOptions"
|
||||
:model-value="editableByGroup[props.row.group_code] || []"
|
||||
:options="mailOptionsByGroup[props.row.group_code] || allMailOptions"
|
||||
option-value="id"
|
||||
option-label="label"
|
||||
emit-value
|
||||
@@ -39,8 +39,8 @@
|
||||
dense
|
||||
outlined
|
||||
label="Mail ara ve sec"
|
||||
@filter="(val, update) => filterMailOptions(props.row.urun_ilk_grubu, val, update)"
|
||||
@update:model-value="(val) => updateRowSelection(props.row.urun_ilk_grubu, val)"
|
||||
@filter="(val, update) => filterMailOptions(props.row.group_code, val, update)"
|
||||
@update:model-value="(val) => updateRowSelection(props.row.group_code, val)"
|
||||
/>
|
||||
</q-td>
|
||||
</template>
|
||||
@@ -71,7 +71,8 @@ const originalByGroup = ref({})
|
||||
const mailOptionsByGroup = ref({})
|
||||
|
||||
const columns = [
|
||||
{ name: 'urun_ilk_grubu', label: 'Urun Ilk Grubu', field: 'urun_ilk_grubu', align: 'left' },
|
||||
{ name: 'group_code', label: 'Urun Ilk Grup Kodu', field: 'group_code', align: 'left' },
|
||||
{ name: 'group_title', label: 'Urun Ilk Grup Aciklama', field: 'group_title', align: 'left' },
|
||||
{ name: 'mail_selector', label: 'Maliyet Mail Eslestirme', field: 'mail_selector', align: 'left' }
|
||||
]
|
||||
|
||||
@@ -81,7 +82,7 @@ const allMailOptions = computed(() =>
|
||||
|
||||
const changedGroups = computed(() => {
|
||||
return (store.rows || [])
|
||||
.map((r) => String(r.urun_ilk_grubu || '').trim())
|
||||
.map((r) => String(r.group_code || r.urun_ilk_grubu || '').trim())
|
||||
.filter(Boolean)
|
||||
.filter((g) => {
|
||||
const current = normalizeList(editableByGroup.value[g] || [])
|
||||
@@ -115,7 +116,7 @@ function initEditableState () {
|
||||
const original = {}
|
||||
|
||||
;(store.rows || []).forEach((row) => {
|
||||
const g = String(row.urun_ilk_grubu || '').trim()
|
||||
const g = String(row.group_code || row.urun_ilk_grubu || '').trim()
|
||||
const selected = normalizeList(row.mail_ids || [])
|
||||
editable[g] = [...selected]
|
||||
original[g] = [...selected]
|
||||
@@ -169,4 +170,3 @@ async function saveChanges () {
|
||||
|
||||
onMounted(() => { init() })
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user