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(() => {
+
+
+ {{ $t('general.hintRemark') }}
+
+
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"
/>
({
quotationId: '',
requestWorkId: [],
@@ -96,7 +98,7 @@ const formData = ref({
paybackBank: '',
paybackAccount: '',
paybackAccountName: '',
- remark: '#[quotation-labor]
#[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"
/>