M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ui/src/pages/OrderList.vue
This commit is contained in:
MEHMETKECECI
2026-02-13 15:17:14 +03:00
parent c888ef9b3c
commit 03d6c61587
8 changed files with 576 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
svc/main.go
View File

@@ -262,6 +262,11 @@ func InitRoutes(pgDB *sql.DB, mssql *sql.DB, ml *mailer.GraphMailer) *mux.Router
rdPerm := "/api/roles/{roleId}/departments/{deptCode}/permissions"
rdHandler := routes.NewRoleDepartmentPermissionHandler(pgDB)
bindV3(r, pgDB,
"/api/role-dept-permissions/list", "GET",
"user", "update",
wrapV3(http.HandlerFunc(rdHandler.List)),
)
bindV3(r, pgDB,
rdPerm, "GET",
"user", "update",
@@ -407,6 +412,8 @@ func InitRoutes(pgDB *sql.DB, mssql *sql.DB, ml *mailer.GraphMailer) *mux.Router
{"/api/order/update", "POST", "update", http.HandlerFunc(routes.UpdateOrderHandler)},
{"/api/order/get/{id}", "GET", "view", routes.GetOrderByIDHandler(mssql)},
{"/api/orders/list", "GET", "view", routes.OrderListRoute(mssql)},
{"/api/orders/close-ready", "GET", "update", routes.OrderCloseReadyListRoute(mssql)},
{"/api/orders/bulk-close", "POST", "update", routes.OrderBulkCloseRoute(mssql)},
{"/api/orders/export", "GET", "export", routes.OrderListExcelRoute(mssql)},
{"/api/order/check/{id}", "GET", "view", routes.OrderExistsHandler(mssql)},
{"/api/order/validate", "POST", "insert", routes.ValidateOrderHandler(mssql)},

78
svc/queries/permission_role_dept.go
View File

@@ -34,6 +34,67 @@ DO UPDATE SET
`
// LIST (role+department sets with summary)
const ListRoleDepartmentPermissionSets = `
WITH role_dept AS (
SELECT DISTINCT
p.role_id,
p.department_code
FROM mk_sys_role_department_permissions p
),
base AS (
SELECT
rd.role_id,
COALESCE(NULLIF(r.title, ''), r.code, rd.role_id::text) AS role_title,
rd.department_code,
COALESCE(d.title, rd.department_code) AS department_title
FROM role_dept rd
LEFT JOIN dfrole r
ON r.id = rd.role_id
LEFT JOIN mk_dprt d
ON d.code = rd.department_code
WHERE
($1 = '' OR
COALESCE(NULLIF(r.title, ''), r.code, '') ILIKE '%' || $1 || '%' OR
COALESCE(d.title, '') ILIKE '%' || $1 || '%' OR
rd.department_code ILIKE '%' || $1 || '%' OR
rd.role_id::text ILIKE '%' || $1 || '%')
),
perm_agg AS (
SELECT
p.role_id,
p.department_code,
LOWER(p.module_code) AS module_code,
LOWER(p.action) AS action,
BOOL_OR(p.allowed) AS has_allowed
FROM mk_sys_role_department_permissions p
GROUP BY
p.role_id,
p.department_code,
LOWER(p.module_code),
LOWER(p.action)
)
SELECT
b.role_id,
b.role_title,
b.department_code,
b.department_title,
COALESCE(
(
SELECT jsonb_object_agg(pa.module_code || '|' || pa.action, pa.has_allowed)
FROM perm_agg pa
WHERE
pa.role_id = b.role_id
AND pa.department_code = b.department_code
),
'{}'::jsonb
) AS module_flags
FROM base b
ORDER BY
b.role_title,
b.department_title
`
// ======================================================
// 📦 MODULES
// ======================================================
@@ -45,3 +106,20 @@ SELECT
FROM mk_sys_modules
ORDER BY id
`
const GetModuleActionLookup = `
SELECT DISTINCT
LOWER(x.module_code) AS module_code,
LOWER(x.action) AS action
FROM (
SELECT module_code, action FROM mk_sys_routes
UNION ALL
SELECT module_code, action FROM mk_sys_role_department_permissions
) x
WHERE
x.module_code IS NOT NULL
AND x.action IS NOT NULL
ORDER BY
LOWER(x.module_code),
LOWER(x.action)
`

128
svc/routes/role_department_permissions.go
View File

@@ -11,6 +11,7 @@ import (
"log"
"net/http"
"strconv"
"strings"
"github.com/gorilla/mux"
)
@@ -24,6 +25,30 @@ type Row struct {
CanAccess bool `json:"can_access"`
}
type RoleDeptPermissionSummary struct {
RoleID int `json:"role_id"`
RoleTitle string `json:"role_title"`
DepartmentCode string `json:"department_code"`
DepartmentTitle string `json:"department_title"`
ModuleFlags map[string]bool `json:"module_flags"`
}
type ModuleLookupOption struct {
Value string `json:"value"`
Label string `json:"label"`
}
type ModuleActionLookupOption struct {
ModuleCode string `json:"module_code"`
Action string `json:"action"`
}
type RoleDeptPermissionListResponse struct {
Modules []ModuleLookupOption `json:"modules"`
ModuleActions []ModuleActionLookupOption `json:"module_actions"`
Rows []RoleDeptPermissionSummary `json:"rows"`
}
type RoleDepartmentPermissionHandler struct {
DB *sql.DB
Repo *permissions.RoleDepartmentPermissionRepo
@@ -37,6 +62,109 @@ func NewRoleDepartmentPermissionHandler(db *sql.DB) *RoleDepartmentPermissionHan
}
}
/* ======================================================
LIST
====================================================== */
func (h *RoleDepartmentPermissionHandler) List(w http.ResponseWriter, r *http.Request) {
claims, ok := auth.GetClaimsFromContext(r.Context())
if !ok || claims == nil {
http.Error(w, "unauthorized", http.StatusUnauthorized)
return
}
search := strings.TrimSpace(r.URL.Query().Get("search"))
modRows, err := h.DB.Query(queries.GetModuleLookup)
if err != nil {
http.Error(w, "module lookup error", http.StatusInternalServerError)
return
}
defer modRows.Close()
modules := make([]ModuleLookupOption, 0, 32)
for modRows.Next() {
var m ModuleLookupOption
if err := modRows.Scan(&m.Value, &m.Label); err != nil {
http.Error(w, "module lookup scan error", http.StatusInternalServerError)
return
}
modules = append(modules, m)
}
if err := modRows.Err(); err != nil {
http.Error(w, "module lookup rows error", http.StatusInternalServerError)
return
}
actionRows, err := h.DB.Query(queries.GetModuleActionLookup)
if err != nil {
http.Error(w, "module action lookup error", http.StatusInternalServerError)
return
}
defer actionRows.Close()
moduleActions := make([]ModuleActionLookupOption, 0, 128)
for actionRows.Next() {
var a ModuleActionLookupOption
if err := actionRows.Scan(&a.ModuleCode, &a.Action); err != nil {
http.Error(w, "module action scan error", http.StatusInternalServerError)
return
}
moduleActions = append(moduleActions, a)
}
if err := actionRows.Err(); err != nil {
http.Error(w, "module action rows error", http.StatusInternalServerError)
return
}
rows, err := h.DB.Query(queries.ListRoleDepartmentPermissionSets, search)
if err != nil {
http.Error(w, "db error", http.StatusInternalServerError)
return
}
defer rows.Close()
list := make([]RoleDeptPermissionSummary, 0, 128)
for rows.Next() {
var item RoleDeptPermissionSummary
var rawFlags []byte
if err := rows.Scan(
&item.RoleID,
&item.RoleTitle,
&item.DepartmentCode,
&item.DepartmentTitle,
&rawFlags,
); err != nil {
http.Error(w, "scan error", http.StatusInternalServerError)
return
}
item.ModuleFlags = map[string]bool{}
if len(rawFlags) > 0 {
if err := json.Unmarshal(rawFlags, &item.ModuleFlags); err != nil {
http.Error(w, "module flags parse error", http.StatusInternalServerError)
return
}
}
list = append(list, item)
}
if err := rows.Err(); err != nil {
http.Error(w, "rows error", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json; charset=utf-8")
_ = json.NewEncoder(w).Encode(RoleDeptPermissionListResponse{
Modules: modules,
ModuleActions: moduleActions,
Rows: list,
})
}
/* ======================================================
GET
====================================================== */

5
ui/src/layouts/MainLayout.vue
View File

@@ -208,6 +208,11 @@ const menuItems = [
label: 'Siparişler',
to: '/app/order-gateway',
permission: 'order:view'
},
{
label: 'Tamamlanan Siparişleri Toplu Kapatma',
to: '/app/order-bulk-close',
permission: 'order:update'
}
]
},

