diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 008b91ff..bc95fe77 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -1067,20 +1067,25 @@ watch([currentFormData.value.taskStatus], () => {
               solid
             />
           </template>
-
           <SaveButton
             v-if="state.mode !== 'create' && view === TaskOrderStatus.Validate"
             :disabled="
-              !fullTaskOrder?.taskList.some(
-                (t) =>
-                  t.taskStatus === TaskStatus.Complete ||
-                  t.taskStatus === TaskStatus.Redo ||
-                  t.taskStatus === TaskStatus.Canceled,
-              ) || fullTaskOrder.taskOrderStatus === TaskOrderStatus.Complete
+              fullTaskOrder?.taskOrderStatus === TaskOrderStatus.Complete
             "
             @click="
               dialogWarningClose(t, {
-                message: t('dialog.message.confirmValidate'),
+                message: $t(
+                  `${
+                    fullTaskOrder?.taskList.some(
+                      (t) =>
+                        t.taskStatus === TaskStatus.Pending ||
+                        t.taskStatus === TaskStatus.InProgress ||
+                        t.taskStatus === TaskStatus.Restart,
+                    )
+                      ? 'dialog.message.confirmEndWorkWarning'
+                      : 'dialog.message.confirmEndWork'
+                  }`,
+                ),
                 actionText: $t('dialog.action.ok'),
                 action: async () => {
                   await completeValidate();
@@ -1088,7 +1093,7 @@ watch([currentFormData.value.taskStatus], () => {
                 cancel: () => {},
               })
             "
-            :label="$t('taskOrder.confirmValidate')"
+            :label="$t('taskOrder.confirmEndWork')"
             icon="mdi-check"
             solid
           ></SaveButton>