From 9c45a775c36a371b81e143b6496373b7cf56d038 Mon Sep 17 00:00:00 2001
From: Arif Rahman Hakim <new.arifrh199@gmail.com>
Date: Mon, 8 Jul 2024 09:06:10 +0800
Subject: [PATCH] fix: correct import format number

---
 .../contract/FormContractActivityItem.vue     | 21 +++++++------------
 .../contract/FormContractByPartner.vue        |  6 ++++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/components/contract/FormContractActivityItem.vue b/src/components/contract/FormContractActivityItem.vue
index 3b7eb87..3bb0bdb 100644
--- a/src/components/contract/FormContractActivityItem.vue
+++ b/src/components/contract/FormContractActivityItem.vue
@@ -6,7 +6,8 @@
       trigger: 'change',
     }">
       <el-select v-model="props.activity.activityId" placeholder="Pilih Nama Kegiatan" clearable filterable>
-        <el-option v-for="activity in activities" :key="activity._id" :label="activity.name" :value="activity._id" />
+        <el-option v-for="activity in props.activities" :key="activity._id" :label="activity.name"
+          :value="activity._id" />
       </el-select>
     </el-form-item>
     <el-form-item required label="Tanggal Mulai" :prop="getProp('startDate')" :rules="{
@@ -32,15 +33,15 @@
       message: 'Volume perlu terisi',
       trigger: 'blur',
     }">
-      <el-input :formatter="formatNumber" :parser="formatParserNumber" v-model="props.activity.volume"
-        placeholder="Masukkan Volume" />
+      <el-input v-model="props.activity.volume" placeholder="Masukkan Volume" :formatter="formatNumber"
+        :parser="formatParserNumber" />
     </el-form-item>
     <el-form-item required label="Rate" :prop="getProp('rate')" :rules="{
       required: true,
       message: 'Rate perlu terisi',
       trigger: 'blur',
     }">
-      <el-input :formatter="formatNumber" :parser="formatParserNumber" v-model="props.activity.rate"
+      <el-input v-model="props.activity.rate" :formatter="formatNumber" :parser="formatParserNumber"
         placeholder="Masukkan Rate" />
     </el-form-item>
     <template #footer>
@@ -50,24 +51,16 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted } from "vue";
-import { getActivities } from "@/api/activityApi";
-import { formatNumber } from "chart.js/helpers";
-import { formatParserNumber } from "@/utils/currency";
+import { formatParserNumber, formatNumber } from "@/utils/currency";
 
 const props: any = defineProps({
   activity: Object,
   index: Number,
+  activities: Object
 });
 
-const activities = ref<any[]>([]);
-
 const getProp = (key: string) => {
   return `activities[${props.index}].${key}`;
 };
 
-onMounted(async () => {
-  const data = await getActivities();
-  activities.value = data;
-});
 </script>
diff --git a/src/components/contract/FormContractByPartner.vue b/src/components/contract/FormContractByPartner.vue
index 7d6af3e..0a705aa 100644
--- a/src/components/contract/FormContractByPartner.vue
+++ b/src/components/contract/FormContractByPartner.vue
@@ -27,8 +27,8 @@
         </div>
       </template>
       <div style="display: flex; flex-wrap: wrap; gap: 20px">
-        <FormContractActivityItem v-for="(activity, index) in form.activities" :key="index" :index="index"
-          :activity="activity" @remove="removeActivity(index)" />
+        <FormContractActivityItem :activities="activities" v-for="(activity, index) in form.activities" :key="index"
+          :index="index" :activity="activity" @remove="removeActivity(index)" />
       </div>
 
       <template #footer><el-button @click="addActivity">Tambah Kegiatan</el-button>
@@ -87,6 +87,7 @@ const initialState = {
 };
 
 const partners = ref<any[]>([]);
+const activities = ref<any[]>([]);
 const loading = ref(false);
 const form = reactive({ ...initialState });
 
@@ -170,5 +171,6 @@ const showNotification = async (title: string, message: string, type: string) =>
 
 onMounted(async () => {
   partners.value = await getPartners();
+  activities.value = await getPartners();
 });
 </script>