From 48f886caa893b3aa9c4938fd244d7cb33b9ad0c1 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Mon, 27 Jan 2025 18:01:25 +0700
Subject: [PATCH] refactor: show default remark

---
 .../09_task-order/expansion/RemarkExpansion.vue |  6 ++++++
 src/pages/09_task-order/form.ts                 | 17 +++++++++--------
 src/pages/09_task-order/order_view/MainPage.vue |  3 ++-
 src/pages/11_credit-note/FormPage.vue           |  5 ++++-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/pages/09_task-order/expansion/RemarkExpansion.vue b/src/pages/09_task-order/expansion/RemarkExpansion.vue
index df94d343..275c2b6d 100644
--- a/src/pages/09_task-order/expansion/RemarkExpansion.vue
+++ b/src/pages/09_task-order/expansion/RemarkExpansion.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { MainButton } from 'src/components/button';
 
 const props = defineProps<{
+  defaultRemark?: string;
   readonly?: boolean;
   itemsDiscount?: {
     productId: string;
@@ -115,6 +116,11 @@ const getToolbarConfig = computed(() => {
           </div>
         </template>
       </q-editor>
+
+      <p class="app-text-muted" v-if="!readonly">
+        {{ $t('general.hintRemark') }}
+        <code v-html="defaultRemark" />
+      </p>
     </main>
   </q-expansion-item>
 </template>
diff --git a/src/pages/09_task-order/form.ts b/src/pages/09_task-order/form.ts
index a9d97ce5..81ed3255 100644
--- a/src/pages/09_task-order/form.ts
+++ b/src/pages/09_task-order/form.ts
@@ -15,17 +15,18 @@ import { RequestWork } from 'src/stores/request-list';
 // NOTE: Import stores
 import { useTaskOrderStore } from 'src/stores/task-order';
 
+export const DEFAULT_DATA: TaskOrderPayload = {
+  taskList: [],
+  institutionId: '',
+  contactTel: '',
+  contactName: '',
+  taskName: '',
+  remark: '#[order-detail]',
+};
+
 export const useTaskOrderForm = defineStore('task-order-form', () => {
   const { t } = useI18n();
   const taskOrderStore = useTaskOrderStore();
-  const DEFAULT_DATA: TaskOrderPayload = {
-    taskList: [],
-    institutionId: '',
-    contactTel: '',
-    contactName: '',
-    taskName: '',
-    remark: '#[order-detail]',
-  };
 
   const state = ref<{
     mode: null | 'info' | 'create' | 'edit';
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 9e419a90..217f3bf8 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -28,7 +28,7 @@ import FailRemarkDialog from '../receive_view/FailRemarkDialog.vue';
 import SelectReadyRequestWork from '../SelectReadyRequestWork.vue';
 import { dialogWarningClose } from 'stores/utils';
 import useOptionStore from 'src/stores/options';
-import { useTaskOrderForm } from '../form';
+import { useTaskOrderForm, DEFAULT_DATA } from '../form';
 import { useTaskOrderStore } from 'src/stores/task-order';
 import { dateFormatJS, dateFormat } from 'src/utils/datetime';
 import { initLang, initTheme } from 'src/utils/ui';
@@ -982,6 +982,7 @@ watch(
             :readonly="!['create', 'edit'].includes(state.mode || '')"
             :items="taskListGroup"
             :items-discount="taskProduct"
+            :default-remark="DEFAULT_DATA.remark"
           />
 
           <template
diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue
index 98e08ac7..b9163ed7 100644
--- a/src/pages/11_credit-note/FormPage.vue
+++ b/src/pages/11_credit-note/FormPage.vue
@@ -87,6 +87,8 @@ const pageState = reactive({
   fileDialog: false,
 });
 
+const defaultRemark = '#[quotation-labor]<br/><br/>#[quotation-payment]';
+
 const formData = ref<CreditNotePayload>({
   quotationId: '',
   requestWorkId: [],
@@ -96,7 +98,7 @@ const formData = ref<CreditNotePayload>({
   paybackBank: '',
   paybackAccount: '',
   paybackAccountName: '',
-  remark: '#[quotation-labor]<br/><br/>#[quotation-payment]',
+  remark: defaultRemark,
 });
 
 const formTaskList = ref<
@@ -752,6 +754,7 @@ onMounted(async () => {
             v-if="view !== CreditNoteStatus.Success"
             :readonly="readonly"
             v-model:remark="formData.remark"
+            :default-remark="defaultRemark"
           />
 
           <QuotationFormReceipt