Merge remote-tracking branch 'origin/master'

ui/src/pages/ProductionProductCostingDefaultQuantities.vue

@@ -1,6 +1,6 @@
 <template>
-  <q-page class="q-pa-md">
-    <div class="sticky-stack">
+  <q-page class="pcdq-page q-pa-md">
+    <div class="pcdq-top sticky-top">
       <div class="save-toolbar">
         <div class="row items-center justify-between q-col-gutter-sm">
           <div class="col-auto text-weight-bold">Maliyet Varsayilan Miktarlar</div>
@@ -52,17 +52,20 @@
       {{ error }}
     </q-banner>
 
-    <q-table
-      flat
-      bordered
-      dense
-      row-key="nHammaddeTuruNo"
-      :rows="rows"
-      :columns="columns"
-      :loading="loading"
-      :rows-per-page-options="[0]"
-      hide-bottom
-    >
+    <div class="pcdq-table-wrap">
+      <q-table
+        class="pcdq-table"
+        flat
+        bordered
+        dense
+        row-key="nHammaddeTuruNo"
+        :rows="rows"
+        :columns="columns"
+        :loading="loading"
+        :rows-per-page-options="[0]"
+        hide-bottom
+        sticky-header
+      >
         <template #body-cell-actions="props">
           <q-td :props="props">
             <q-btn
@@ -89,15 +92,8 @@
             />
           </q-td>
         </template>
-        <template #body-cell-bAktif="props">
-          <q-td :props="props">
-            <q-toggle
-              :model-value="Boolean(props.row.bAktif)"
-              @update:model-value="val => onEditActive(props.row, val)"
-            />
-          </q-td>
-        </template>
-    </q-table>
+      </q-table>
+    </div>
   </q-page>
 </template>
 
@@ -120,7 +116,6 @@ const columns = [
   { name: 'sAciklama', label: 'Aciklama', field: 'sAciklama', align: 'left', sortable: true },
   { name: 'lDefaultMiktar', label: 'Varsayilan Miktar', field: 'lDefaultMiktar', align: 'right', sortable: true },
   { name: 'dteCalcTarihi', label: 'Hesap Tarihi', field: 'dteCalcTarihi', align: 'left', sortable: true },
-  { name: 'bAktif', label: 'Aktif', field: 'bAktif', align: 'center', sortable: true },
   { name: 'actions', label: '', field: '__actions', align: 'right', sortable: false }
 ]
 
@@ -145,13 +140,6 @@ function onEditQty (row, val) {
   row.lDefaultMiktar = qty
 }
 
-function onEditActive (row, val) {
-  const no = Number(row?.nHammaddeTuruNo || 0)
-  if (!(no > 0)) return
-  store.setDraft(no, { bAktif: Boolean(val) })
-  row.bAktif = Boolean(val)
-}
-
 async function onCalcAvg (row) {
   const no = Number(row?.nHammaddeTuruNo || 0)
   if (!(no > 0)) return
@@ -204,7 +192,7 @@ function ensureBeforeUnloadGuard (enabled) {
   }
 }
 
-watch(hasUnsavedChanges, (v) => ensureBeforeUnloadGuard(Boolean(v)))
+watch(() => Boolean(hasUnsavedChanges.value), (v) => ensureBeforeUnloadGuard(Boolean(v)))
 
 onBeforeRouteLeave((to, from, next) => {
   if (!hasUnsavedChanges.value) return next()
@@ -225,11 +213,62 @@ onUnmounted(() => {
 </script>
 
 <style scoped>
-.sticky-stack {
+.pcdq-page {
+  background: #fafafa;
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 56px);
+  min-height: 0;
+  overflow: hidden;
+  padding-top: 10px;
+}
+
+.sticky-top {
+  flex: 0 0 auto;
+  z-index: 10;
+  background: #fafafa;
+}
+
+.pcdq-top {
+  flex: 0 0 auto;
+}
+
+.pcdq-table-wrap {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.pcdq-table {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 auto;
+  min-height: 0;
+}
+
+.pcdq-table :deep(.q-table__container) {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.pcdq-table :deep(.q-table__middle) {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow: auto !important;
+}
+
+.pcdq-table :deep(.q-table thead th) {
+  background: #f0f0f0;
+}
+
+.pcdq-table :deep(.q-table__middle thead tr th) {
   position: sticky;
-  top: var(--header-h);
-  z-index: 100;
-  background: #fff;
-  padding-top: 8px;
+  top: 0;
+  z-index: 10;
 }
 </style>