Преглед изворни кода

fix: corrige cep e adiciona unidade

ebagabee пре 2 недеља
родитељ
комит
2f1dd85993

+ 2 - 2
src/components/defaults/DefaultCepInput.vue

@@ -3,7 +3,7 @@
     v-model="model"
     v-bind="$attrs"
     debounce="500"
-    :class="disable ?? 'no-pointer-events'"
+
     :label
     :mask="masks.Brasil.cep"
     :loading
@@ -40,7 +40,7 @@ const emit = defineEmits([
   "cepData",
 ]);
 
-const loading = ref(true);
+const loading = ref(false);
 
 watch(
   () => model.value,

+ 36 - 53
src/pages/franchisee/FranchiseePage.vue

@@ -2,35 +2,16 @@
   <div>
     <DefaultHeaderPage title="Franqueados" show-filter-icon />
 
-    <div class="row q-col-gutter-x-md q-pa-sm">
-      <q-select
-        v-model="unitSelected"
-        label="Selecione a Unidade"
-        class="col-3"
-        color="secondary"
-        emit-value
-        map-options
-        :options="unitOptions"
-      />
-
-      <q-select
-        v-model="statusSelected"
-        color="secondary"
-        label="Selecione o status"
-        class="col-3"
-        emit-value
-        map-options
-        :options="statusOptions"
-      />
-    </div>
-
     <div class="q-px-sm">
       <DefaultTable
         title="Lista de Unidades"
+        descricao="unidades"
+        :feminino="false"
         :columns
-        :rows
         add-item
-        :api-call="getFranchisee"
+        open-item
+        open-item-route="UnitEditPage"
+        :api-call="getUnits"
         add-item-route="UnitAddPage"
       />
     </div>
@@ -38,44 +19,54 @@
 </template>
 
 <script setup>
-import { getFranchisee } from "src/api/franchisee";
+import { getUnits } from "src/api/unit";
 import DefaultTable from "src/components/defaults/DefaultTable.vue";
 import DefaultHeaderPage from "src/components/layout/DefaultHeaderPage.vue";
 import { ref } from "vue";
 
-const statusSelected = ref(null);
-const unitSelected = ref(null);
-
-const rows = ref([]);
 const columns = ref([
   {
-    name: "responsible",
+    name: "fantasy_name",
+    label: "Unidade",
+    field: "fantasy_name",
+    align: "left",
+    sortable: true,
+  },
+  {
+    name: "name_responsible",
     label: "Responsável",
-    field: "responsible",
+    field: "name_responsible",
     align: "left",
+    sortable: true,
   },
-
   {
-    name: "unit_name",
-    label: "Unidade",
-    field: "unit_name",
+    name: "location",
+    label: "Cidade / Estado",
+    field: (row) =>
+      row.city && row.state
+        ? `${row.city.name} / ${row.state.code}`
+        : "—",
     align: "left",
   },
-
   {
-    name: "created_at",
-    label: "Desde",
-    field: "created_at",
+    name: "phone_number",
+    label: "Telefone",
+    field: "phone_number",
     align: "left",
   },
-
   {
-    name: "status",
-    label: "Status",
-    field: "status",
-    align: "center",
+    name: "email",
+    label: "E-mail",
+    field: "email",
+    align: "left",
+  },
+  {
+    name: "created_at",
+    label: "Cadastrado em",
+    field: "created_at",
+    align: "left",
+    sortable: true,
   },
-
   {
     name: "actions",
     label: "Ações",
@@ -83,12 +74,4 @@ const columns = ref([
     align: "center",
   },
 ]);
-
-const statusOptions = ref([
-  { label: "Todos", value: null },
-  { label: "Ativo", value: "active" },
-  { label: "Inativo", value: "inactive" },
-]);
-
-const unitOptions = ref([{ label: "Todas", value: null }]);
 </script>

+ 1 - 1
src/router/routes/franchisee.route.js

@@ -9,7 +9,7 @@ export default [
         translate: false,
       },
       requireAuth: true,
-      requiredPermission: "config.city",
+      requiredPermission: "dashboard",
       breadcrumbs: [
         {
           name: "DashboardPage",

+ 2 - 2
src/router/routes/unit.route.js

@@ -9,7 +9,7 @@ export default [
         translate: false,
       },
       requireAuth: true,
-      requiredPermission: "unit,add",
+      requiredPermission: "unit",
       breadcrumbs: [
         {
           name: "FranchiseePage",
@@ -32,7 +32,7 @@ export default [
         translate: false,
       },
       requireAuth: true,
-      requiredPermission: "unit,edit",
+      requiredPermission: "unit",
       breadcrumbs: [
         {
           name: "FranchiseePage",