From cf67ed3d47896b1ed0b235f7a6a6fd5d1a8b4b0b Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:08:49 +0700
Subject: [PATCH] feat: product receive code
---
src/pages/09_task-order/TableTaskOrder.vue | 7 ++++++-
src/pages/09_task-order/document_view/MainPage.vue | 2 +-
src/pages/09_task-order/order_view/MainPage.vue | 7 ++++++-
src/stores/task-order/types.ts | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/pages/09_task-order/TableTaskOrder.vue b/src/pages/09_task-order/TableTaskOrder.vue
index 3fdd03a9..44fa01e7 100644
--- a/src/pages/09_task-order/TableTaskOrder.vue
+++ b/src/pages/09_task-order/TableTaskOrder.vue
@@ -160,7 +160,12 @@ const emit = defineEmits<{
- {{ props.row.code || '-' }}
+ {{
+ (props.row.taskOrderStatus === TaskOrderStatus.Complete &&
+ props.row.codeProductReceived
+ ? props.row.codeProductReceived
+ : props.row.code) || '-'
+ }}
diff --git a/src/pages/09_task-order/document_view/MainPage.vue b/src/pages/09_task-order/document_view/MainPage.vue
index 3a8ddc6f..b631dbb1 100644
--- a/src/pages/09_task-order/document_view/MainPage.vue
+++ b/src/pages/09_task-order/document_view/MainPage.vue
@@ -294,7 +294,7 @@ function closeAble() {
:branch="branch"
:institution="data.institution"
:details="{
- code: data.code,
+ code: data.codeProductReceived ?? data.code,
name: data.taskName,
contactName: data.contactName,
contactTel: data.contactTel,
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index f123ca74..8d459fc8 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -917,9 +917,14 @@ watch(
v-model:registered-branch-id="currentFormData.registeredBranchId"
v-model:institution-id="currentFormData.institutionId"
v-model:task-name="currentFormData.taskName"
- v-model:code="currentFormData.code"
v-model:contact-name="currentFormData.contactName"
v-model:contact-tel="currentFormData.contactTel"
+ :code="
+ view === TaskOrderStatus.Complete &&
+ currentFormData.codeProductReceived
+ ? currentFormData.codeProductReceived
+ : currentFormData.code
+ "
:task-list-group="
taskListGroup.length === 0 && state.mode === 'create'
"
diff --git a/src/stores/task-order/types.ts b/src/stores/task-order/types.ts
index 9e709745..8bac1f86 100644
--- a/src/stores/task-order/types.ts
+++ b/src/stores/task-order/types.ts
@@ -53,6 +53,7 @@ export interface TaskOrder {
contactName: string;
taskOrderStatus: TaskOrderStatus;
taskName: string;
+ codeProductReceived?: string;
code: string;
id: string;
userTask: UserTask[];
@@ -179,6 +180,7 @@ export interface TaskOrderPayload {
registeredBranchId?: string;
id?: string;
code?: string;
+ codeProductReceived?: string;
remark?: string;
}