瀏覽代碼

feat: add nome da unidade (name)

Gustavo Mantovani 1 周之前
父節點
當前提交
26af09e227

+ 1 - 0
src/helpers/utils.js

@@ -115,6 +115,7 @@ const normalizeUnitName = (value) => {
 };
 };
 
 
 const formatUnitName = (unit, fallback = "—") =>
 const formatUnitName = (unit, fallback = "—") =>
+  normalizeUnitName(unit?.name) ||
   normalizeUnitName(unit?.fantasy_name) ||
   normalizeUnitName(unit?.fantasy_name) ||
   normalizeUnitName(unit?.social_reason) ||
   normalizeUnitName(unit?.social_reason) ||
   fallback;
   fallback;

+ 1 - 1
src/pages/franchisee/FranchiseePage.vue

@@ -28,7 +28,7 @@ import { ref } from "vue";
 
 
 const columns = ref([
 const columns = ref([
   {
   {
-    name: "fantasy_name",
+    name: "name",
     label: "Unidade",
     label: "Unidade",
     field: (row) => formatUnitName(row),
     field: (row) => formatUnitName(row),
     align: "left",
     align: "left",

+ 1 - 0
src/pages/packages/components/AddEditPackageDialog.vue

@@ -698,6 +698,7 @@ onMounted(async () => {
 
 
     units.value = allUnits.map((u) => ({
     units.value = allUnits.map((u) => ({
       id: u.id,
       id: u.id,
+      name: u.name,
       fantasy_name: u.fantasy_name,
       fantasy_name: u.fantasy_name,
       social_reason: u.social_reason,
       social_reason: u.social_reason,
       visible: groupLockedIds.has(u.id) ? true : (visibilityMap[u.id] ?? true),
       visible: groupLockedIds.has(u.id) ? true : (visibilityMap[u.id] ?? true),

+ 2 - 1
src/pages/unit/UnitActionPage.vue

@@ -42,7 +42,8 @@ const unitId = computed(() =>
 
 
 const { form, getFormAsFormData, setUpdateFormAsOriginal } =
 const { form, getFormAsFormData, setUpdateFormAsOriginal } =
   useFormUpdateTracker({
   useFormUpdateTracker({
-    fantasy_name: null,
+    name: null,
+    fantasy_name: "",
     social_reason: null,
     social_reason: null,
     cnpj: null,
     cnpj: null,
     state_registration: null,
     state_registration: null,

+ 15 - 1
src/pages/unit/tabs/UnitDataTab.vue

@@ -5,6 +5,14 @@
         <AvatarImageComponent ref="avatarRef" @update:file="onAvatarChange" />
         <AvatarImageComponent ref="avatarRef" @update:file="onAvatarChange" />
 
 
         <div class="row full-width q-mt-md q-col-gutter-sm">
         <div class="row full-width q-mt-md q-col-gutter-sm">
+          <DefaultInput
+            v-model="form.name"
+            label="Nome da Unidade"
+            class="col-12"
+            outlined
+            :rules="[inputRules.required]"
+          />
+
           <DefaultInput
           <DefaultInput
             v-model="form.social_reason"
             v-model="form.social_reason"
             label="Razão Social"
             label="Razão Social"
@@ -213,7 +221,13 @@ onMounted(async () => {
   try {
   try {
     const unit = await getUnit(props.unitId);
     const unit = await getUnit(props.unitId);
 
 
-    form.value.fantasy_name = unit.fantasy_name;
+    form.value.name = unit.name;
+    const fantasyName = String(unit.fantasy_name ?? "").trim();
+    form.value.fantasy_name = ["null", "undefined"].includes(
+      fantasyName.toLowerCase(),
+    )
+      ? ""
+      : fantasyName;
     form.value.social_reason = unit.social_reason;
     form.value.social_reason = unit.social_reason;
     form.value.cnpj = unit.cnpj;
     form.value.cnpj = unit.cnpj;
     form.value.state_registration = unit.state_registration;
     form.value.state_registration = unit.state_registration;