diff --git a/src/pages/09_task-order/expansion/receive/InfoMessengerExpansion.vue b/src/pages/09_task-order/expansion/receive/InfoMessengerExpansion.vue
index 262bb99d..f66114fc 100644
--- a/src/pages/09_task-order/expansion/receive/InfoMessengerExpansion.vue
+++ b/src/pages/09_task-order/expansion/receive/InfoMessengerExpansion.vue
@@ -121,6 +121,7 @@ defineProps<{
                       Pending: 'waitReceive',
                       Accept: 'receiveTask',
                       Submit: 'sentTask',
+                      Restart: 'status.Restart',
                     }[status] ?? 'waitReceive'
                   }`,
                 )
@@ -130,6 +131,7 @@ defineProps<{
                   Pending: '--info-bg',
                   Accept: '--info-bg',
                   Submit: '--positive-bg',
+                  Restart: '--negative-bg',
                 }[status] ?? '--info-bg'
               "
             />
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index bc95fe77..83c365f0 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -978,12 +978,21 @@ watch([currentFormData.value.taskStatus], () => {
                         >
                           <template #append="{ props: subProps }">
                             <TaskStatusComponent
+                              :key="subProps.row.id"
                               :no-action="view !== TaskOrderStatus.Validate"
                               type="order"
                               :readonly="
-                                fullTaskOrder?.userTask.find(
-                                  (l) => l.userId === v.responsibleUser.id,
-                                )?.userTaskStatus !== UserTaskStatus.Submit
+                                (() => {
+                                  const _userStatus =
+                                    fullTaskOrder?.userTask.find(
+                                      (l) => l.userId === v.responsibleUser.id,
+                                    )?.userTaskStatus;
+                                  console.log(_userStatus);
+                                  return (
+                                    _userStatus !== UserTaskStatus.Submit &&
+                                    _userStatus !== UserTaskStatus.Restart
+                                  );
+                                })()
                               "
                               :status="subProps.row.taskStatus"
                               @click-failed="
@@ -1070,7 +1079,14 @@ watch([currentFormData.value.taskStatus], () => {
           <SaveButton
             v-if="state.mode !== 'create' && view === TaskOrderStatus.Validate"
             :disabled="
-              fullTaskOrder?.taskOrderStatus === TaskOrderStatus.Complete
+              !fullTaskOrder?.taskList.some((t) =>
+                [
+                  TaskStatus.Complete,
+                  TaskStatus.Redo,
+                  TaskStatus.Canceled,
+                  TaskStatus.Validate,
+                ].includes(t.taskStatus),
+              ) || fullTaskOrder?.taskOrderStatus === TaskOrderStatus.Complete
             "
             @click="
               dialogWarningClose(t, {
diff --git a/src/stores/task-order/types.ts b/src/stores/task-order/types.ts
index d49db7a7..3ad17425 100644
--- a/src/stores/task-order/types.ts
+++ b/src/stores/task-order/types.ts
@@ -198,6 +198,7 @@ export enum UserTaskStatus {
   Pending = 'Pending',
   Accept = 'Accept',
   Submit = 'Submit',
+  Restart = 'Restart',
 }
 
 export interface SetTaskStatusPayload {