diff --git a/src/modules/05_command/views/lists.vue b/src/modules/05_command/views/lists.vue
index 8e122c00..df65fec8 100644
--- a/src/modules/05_command/views/lists.vue
+++ b/src/modules/05_command/views/lists.vue
@@ -33,17 +33,6 @@ const childTemplateDetailRef = ref<InstanceType<typeof TemplateDetail> | null>(
 const childPageOrderRef = ref<InstanceType<typeof PageOrder> | null>(null); //ref components คำสั่ง
 
 const isActive = ref<boolean>(true); // สถานะของรายการคำสั่ง
-// options สถานะการใช้งาน
-const activeOptions = ref<ActiveOptions[]>([
-  {
-    value: true,
-    label: "Active",
-  },
-  {
-    value: false,
-    label: "InActive",
-  },
-]);
 
 // Tabs
 const tabs = ref<Tabs[]>([
@@ -295,11 +284,10 @@ onMounted(async () => {
           <q-space />
           <div class="col-12 col-md-6 q-py-sm">
             <div class="row items-center no-wrap justify-end">
-              <q-badge
-                outline
-                :color="`${isActive ? `primary` : `orange`}`"
-                :label="`${isActive ? `Active` : `InActive`}`"
-              />
+              <q-label
+                :class="`${isActive ? `text-primary` : `text-orange`}`"
+                >{{ `${isActive ? `ใช้งาน` : `ไม่ใช้งาน`}` }}</q-label
+              >
               <label :class="`q-ml-lg toggle-control`">
                 <input type="checkbox" v-model="isActive" />
                 <span class="control"></span>
diff --git a/src/modules/05_command/views/salaryLists.vue b/src/modules/05_command/views/salaryLists.vue
index b2182c5a..a3ce58bc 100644
--- a/src/modules/05_command/views/salaryLists.vue
+++ b/src/modules/05_command/views/salaryLists.vue
@@ -304,11 +304,10 @@ onMounted(() => {
                 <q-space />
 
                 <div class="row items-center no-wrap">
-                  <q-badge
-                    outline
-                    :color="`${isActive ? `primary` : `orange`}`"
-                    :label="`${isActive ? `ใช้` : `ไม่ใช้`}งาน`"
-                  />
+                  <q-label
+                    :class="`${isActive ? `text-primary` : `text-orange`}`"
+                    >{{ `${isActive ? `ใช้งาน` : `ไม่ใช้งาน`}` }}</q-label
+                  >
                   <label :class="`q-ml-lg toggle-control`">
                     <input type="checkbox" v-model="isActive" />
                     <span class="control"></span>