Merge branch 'nice_dev' into develop

src/modules/10_order/components/step/step02.vue

@@ -75,21 +75,21 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "education",
-    align: "left",
-    label: "วุฒิการศึกษาในการออกคำสั่ง",
-    field: "education",
-    sortable: true,
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
+  // {
+  //   name: "education",
+  //   align: "left",
+  //   label: "วุฒิการศึกษาในการออกคำสั่ง",
+  //   field: "education",
+  //   sortable: true,
+  //   sort: (a: string, b: string) =>
+  //     a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  // },
 ]);
 const rows = ref<ResponseData[]>([]);
 const rows2 = ref<ResponseData[]>([]);
@@ -168,7 +168,7 @@ const statuscode = computed(() => {
     orderTypeCode.value === "c-pm-08" ||
     orderTypeCode.value === "c-pm-09" ||
     orderTypeCode.value === "c-pm-14" ||
-    orderTypeCode.value === "c-pm-21" || 
+    orderTypeCode.value === "c-pm-21" ||
     orderTypeCode.value === "c-pm-22"
   ) {
     return false;
@@ -515,7 +515,6 @@ const pagination = ref({
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
-
             <q-th auto-width />
             <q-th auto-width />
             <q-th auto-width />