update workflow

src/components/Workflow/DialogSelectPerson.vue

@@ -38,28 +38,19 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "position",
+    name: "posExecutiveName",
     align: "left",
-    label: "ตำแหน่งในสายงาน",
+    label: "ตำแหน่งทางการบริหาร",
     sortable: true,
-    field: "position",
+    field: "posExecutiveName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  // {
-  //   name: "posType",
-  //   align: "left",
-  //   label: "ประเภทตำแหน่ง",
-  //   sortable: true,
-  //   field: "posType",
-  //   headerStyle: "font-size: 14px",
-  //   style: "font-size: 14px",
-  // },
   {
-    name: "organization",
+    name: "actFullName",
     align: "left",
-    label: "สังกัด",
-    field: "organization",
+    label: "รักษาการ",
+    field: "actFullName",
     sortable: true,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -218,7 +209,11 @@ watch(modal, (val) => {
 
         <q-card-actions align="right">
           <q-btn
-            label="ส่งไปยังผู้บังคับบัญชา/ผู้มีอำนาจ"
+            :label="
+              props.type === 'operate'
+                ? 'ส่งไปยังผู้บังคับบัญชา'
+                : 'ส่งไปยังผู้มีอำนาจ'
+            "
             color="public"
             type="submit"
             :disable="

src/components/Workflow/Main.vue

@@ -22,6 +22,12 @@ const isCheckData = defineModel<boolean>("isCheckData", {
 const props = defineProps({
   id: { type: String, require: true },
   sysName: { type: String, require: true },
+  onUpdateStatus: {
+    type: Function,
+    defult: () => {
+      console.log("No Function");
+    },
+  },
 });
 
 const stateId = ref<string>(""); //id state ปัจุบัน
@@ -36,6 +42,7 @@ const permission = ref<Permission>({
   isUpdate: false, //แก้ไขเอกสารได้
   isDelete: false, //ลบเอกสารได้ (ถ้ามี)
   isCancel: false, //ลบเอกสารได้ (ถ้ามี)
+  isSign: false,
 });
 const itemState = ref<DataListState[]>([]);
 
@@ -68,6 +75,7 @@ async function fetchCheckState() {
         isUpdate: data.can_update,
         isDelete: data.can_delete,
         isCancel: data.can_cancel,
+        isSign: data.can_sign,
       };
     })
     .catch(() => {
@@ -100,6 +108,12 @@ function onChangeState() {
       })
       .then(async () => {
         await fetchCheckState();
+        if (
+          props.sysName === "PLACEMENT_TRANSFER" &&
+          state.value === itemState.value.length - 1
+        ) {
+          props.onUpdateStatus?.();
+        }
       })
       .catch((err) => {
         messageError($q, err);
@@ -212,23 +226,21 @@ defineExpose({
                 </q-list>
               </div>
 
-              <div
-                v-if="permission.isOperate && state === index + 1"
-                class="row q-gutter-x-sm"
-              >
+              <div v-if="state === index + 1" class="row q-gutter-x-sm">
                 <q-btn
+                  v-if="permission.isOperate"
                   @click.prevent="
                     (modalSelectPerson = true), (typeSelectPerson = 'operate')
                   "
-                  label="ส่งไปผู้บังคับบัญชา"
+                  label="ส่งยังไปผู้บังคับบัญชา"
                   color="public"
                 />
-
                 <q-btn
+                  v-if="permission.isSign"
                   @click.prevent="
                     (modalSelectPerson = true), (typeSelectPerson = 'sign')
                   "
-                  label="ผู้มีอำนาจ"
+                  label="ส่งไปยังผู้มีอำนาจ"
                   color="public"
                 />
               </div>