14
ui/src/pages/OrderGateway.vue
View File

@@ -57,6 +57,13 @@
label="MEVCUT SİPARİŞİ AÇ"
@click="goOrderList"
/>
<q-btn
v-if="canUpdateOrder"
color="negative"
icon="task_alt"
label="TAMAMLANANLARI TOPLU KAPAT"
@click="goBulkClose"
/>
</div>
@@ -80,10 +87,11 @@ import { useQuasar } from 'quasar'
import { useOrderEntryStore } from 'src/stores/orderentryStore'
import { usePermission } from 'src/composables/usePermission'
const { canRead, canWrite } = usePermission()
const { canRead, canWrite, canUpdate } = usePermission()
const canReadOrder = canRead('order')
const canWriteOrder = canWrite('order')
const canUpdateOrder = canUpdate('order')
const router = useRouter()
const $q = useQuasar()
@@ -182,6 +190,10 @@ function goOrderList () {
router.push({ name: 'order-list' })
}
function goBulkClose () {
router.push({ name: 'order-bulk-close' })
}
/* ===========================================================
🧹 NEW Taslağı Temizle (SADECE NEW)
=========================================================== */

410
ui/src/pages/OrderList.vue
View File

@@ -1,49 +1,40 @@
<template>
<q-page class="ol-page">
<!-- 🔍 Sticky Filter -->
<q-page v-if="canReadOrder" class="ol-page">
<div class="ol-filter-bar">
<!-- 🔹 TEK SATIR FLEX -->
<div class="ol-filter-row">
<!-- 🔍 Arama -->
<q-input
v-model="store.filters.search"
class="ol-filter-input ol-search"
dense
filled
v-model="store.filters.search"
label="Arama (Sipariş No / Cari / Açıklama)"
debounce="300"
clearable
label="Arama (Sipariş No / Cari / Açıklama)"
>
<template #append>
<q-icon name="search" />
</template>
</q-input>
<!-- 🧾 Cari Kodu -->
<q-input
class="ol-filter-input"
dense
filled
v-model="store.filters.CurrAccCode"
label="Cari Kodu"
clearable
/>
<!-- 📅 Sipariş Tarihi -->
<q-input
class="ol-filter-input"
dense
filled
v-model="store.filters.OrderDate"
label="Sipariş Tarihi"
type="date"
clearable
label="Cari Kodu"
/>
<!-- 🔘 Butonlar -->
<div class="ol-filter-actions">
<q-input
v-model="store.filters.OrderDate"
class="ol-filter-input"
dense
filled
type="date"
label="Sipariş Tarihi"
/>
<div class="ol-filter-actions">
<q-btn
label="Temizle"
icon="clear"
@@ -52,9 +43,7 @@
:disable="store.loading"
@click="clearFilters"
>
<q-tooltip>
Tüm filtreleri temizle
</q-tooltip>
<q-tooltip>Tüm filtreleri temizle</q-tooltip>
</q-btn>
<q-btn
@@ -73,25 +62,31 @@
:disable="store.loading || store.filteredOrders.length === 0"
@click="exportExcel"
/>
</div>
<!-- 💰 Toplam -->
<div class="ol-filter-total">
Toplam Görünen Sipariş Tutarı (USD):
<strong>
{{ store.totalVisibleUSD.toLocaleString('tr-TR', { minimumFractionDigits: 2 }) }}
USD
</strong>
<div class="ol-total-line">
<span class="ol-total-label">Toplam USD:</span>
<strong class="ol-total-value">
{{ store.totalVisibleUSD.toLocaleString('tr-TR', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) }}
</strong>
</div>
<div class="ol-total-line">
<span class="ol-total-label">Paketlenen USD:</span>
<strong class="ol-total-value">
{{ store.totalPackedVisibleUSD.toLocaleString('tr-TR', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) }}
</strong>
</div>
<div class="ol-total-line">
<span class="ol-total-label">Paketlenme %:</span>
<strong class="ol-total-value" :class="packRateClass(store.packedVisibleRatePct)">
{{ store.packedVisibleRatePct.toLocaleString('tr-TR', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) }}
</strong>
</div>
</div>
</div>
</div>
<!-- 📋 ORDER LIST TABLE -->
<q-table
title="Mevcut Siparişler"
class="ol-table"
@@ -107,11 +102,8 @@
:rows-per-page-options="[0]"
hide-bottom
>
<!-- 📄 PDF + DURUM -->
<template #body-cell-IsCreditableConfirmed="props">
<q-td :props="props" class="text-center q-gutter-sm">
<q-btn
icon="picture_as_pdf"
color="red"
@@ -132,11 +124,9 @@
{{ props.row.IsCreditableConfirmed ? 'Onaylı' : 'Onaysız' }}
</q-tooltip>
</q-icon>
</q-td>
</template>
<!-- 📅 Tarih -->
<template #body-cell-OrderDate="props">
<q-td :props="props" class="text-center">
{{ formatDate(props.row.OrderDate) }}
@@ -149,27 +139,65 @@
</q-td>
</template>
<!-- 🧾 Cari Adı — 2 Satır -->
<template #body-cell-PackedAmount="props">
<q-td :props="props" class="text-right text-weight-medium">
{{ Number(props.row.PackedAmount || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) }}
{{ props.row.DocCurrencyCode }}
</q-td>
</template>
<template #body-cell-PackedUSD="props">
<q-td :props="props" class="text-right text-weight-medium">
{{ Number(props.row.PackedUSD || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) }} USD
</q-td>
</template>
<template #body-cell-PackedRatePct="props">
<q-td
:props="props"
class="text-right text-weight-bold ol-pack-rate-cell"
:class="packRateClass(props.row.PackedRatePct)"
>
{{ Number(props.row.PackedRatePct || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) }} %
</q-td>
</template>
<template #body-cell-CurrAccDescription="props">
<q-td :props="props" class="ol-col-cari ol-col-multiline">
{{ props.value }}
<q-td :props="props" class="ol-col-cari">
<div class="ol-col-multiline">{{ props.value }}</div>
<q-tooltip v-if="props.value">
{{ props.value }}
</q-tooltip>
</q-td>
</template>
<template #body-cell-MusteriTemsilcisi="props">
<q-td :props="props" class="ol-col-short">
<div class="ol-col-multiline">{{ props.value }}</div>
<q-tooltip v-if="props.value">
{{ props.value }}
</q-tooltip>
</q-td>
</template>
<template #body-cell-Piyasa="props">
<q-td :props="props" class="ol-col-short">
<div class="ol-col-multiline">{{ props.value }}</div>
<q-tooltip v-if="props.value">
{{ props.value }}
</q-tooltip>
</q-td>
</template>
<!-- 📝 Açıklama — 5 Satır -->
<template #body-cell-Description="props">
<q-td :props="props" class="ol-col-desc ol-col-multiline">
{{ props.value }}
<q-td :props="props" class="ol-col-desc">
<div class="ol-col-multiline">{{ props.value }}</div>
<q-tooltip v-if="props.value">
{{ props.value }}
</q-tooltip>
</q-td>
</template>
<!-- 🔗 Aç -->
<template #body-cell-select="props">
<q-td :props="props" class="text-center">
<q-btn
@@ -184,14 +212,17 @@
</q-btn>
</q-td>
</template>
</q-table>
<!-- ❌ HATA -->
<q-banner v-if="store.error" class="bg-red text-white q-mt-sm">
❌ {{ store.error }}
Hata: {{ store.error }}
</q-banner>
</q-page>
<q-page v-else class="q-pa-md flex flex-center">
<div class="text-negative text-subtitle1">
Bu modüle erişim yetkiniz yok.
</div>
</q-page>
</template>
@@ -199,47 +230,28 @@
import { onMounted, watch } from 'vue'
import { useRouter } from 'vue-router'
import { useQuasar } from 'quasar'
import { useOrderListStore } from 'src/stores/OrdernewListStore'
import { useAuthStore } from 'src/stores/authStore'
import { usePermission } from 'src/composables/usePermission'
const { canRead, canWrite, canUpdate } = usePermission()
const canReadOrder = canRead('order')
const canWriteOrder = canWrite('order')
const canUpdateOrder = canUpdate('order')
/* =========================
INIT
========================= */
const { canRead } = usePermission()
const canReadOrder = canRead('order')
const router = useRouter()
const $q = useQuasar()
// ⚠️ ÖNCE store tanımlanır
const store = useOrderListStore()
/* =========================
SEARCH DEBOUNCE
========================= */
let searchTimer = null
watch(
() => store.filters.search,
() => {
clearTimeout(searchTimer)
searchTimer = setTimeout(() => {
store.fetchOrders()
}, 400)
}
)
/* =========================
HELPERS
========================= */
function exportExcel () {
const auth = useAuthStore()
@@ -276,80 +288,85 @@ function exportExcel () {
function formatDate (s) {
if (!s) return ''
const [y, m, d] = s.split('-')
const [y, m, d] = String(s).split('-')
if (!y || !m || !d) return s
return `${d}.${m}.${y}`
}
/* =========================
TABLE COLUMNS
========================= */
function packRateClass (value) {
const pct = Number(value || 0)
if (pct <= 50) return 'pack-rate-danger'
if (pct < 100) return 'pack-rate-warn'
return 'pack-rate-ok'
}
const columns = [
{ name: 'select', label: '', field: 'select', align: 'center', sortable: false },
{ name: 'OrderNumber', label: 'Sipariş No', field: 'OrderNumber', align: 'left', sortable: true },
{ name: 'OrderDate', label: 'Tarih', field: 'OrderDate', align: 'center', sortable: true },
{ name: 'CurrAccCode', label: 'Cari Kod', field: 'CurrAccCode', align: 'left', sortable: true },
{
name: 'CurrAccDescription',
label: 'Cari Adı',
field: 'CurrAccDescription',
align: 'left',
sortable: true,
classes: 'ol-col-cari',
headerClasses: 'ol-col-cari',
style: 'max-width:200px'
},
{ name: 'MusteriTemsilcisi', label: 'Temsilci', field: 'MusteriTemsilcisi', align: 'left', sortable: true },
{ name: 'Piyasa', label: 'Piyasa', field: 'Piyasa', align: 'left', sortable: true },
{ name: 'CreditableConfirmedDate', label: 'Onay', field: 'CreditableConfirmedDate', align: 'center', sortable: true },
{ name: 'DocCurrencyCode', label: 'PB', field: 'DocCurrencyCode', align: 'center', sortable: true },
{ name: 'OrderNumber', label: 'Sipariş No', field: 'OrderNumber', align: 'left', sortable: true, style: 'min-width:108px;white-space:nowrap', headerStyle: 'min-width:108px;white-space:nowrap' },
{ name: 'OrderDate', label: 'Tarih', field: 'OrderDate', align: 'center', sortable: true, style: 'min-width:82px;white-space:nowrap', headerStyle: 'min-width:82px;white-space:nowrap' },
{ name: 'CurrAccCode', label: 'Cari Kod', field: 'CurrAccCode', align: 'left', sortable: true, style: 'min-width:82px;white-space:nowrap', headerStyle: 'min-width:82px;white-space:nowrap' },
{ name: 'CurrAccDescription', label: 'Cari Adı', field: 'CurrAccDescription', align: 'left', sortable: true, classes: 'ol-col-cari', headerClasses: 'ol-col-cari', style: 'width:160px;max-width:160px', headerStyle: 'width:160px;max-width:160px' },
{ name: 'MusteriTemsilcisi', label: 'Temsilci', field: 'MusteriTemsilcisi', align: 'left', sortable: true, classes: 'ol-col-short', headerClasses: 'ol-col-short', style: 'width:88px;max-width:88px', headerStyle: 'width:88px;max-width:88px' },
{ name: 'Piyasa', label: 'Piyasa', field: 'Piyasa', align: 'left', sortable: true, classes: 'ol-col-short', headerClasses: 'ol-col-short', style: 'width:72px;max-width:72px', headerStyle: 'width:72px;max-width:72px' },
{ name: 'CreditableConfirmedDate', label: 'Onay', field: 'CreditableConfirmedDate', align: 'center', sortable: true, style: 'min-width:86px;white-space:nowrap', headerStyle: 'min-width:86px;white-space:nowrap' },
{ name: 'DocCurrencyCode', label: 'PB', field: 'DocCurrencyCode', align: 'center', sortable: true, style: 'min-width:46px;white-space:nowrap', headerStyle: 'min-width:46px;white-space:nowrap' },
{
name: 'TotalAmount',
label: 'Tutar',
field: 'TotalAmount',
align: 'right',
sortable: true,
format: (val, row) =>
Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) +
' ' + row.DocCurrencyCode
style: 'min-width:120px;white-space:nowrap',
headerStyle: 'min-width:120px;white-space:nowrap',
format: (val, row) => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' ' + row.DocCurrencyCode
},
{
name: 'TotalAmountUSD',
label: 'Tutar (USD)',
field: 'TotalAmountUSD',
align: 'right',
sortable: true,
format: val =>
Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' USD'
style: 'min-width:120px;white-space:nowrap',
headerStyle: 'min-width:120px;white-space:nowrap',
format: val => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' USD'
},
{ name: 'IsCreditableConfirmed', label: 'Durum', field: 'IsCreditableConfirmed', align: 'center', sortable: true },
{
name: 'Description',
label: 'Açıklama',
field: 'Description',
align: 'left',
sortable: false,
classes: 'ol-col-desc',
headerClasses: 'ol-col-desc',
style: 'max-width:220px'
name: 'PackedAmount',
label: 'Paketlenen',
field: 'PackedAmount',
align: 'right',
sortable: true,
style: 'min-width:120px;white-space:nowrap',
headerStyle: 'min-width:120px;white-space:nowrap',
format: (val, row) => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' ' + row.DocCurrencyCode
},
{
name: 'PackedUSD',
label: 'Paketlenen (USD)',
field: 'PackedUSD',
align: 'right',
sortable: true,
style: 'min-width:120px;white-space:nowrap',
headerStyle: 'min-width:120px;white-space:nowrap',
format: val => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' USD'
},
{
name: 'PackedRatePct',
label: 'Paketlenme %',
field: 'PackedRatePct',
align: 'right',
sortable: true,
classes: 'ol-pack-rate-cell',
headerClasses: 'ol-pack-rate-cell',
style: 'min-width:96px;white-space:nowrap',
headerStyle: 'min-width:96px;white-space:nowrap',
format: val => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' %'
},
{ name: 'IsCreditableConfirmed', label: 'Durum', field: 'IsCreditableConfirmed', align: 'center', sortable: true },
{ name: 'Description', label: 'Açıklama', field: 'Description', align: 'left', sortable: false, classes: 'ol-col-desc', headerClasses: 'ol-col-desc', style: 'width:160px;max-width:160px', headerStyle: 'width:160px;max-width:160px' },
{ name: 'pdf', label: 'PDF', field: 'pdf', align: 'center', sortable: false }
]
/* =========================
ACTIONS
========================= */
function selectOrder (row) {
if (!row?.OrderHeaderID) {
$q.notify({ type: 'warning', message: 'OrderHeaderID bulunamadı' })
@@ -397,12 +414,151 @@ function clearFilters () {
})
}
/* =========================
INIT LOAD
========================= */
onMounted(() => {
store.fetchOrders()
})
</script>
<style scoped>
.ol-page {
padding: 10px;
}
.ol-filter-bar {
margin-bottom: 8px;
}
.ol-filter-row {
display: flex;
flex-wrap: nowrap;
gap: 10px;
align-items: center;
}
.ol-filter-input {
min-width: 118px;
width: 136px;
flex: 0 0 136px;
}
.ol-search {
min-width: 240px;
max-width: 420px;
flex: 1 1 360px;
}
.ol-filter-actions {
display: flex;
gap: 8px;
flex-wrap: nowrap;
flex: 0 0 auto;
}
.ol-filter-total {
margin-left: auto;
display: flex;
flex-direction: column;
align-items: flex-end;
justify-content: center;
gap: 2px;
min-width: 250px;
line-height: 1.2;
flex: 0 0 auto;
align-self: center;
}
.ol-total-line {
display: flex;
align-items: baseline;
gap: 8px;
white-space: nowrap;
}
.ol-total-label {
font-size: 12px;
color: #4b5563;
}
.ol-total-value {
font-size: 13px;
}
.ol-table :deep(.q-table thead th) {
font-size: 11px;
padding: 4px 6px;
white-space: nowrap;
}
.ol-table :deep(.q-table tbody td) {
font-size: 11px;
padding: 3px 6px;
}
.ol-col-multiline {
display: block;
white-space: normal !important;
word-break: break-word;
line-height: 1.15;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
max-height: 2.35em;
}
.ol-col-cari {
max-width: 160px;
}
.ol-col-short {
max-width: 88px;
}
.ol-col-desc {
max-width: 160px;
}
.ol-pack-rate-cell {
font-weight: 700;
}
.pack-rate-danger {
color: #c62828;
}
.pack-rate-warn {
color: #8a6d00;
}
.pack-rate-ok {
color: #1f7a4f;
}
@media (max-width: 1440px) {
.ol-filter-row {
flex-wrap: wrap;
align-items: flex-start;
}
.ol-filter-actions {
flex-wrap: wrap;
}
.ol-filter-input {
flex: 1 1 140px;
}
.ol-filter-total {
min-width: 100%;
margin-left: 0;
align-items: flex-start;
margin-top: 6px;
}
.ol-total-line {
width: 100%;
justify-content: space-between;
}
}
</style>

46
ui/src/pages/RoleDepartmentPermissionPage.vue
View File

@@ -68,6 +68,13 @@
Rol + Departman Yetkilendirme
</div>
<q-btn
flat
icon="list"
label="Liste"
@click="goList"
/>
<q-btn
v-if="canUpdateUser"
color="primary"
@@ -178,12 +185,15 @@
<script setup>
import { ref, onMounted, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { Notify } from 'quasar'
import api from 'src/services/api'
import { usePermission } from 'src/composables/usePermission'
const { canUpdate } = usePermission()
const canUpdateUser = canUpdate('user')
const route = useRoute()
const router = useRouter()
/* ================= STATE ================= */
@@ -237,6 +247,27 @@ const columns = [
let matrixLoading = false
function goList () {
router.push({ name: 'role-dept-permissions-list' })
}
function applyRouteSelection () {
const qRole = String(route.query.roleId || '').trim()
const qDept = String(route.query.deptCode || '').trim()
if (/^\d+$/.test(qRole) && Number(qRole) > 0) {
roleId.value = qRole
}
if (qDept) {
deptCode.value = qDept
}
if (roleId.value && deptCode.value) {
loadMatrix()
}
}
/* ================= LOOKUPS ================= */
@@ -425,14 +456,19 @@ function toggleColumn (key, val) {
/* ================= INIT ================= */
onMounted(() => {
loadLookups()
onMounted(async () => {
await loadLookups()
applyRouteSelection()
})
watch(roleId, v => console.log('ROLE_ID >>>', v))
watch(deptCode, v => console.log('DEPT >>>', v))
watch(
() => [route.query.roleId, route.query.deptCode],
() => {
if (!lookupsLoaded.value) return
applyRouteSelection()
}
)
</script>

21
ui/src/router/routes.js
View File

@@ -85,6 +85,20 @@ const routes = [
{
path: 'role-dept-permissions',
name: 'role-dept-permissions',
component: () => import('pages/RoleDepartmentPermissionGateway.vue'),
meta: { permission: 'user:update' }
},
{
path: 'role-dept-permissions/list',
name: 'role-dept-permissions-list',
component: () => import('pages/RoleDepartmentPermissionList.vue'),
meta: { permission: 'user:update' }
},
{
path: 'role-dept-permissions/editor',
name: 'role-dept-permissions-editor',
component: () => import('pages/RoleDepartmentPermissionPage.vue'),
meta: { permission: 'user:update' }
},
@@ -228,6 +242,13 @@ const routes = [
meta: { permission: 'order:view' }
},
{
path: 'order-bulk-close',
name: 'order-bulk-close',
component: () => import('pages/OrderBulkClose.vue'),
meta: { permission: 'order:update' }
},
{
path: 'order-pdf/:id',
name: 'order-pdf',