fix: solve conflict

app/components/app/equipment/entry-form.vue

@@ -1,10 +1,15 @@
 <script setup lang="ts">
-// helpers
-import { toTypedSchema } from '@vee-validate/zod'
-import { useForm } from 'vee-validate'
 // types
 import type z from 'zod'
 import type { MaterialFormData } from '~/schemas/material'
+<<<<<<< HEAD:app/components/app/equipment/entry-form.vue
+=======
+// helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+// components
+import Label from '~/components/pub/custom-ui/form/label.vue'
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/components/app/material/entry-form.vue
 
 interface Props {
   schema: z.ZodSchema<any>
@@ -94,9 +99,9 @@ function onCancelForm() {
       <label for="uom">Satuan</label>
       <Select
         id="uom"
+        v-model="uom"
         icon-name="i-lucide-chevron-down"
         placeholder="Pilih satuan"
-        v-model="uom"
         v-bind="uomAttrs"
         :items="uoms"
         :disabled="isLoading"
@@ -110,9 +115,9 @@ function onCancelForm() {
       <label for="item">Item</label>
       <Select
         id="item"
+        v-model="item"
         icon-name="i-lucide-chevron-down"
         placeholder="Pilih item"
-        v-model="item"
         v-bind="itemAttrs"
         :items="items"
         :disabled="isLoading"
@@ -126,8 +131,8 @@ function onCancelForm() {
       <label for="stock">Stok</label>
       <Input
         id="stock"
-        type="number"
         v-model="stock"
+        type="number"
         v-bind="stockAttrs"
         :disabled="isLoading"
         :class="{ 'border-red-500': errors.stock }"

app/components/app/equipment/list-cfg.ts

@@ -3,7 +3,6 @@ import type {
   KeyLabel,
   RecComponent,
   RecStrFuncComponent,
-  RecStrFuncUnknown,
   Th,
 } from '~/components/pub/custom-ui/data/types'
 import { defineAsyncComponent } from 'vue'