Merge branch 'develop' into devTee

src/modules/18_command/components/Step/Dialog2_Salary.vue

@@ -52,7 +52,16 @@ const chechCommandCode = computed(() => {
     "C-PM-02",
     "C-PM-03",
     "C-PM-04",
+    "C-PM-05",
+    "C-PM-07",
+    "C-PM-08",
+    "C-PM-09",
+    "C-PM-21",
+    "C-PM-22",
+    "C-PM-24",
     "C-PM-29",
+    "C-PM-38",
+    "C-PM-39",
   ];
   if (listCommandCode.includes(props.commandCode)) {
     return true;

src/modules/19_condition/view/Main.vue

@@ -100,7 +100,7 @@ const columns = ref<QTableProps["columns"]>([
   },
   {
     name: "isCondition",
-    align: "left",
+    align: "center",
     label: "ตำแหน่งติดเงื่อนไข",
     sortable: false,
     field: "isCondition",