Merge branch 'develop' into feat/issue

* develop:
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix: active act org level 0 only
  add: บันทึกรักษาการในตำแหน่ง (owner only)
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status
  fix: disabled organization view
  fix(indicator-plan):fix nodeDnaId
  fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน)
  fix(timestamp):clear_rowData
  ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น

# Conflicts:
#	src/api/02_organizational/api.organization.ts

src/api/02_organizational/api.organization.ts

@@ -196,4 +196,6 @@ export default {
   orgAssistance: (id: string) => `${orgProfile}/assistance/${id}`,
 
   orgIssues: `${organization}/issues`,
+  // active รักษาการในตำแหน่งตามหน่วยงาน
+  activeActPosition: (id: string) => `${orgPosAct}/${id}`,
 };

src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue

@@ -177,7 +177,7 @@ function updateSelectedAgency(data: any, isUpdate: boolean = false) {
 
 /**function ยืนยันการบันทึกข้อมูล */
 function onSubmit() {
-  if (planData.nodeId == null || planData.strategyId == "") {
+  if (nodeDnaId.value == "" || planData.strategyId == "") {
     dialogMessageNotify(
       $q,
       `กรุณาเลือกหน่วยงาน/ส่วนราชการ หรือ ยุทธศาสตร์/แผน`

src/modules/02_organization/views/main.vue

@@ -397,13 +397,24 @@ onMounted(async () => {
               @click="store.statusView = 'list'"
             />
             <q-separator inset vertical />
+            <!-- รอแก้ไข API -->
+            <!-- <q-btn
+              flat
+              dense
+              icon="mdi-sitemap"
+              :color="store.statusView === 'tree' ? 'grey-7' : 'grey-4'"
+              @click="store.statusView = 'tree'"
+            /> -->
             <q-btn
               flat
               dense
               icon="mdi-sitemap"
               :color="store.statusView === 'tree' ? 'grey-7' : 'grey-4'"
               @click="store.statusView = 'tree'"
-            />
+              disabled
+            >
+              <q-tooltip>อยู่ระหว่างปรับปรุง</q-tooltip>
+            </q-btn>
             <q-separator inset vertical />
             <q-btn
               flat

src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue

@@ -40,6 +40,9 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
+const citizenId = defineModel<string>("citizenId", {
+  required: true,
+});
 
 const baseColumns = ref<QTableColumn[]>([
   {
@@ -614,7 +617,7 @@ onMounted(() => {
                 disable
                 v-model="formData.status"
                 label="ใช้งาน"
-                keep-color="primary"
+                keep-color
               />
             </div>
           </div>
@@ -642,6 +645,7 @@ onMounted(() => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:command-id="commandId"
+    :citizen-id="citizenId"
   />
 </template>
 

src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue

@@ -46,6 +46,9 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
+const citizenId = defineModel<string>("citizenId", {
+  required: true,
+});
 
 const baseColumns = ref<QTableColumn[]>([
   {
@@ -977,6 +980,7 @@ onMounted(() => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:command-id="commandId"
+    :citizen-id="citizenId"
   />
 </template>
 

src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue

@@ -39,6 +39,9 @@ const profileId = ref<string>(
 const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
+const citizenId = defineModel<string>("citizenId", {
+  required: true,
+});
 
 const store = useGovernmentPosDataStore();
 const {
@@ -210,7 +213,7 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "commandCode",
     format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -898,7 +901,11 @@ onMounted(async () => {
 
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
+      v-if="
+        !isLeave &&
+        checkPermission($route)?.attrIsUpdate &&
+        checkPermission($route)?.attrOwnership === 'OWNER'
+      "
       flat
       color="primary"
       round
@@ -972,7 +979,11 @@ onMounted(async () => {
             </q-btn>
 
             <q-btn
-              v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
+              v-if="
+                !isLeave &&
+                checkPermission($route)?.attrIsUpdate &&
+                checkPermission($route)?.attrOwnership === 'OWNER'
+              "
               flat
               :disable="
                 (props.row.commandId !== null && props.row.commandId !== '') ||
@@ -1613,6 +1624,7 @@ onMounted(async () => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:commandId="commandId"
+    :citizen-id="citizenId"
   />
 </template>
 

src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue

@@ -65,13 +65,22 @@ const storeRegistry = useRegistryNewDataStore();
       <PerformSpecialWork :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel v-if="empType != '-employee'" name="5">
-      <ActingPos :is-leave="storeRegistry.isLeave" />
+      <ActingPos
+        :is-leave="storeRegistry.isLeave"
+        :citizen-id="storeRegistry.citizenId"
+      />
     </q-tab-panel>
     <q-tab-panel v-if="empType != '-employee'" name="6">
-      <HelpGovernmentDetail :is-leave="storeRegistry.isLeave" />
+      <HelpGovernmentDetail
+        :is-leave="storeRegistry.isLeave"
+        :citizen-id="storeRegistry.citizenId"
+      />
     </q-tab-panel>
     <q-tab-panel name="7">
-      <Postion :is-leave="storeRegistry.isLeave" />
+      <Postion
+        :is-leave="storeRegistry.isLeave"
+        :citizen-id="storeRegistry.citizenId"
+      />
     </q-tab-panel>
   </q-tab-panels>
 </template>

src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue

@@ -39,6 +39,9 @@ const profileId = ref<string>(
 const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
+const citizenId = defineModel<string>("citizenId", {
+  required: true,
+});
 
 const store = useSalaryDataStore();
 const {
@@ -215,7 +218,7 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "commandCode",
     format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -860,7 +863,11 @@ onMounted(async () => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
+      v-if="
+        !isLeave &&
+        checkPermission($route)?.attrIsUpdate &&
+        checkPermission($route)?.attrOwnership === 'OWNER'
+      "
       flat
       color="primary"
       round
@@ -932,9 +939,12 @@ onMounted(async () => {
             >
               <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
             </q-btn>
-
             <q-btn
-              v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
+              v-if="
+                !isLeave &&
+                checkPermission($route)?.attrIsUpdate &&
+                checkPermission($route)?.attrOwnership === 'OWNER'
+              "
               flat
               :disable="
                 (props.row.commandId !== null && props.row.commandId !== '') ||
@@ -1617,6 +1627,7 @@ onMounted(async () => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:commandId="commandId"
+    :citizen-id="citizenId"
   />
 </template>
 

src/modules/04_registryPerson/components/detail/Salary/Main.vue

@@ -45,7 +45,10 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <PositionSalary :is-leave="storeRegistry.isLeave" />
+      <PositionSalary
+        :is-leave="storeRegistry.isLeave"
+        :citizen-id="storeRegistry.citizenId"
+      />
     </q-tab-panel>
     <q-tab-panel name="2">
       <NotReceiveSalary :is-leave="storeRegistry.isLeave" />

src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue

@@ -553,12 +553,17 @@ onMounted(async () => {
           </q-form>
 
           <div class="col-12">
+            {{ typeEmp }}
+            <!-- v-if="typeEmp != 'employee'" -->
             <Workflow
-              v-if="typeEmp != 'employee'"
               v-model:is-check-data="isCheckData"
               ref="workflowRef"
               :id="requestId"
-              sys-name="REGISTRY_PROFILE"
+              :sys-name="
+                typeEmp !== 'employee'
+                  ? 'REGISTRY_PROFILE'
+                  : 'REGISTRY_PROFILE_EMP'
+              "
             />
           </div>
         </div>

src/modules/04_registryPerson/views/detailView.vue

@@ -695,7 +695,7 @@ function closeImage() {
  * ฟังก์ชันยืนยันการลบรูป
  * @param id  รูปภาพ
  */
-function deletePhoto(id: string) {
+function deletePhoto(id: string, isActive: boolean) {
   dialogRemove(
     $q,
     async () => {
@@ -706,6 +706,10 @@ function deletePhoto(id: string) {
         .delete(config.API.orgProfileAvatarbyType(empType.value) + `/${id}`)
         .then(async () => {
           await getImage();
+          if (isActive) {
+            activeImage.value = null;
+            await fetchDataPersonal();
+          }
         })
         .catch((e) => {
           messageError($q, e);
@@ -821,7 +825,6 @@ onMounted(async () => {
               'SYS_PLACEMENT_OTHER',
               'SYS_TRANSFER_REQ',
               'SYS_RESIGN',
-          
             ])) ||
           leaveType === 'DISCIPLINE_TEMP_SUSPEND' ||
           leaveType === 'RETIRE_RESIGN' ||
@@ -873,7 +876,7 @@ onMounted(async () => {
             'SYS_PROMOTION_EMP',
             'SYS_PASSAWAY',
             'SYS_DISMISS_EMP',
-            'SYS_RESIGN_EMP'
+            'SYS_RESIGN_EMP',
           ])
         "
         size="md"
@@ -1211,18 +1214,21 @@ onMounted(async () => {
                 >
                   {{ date2Thai(n.createdAt) }}
 
+                  <!-- v-if="!n.isActive" -->
                   <q-btn
-                    v-if="!n.isActive"
                     icon="delete"
                     unelevated
                     dense
-                    @click="deletePhoto(n.id)"
+                    @click="deletePhoto(n.id, n.isActive)"
                     class="bg-white"
                     style="color: #ff8080"
                   >
                     <q-tooltip>ลบรูปภาพ</q-tooltip>
                   </q-btn>
                 </div>
+                <div class="absolute-top-right" v-if="n.isActive">
+                  <q-icon name="star" color="yellow" size="24px" />
+                </div>
               </q-img>
             </div>
           </div>
@@ -1230,7 +1236,12 @@ onMounted(async () => {
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn @click="selectAvatarHistory" color="public" label="เลือกรูปภาพ">
+        <q-btn
+          @click="selectAvatarHistory"
+          color="public"
+          label="เลือกรูปภาพ"
+          :disable="images.length == 0"
+        >
           <q-tooltip>เลือกรูปภาพ</q-tooltip>
         </q-btn>
       </q-card-actions>

src/modules/04_registryPerson/views/listView.vue

@@ -745,6 +745,8 @@ onMounted(async () => {
         />
       </div>
     </q-card-section>
+
+    
   </q-card>
 
   <!-- แสดง dialog เลือกหน่วยงาน/ส่วนราชการ -->

src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue

@@ -175,7 +175,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push(`/placement/appoint-employee`)"
       />
-      รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ fullName }}
+      รายละเอียดการปรับระดับชั้นงาน-ย้ายลูกจ้าง {{ fullName }}
     </div>
 
     <CardProfile :data="dataProfile as DataProfile" :type="'employee'" />

src/modules/05_placement/components/PersonalList/Table.vue

@@ -53,6 +53,7 @@ const props = defineProps({
 const modalCommand = ref<boolean>(false);
 const command = ref<string>("");
 const commandId = ref<string>("");
+const commandCitizenId = ref<string>("");
 
 let roleAdmin = ref<boolean>(false);
 const edit = ref<boolean>(true);
@@ -912,9 +913,10 @@ function onSearchAdd() {
 }
 
 function onRefCommand(data: any) {
-  modalCommand.value = true;
   command.value = data.refCommandNo;
   commandId.value = data.commandId;
+  commandCitizenId.value = data.citizenId;
+  modalCommand.value = true;
   // commandId.value = 'bdf9da91-ba45-497a-a2b7-cc49e2446d97'; //จำลอง
 }
 
@@ -1787,6 +1789,7 @@ onMounted(async () => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:commandId="commandId"
+    v-model:citizen-id="commandCitizenId"
   />
 </template>
 

src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue

@@ -130,7 +130,7 @@ async function fectFormfull() {
   evaluate_expenct_level.value = await probationStore.assignOutput.map(
     (e: any) => ({
       id: e.id,
-      labal: e.output_desc,
+      label: e.output_desc,
     })
   );
   evaluate_ouptut.value = await probationStore.assignOutput.map((e: any) => ({

src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue

@@ -122,7 +122,7 @@ const variablesToWatch = [
   competency_level,
   learn_level,
   apply_level,
-  success_level,
+  // success_level,
 ];
 const ArrayCountbotton = [orientation, self_learning, training_seminar];
 
@@ -158,7 +158,7 @@ async function fecthFormdata(id: string) {
       evaluate_expenct_level.value = res.data.result.assign_output.map(
         (e: any) => ({
           id: e.id,
-          labal: e.output_desc,
+          label: e.output_desc,
         })
       );
       evaluate_ouptut.value = res.data.result.assign_output.map((e: any) => ({
@@ -186,7 +186,7 @@ function savaForm() {
     competency_level.value === 0 ||
     learn_level.value === 0 ||
     apply_level.value === 0 ||
-    success_level.value === 0 ||
+    // success_level.value === 0 ||
     achievement_strength_desc.value === "" ||
     lengthconduct.value !== 4 ||
     lengthmoral_level.value !== 3 ||
@@ -260,7 +260,7 @@ function putformData() {
     competency_level: competency_level.value,
     learn_level: learn_level.value,
     apply_level: apply_level.value,
-    success_level: success_level.value,
+    // success_level: success_level.value,
     achievement_other: achievement_other.value,
     achievement_strength_desc: achievement_strength_desc.value,
     achievement_improve_desc: achievement_improve_desc.value,
@@ -809,7 +809,7 @@ onMounted(async () => {
               </q-list>
             </q-card>
 
-            <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
+            <!-- <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
               <q-list dense>
                 <q-item
                   dense
@@ -843,7 +843,7 @@ onMounted(async () => {
                   </q-item-section>
                 </q-item>
               </q-list>
-            </q-card>
+            </q-card> -->
 
             <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
               <q-list dense>
@@ -851,7 +851,7 @@ onMounted(async () => {
                   <q-item-section>
                     <q-item-label>
                       <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
-                      1.8 อื่น ๆ
+                      1.7 อื่น ๆ
                       <q-checkbox
                         class="q-ml-sm"
                         dense

src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue

@@ -130,7 +130,7 @@ const variablesToWatch = [
   competency_level,
   learn_level,
   apply_level,
-  success_level,
+  // success_level,
 ];
 const ArrayCountbotton = [orientation, self_learning, training_seminar];
 
@@ -157,7 +157,7 @@ function savaForm() {
     competency_level.value === 0 ||
     learn_level.value === 0 ||
     apply_level.value === 0 ||
-    success_level.value === 0 ||
+    // success_level.value === 0 ||
     achievement_strength_desc.value === "" ||
     lengthconduct.value !== 4 ||
     lengthmoral_level.value !== 3 ||
@@ -242,7 +242,7 @@ async function fecthFormdata(id: string) {
       evaluate_expenct_level.value = res.data.result.assign_output.map(
         (e: any) => ({
           id: e.id,
-          labal: e.output_desc,
+          label: e.output_desc,
         })
       );
       evaluate_ouptut.value = res.data.result.assign_output.map((e: any) => ({
@@ -267,7 +267,7 @@ function putformData() {
     competency_level: competency_level.value,
     learn_level: learn_level.value,
     apply_level: apply_level.value,
-    success_level: success_level.value,
+    // success_level: success_level.value,
     achievement_other: achievement_other.value,
     achievement_strength_desc: achievement_strength_desc.value,
     achievement_improve_desc: achievement_improve_desc.value,
@@ -814,7 +814,7 @@ onMounted(async () => {
               </q-list>
             </q-card>
 
-            <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
+            <!-- <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
               <q-list dense>
                 <q-item
                   dense
@@ -848,7 +848,7 @@ onMounted(async () => {
                   </q-item-section>
                 </q-item>
               </q-list>
-            </q-card>
+            </q-card> -->
 
             <q-card class="text-top0 col-xs-12 col-sm-11 q-pa-sm q-pl-sm">
               <q-list dense>
@@ -856,7 +856,7 @@ onMounted(async () => {
                   <q-item-section>
                     <q-item-label>
                       <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
-                      1.8 อื่น ๆ
+                      1.7 อื่น ๆ
                       <q-checkbox
                         class="q-ml-sm"
                         dense

src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue

@@ -170,7 +170,7 @@ async function fectFormfull() {
   evaluate_expenct_level.value = await probationStore.assignOutput.map(
     (e: any) => ({
       id: e.id,
-      labal: e.output_desc,
+      label: e.output_desc,
     })
   );
   evaluate_ouptut.value = await probationStore.assignOutput.map((e: any) => ({

src/modules/05_placement/views/07_appointEmployeeMain.vue

@@ -372,7 +372,7 @@ onMounted(async () => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    รายการปรับระดับชั้นงานลูกจ้าง
+    รายการปรับระดับชั้นงาน-ย้ายลูกจ้าง
   </div>
   <q-card flat bordered class="col-12 q-mt-sm">
     <div class="row q-pa-md">

src/modules/09_leave/components/05_Leave/DetailLeavePage.vue

@@ -166,10 +166,10 @@ const commanderList = computed(() => {
 
 // เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
 const approveCheck = computed(() => {
+  const commanders = rows.value?.commanders;
   return (
-    rows.value?.commanders?.every(
+    commanders?.every((commander) => commander.approveStatus === "APPROVE") ??
-      (commander) => commander.approveStatus === "APPROVE"
+    false
-    ) ?? false
   );
 });
 
@@ -1073,7 +1073,8 @@ onMounted(async () => {
                       rows &&
                       rows.approvers[0]?.profileId == keycloakId &&
                       rows.approvers[0]?.approveStatus == 'PENDING' &&
-                      approveCheck
+                      approveCheck &&
+                      statusCheck === 'PENDING'
                     "
                   >
                     <q-btn

src/modules/09_leave/views/04_SpecialTimeMain.vue

@@ -174,6 +174,8 @@ async function fetchData() {
           checkInStatus: store.convertStatus(e.checkInStatus),
           checkOutStatus: store.convertStatus(e.checkOutStatus),
         }));
+      } else {
+        rows.value = [];
       }
     })
     .catch((e) => {

src/modules/13_salary/components/DialogInfoMain.vue

@@ -36,6 +36,7 @@ const props = defineProps({
 const avatar = ref<string>("");
 const fullName = ref<string>("");
 const position = ref<string>("");
+const citizenId = ref<string>("");
 const isLoading = ref<boolean>(true);
 
 /** function เรียกข้อมูลส่วนตัว*/
@@ -48,6 +49,7 @@ function fetchInformation() {
 
       fullName.value = `${data.prefix}${data.firstName} ${data.lastName}`;
       position.value = data.position;
+      citizenId.value = data.citizenId;
 
       if (data.avatarName) {
         await fetchProfile(data.id as string, data.avatarName);
@@ -220,6 +222,7 @@ watch(
                     v-if="type === 'posSalary'"
                     v-model:profileId="profileId"
                     :employeeClass="employeeClass"
+                    :citizenId="citizenId"
                   />
                   <InfoDiscipline
                     v-if="type === 'discipline'"

src/modules/13_salary/components/InfoSalary.vue

@@ -26,6 +26,7 @@ const {
 /** props*/
 const profileId = defineModel<string>("profileId", { required: true });
 const employeeClass = defineModel<string>("employeeClass", { required: true });
+const citizenId = defineModel<string>("citizenId", { required: true });
 
 const modalCommand = ref<boolean>(false);
 const command = ref<string>("");
@@ -470,6 +471,7 @@ onMounted(() => {
     v-model:modal="modalCommand"
     v-model:command="command"
     v-model:commandId="commandId"
+    :citizen-id="citizenId"
   />
 </template>
 

src/modules/17_acting/views/main.vue

@@ -33,7 +33,9 @@ const {
   showLoader,
   hideLoader,
   messageError,
+  success,
   dialogRemove,
+  dialogConfirm,
   onSearchDataTable,
 } = useCounterMixin();
 
@@ -298,6 +300,36 @@ function onSearchListPerson() {
   );
 }
 
+function actActive(id: string, orgName: string) {
+  // confirm dialog active acting
+  dialogConfirm(
+    $q,
+    () => {
+      showLoader();
+      http
+        .post(config.API.activeActPosition(id), {
+          activeId: id,
+        })
+        .then(async () => {
+          success($q, "กำหนดรักษาการในตำแหน่งสำเร็จ");
+          await fetchOrganizationActive();
+          posmasterId.value = "";
+          storeActing.rootId = "";
+          rowPosition.value = [];
+          rowListPerson.value = [];
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
+    `ยืนยันการกำหนดรักษาการในตำแหน่ง`,
+    `คุณต้องการกำหนดรักษาการในตำแหน่งของ${orgName} ใช่หรือไม่?`
+  );
+}
+
 onMounted(async () => {
   try {
     showLoader();
@@ -367,6 +399,19 @@ onMounted(async () => {
                 <div>
                   <div class="text-weight-medium">
                     {{ prop.node.orgTreeName }}
+                    <q-icon
+                      v-if="
+                        prop.node.orgLevel === 0 &&
+                        checkPermission($route)?.attrOwnership == 'OWNER'
+                      "
+                      name="mdi-content-save-edit"
+                      color="blue"
+                      @click.stop="
+                        actActive(prop.node.orgTreeId, prop.node.orgTreeName)
+                      "
+                      size="xs"
+                      ><q-tooltip> บันทึกการกำหนดรักษาการ </q-tooltip></q-icon
+                    >
                   </div>
                   <div class="text-weight-light text-grey-8">
                     {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
@@ -508,7 +553,7 @@ onMounted(async () => {
                                 v-if="props.row.posNo && props.row.isDirector"
                                 name="mdi-star"
                                 color="primary"
-                              ><q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+                                ><q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
                               </q-icon>
                             </div>
                             <div v-else>
@@ -593,7 +638,14 @@ onMounted(async () => {
                         </q-tr>
                       </template>
                       <template v-slot:body="props">
-                        <q-tr :props="props">
+                        <q-tr
+                          :props="props"
+                          :class="
+                            props.row.statusReport === 'DONE'
+                              ? 'text-green'
+                              : ''
+                          "
+                        >
                           <q-td
                             auto-width
                             v-if="

src/modules/18_command/components/DialogPreviewCommand.vue

@@ -19,6 +19,7 @@ const { showLoader, hideLoader, messageError } = useCounterMixin();
 const modal = defineModel<boolean>("modal", { required: true });
 const command = defineModel<string>("command", { required: true });
 const commandId = defineModel<string>("commandId", { required: true });
+const citizenId = defineModel<string>("citizenId", { required: true });
 const promises = ref<any>([]);
 
 const tab = ref<string>("main"); //tab
@@ -37,6 +38,7 @@ function closeDialog() {
   modal.value = false;
   command.value = "";
   commandId.value = "";
+  citizenId.value = "";
 }
 
 /**
@@ -88,13 +90,25 @@ async function downloadCover(type: string) {
  */
 async function fetchDataCommand(type: string) {
   let newType = type === "cover" ? "คำสั่ง" : "แนบท้าย";
+  const pathAPI =
+    type === "cover"
+      ? config.API.fileByFile(
+          "ระบบออกคำสั่ง",
+          newType,
+          commandId.value,
+          newType
+        )
+      : config.API.subFileByFileName(
+          "ระบบออกคำสั่ง",
+          newType,
+          commandId.value,
+          citizenId.value,
+          newType
+        );
   await http
-    .get(
+    .get(pathAPI)
-      config.API.fileByFile("ระบบออกคำสั่ง", newType, commandId.value, newType)
-    )
     .then(async (res) => {
       const data = res.data;
-      console.log(res);
 
       if (type === "cover") {
         dataCover.value = data;

src/modules/18_command/components/Step/0_Main.vue

@@ -43,7 +43,7 @@ async function fetchData() {
           ? "Live"
           : data.isSignature === false
           ? "Digital"
-          : "";
+          : "Live";
       isStatus.value = data.status;
       isDraft.value = data.isDraft;
       isSign.value = data.isSign;
@@ -174,11 +174,12 @@ onMounted(async () => {
 
             <q-item tag="label" v-ripple>
               <q-item-section avatar>
+                <!-- :disable="isSignature !== null || store.readonly" -->
                 <q-radio
                   v-model="signaturetype"
                   val="Digital"
                   color="primary"
-                  :disable="isSignature !== null || store.readonly"
+                  disable
                 />
               </q-item-section>
               <q-item-section>

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted, ref, computed } from "vue";
 import { useQuasar } from "quasar";
 import axios from "axios";
 
@@ -42,12 +42,23 @@ const isAuthority = defineModel<boolean>("isAuthority", { required: true }); //
 const isCheckAuthority = ref<boolean>(false); //เช็ครอผู้มีอำนาจลงนามอนุมัติ
 const isAttachment = defineModel<boolean>("isAttachment", { required: true }); //เช็คบัญชีแนบท้าย
 const fileUploadOrder = ref<any>(null); //ไฟล์คำสั่ง
-const fileUploadTailer = ref<any>(null); //ไฟล์เอกสารแนบท้าย
+// const fileUploadTailer = ref<any>(null); //ไฟล์เอกสารแนบท้าย
 const fileOrder = ref<any>(null); //ไฟล์คำสั่ง
-const fileTailer = ref<any>(null); //ไฟล์เอกสารแนบท้าย
+// const fileTailer = ref<any>(null); //ไฟล์เอกสารแนบท้าย
 
 const isLoad = ref<boolean>(true); //แสดงโหลด
 const modalPerView = ref<boolean>(false);
+// สมมติว่ามีรายชื่อ
+const attachmentList = ref<any[]>([]);
+const attachmentFiles = ref<Record<number, any>>({});
+
+const isFileTailer = computed(() => {
+  // จำนวนไฟล์ที่อัปโหลดครบทุกคน
+  return (
+    attachmentList.value.length > 0 &&
+    attachmentList.value.every((person) => !!attachmentFiles.value[person.id])
+  );
+});
 
 /**
  * ฟังก์ชันยืนยันการส่งให้ผู้มีอำนาจลงนามอนุมัติ
@@ -88,7 +99,9 @@ async function updateCheckboxAuthority(val: boolean) {
     .put(config.API.command + `/pending-check/${commandId.value}`, {
       sign: val,
     })
-    .then(() => {})
+    .then(() => {
+      isAttachment.value && fetchLists();
+    })
     .catch((err) => {
       messageError($q, err);
     })
@@ -104,7 +117,7 @@ async function updateCheckboxAuthority(val: boolean) {
 function onUploadFile(group: string) {
   showLoader();
   let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
-  let file = group === "order" ? fileUploadOrder.value : fileUploadTailer.value;
+  // let file = group === "order" ? fileUploadOrder.value : fileUploadTailer.value;
   const fileName = { fileName: type };
   http
     .post(config.API.file("ระบบออกคำสั่ง", type, commandId.value), {
@@ -118,7 +131,11 @@ function onUploadFile(group: string) {
           res.data[key]?.fileName !== ""
       );
       foundKey &&
-        (await uploadFileDoc(res.data[foundKey]?.uploadUrl, file, group));
+        (await uploadFileDoc(
+          res.data[foundKey]?.uploadUrl,
+          fileUploadOrder.value,
+          group
+        ));
     })
     .catch((err) => {
       messageError($q, err);
@@ -134,7 +151,12 @@ function onUploadFile(group: string) {
  * @param file ไฟล์ที่ต้องการอัปโหลด
  * @param group ประเภพไฟล์ "คำสั่ง","แนบท้าย"
  */
-async function uploadFileDoc(uploadUrl: string, file: any, group: string) {
+async function uploadFileDoc(
+  uploadUrl: string,
+  file: any,
+  group: string,
+  id?: string
+) {
   const formData = new FormData();
   formData.append("file", file);
   showLoader();
@@ -154,7 +176,11 @@ async function uploadFileDoc(uploadUrl: string, file: any, group: string) {
       if (group === "order") {
         fileUploadOrder.value = null;
       } else {
-        fileUploadTailer.value = null;
+        attachmentList.value.forEach((e) => {
+          if (e.id === id) {
+            e.file = null;
+          }
+        });
       }
       hideLoader();
     });
@@ -167,15 +193,40 @@ async function uploadFileDoc(uploadUrl: string, file: any, group: string) {
 async function fetchDoc(group: string) {
   showLoader();
   let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
+  if (group === "order") {
+    await fetchDocOrder(type);
+  } else {
+    attachmentList.value.forEach(async (e) => {
+      await fetchDocTailer(type, e.id);
+    });
+  }
+}
+
+async function fetchDocOrder(type: string) {
   await http
     .get(config.API.file("ระบบออกคำสั่ง", type, commandId.value))
     .then((res) => {
       const data = res.data[0];
-      if (group === "order") {
+      fileOrder.value = data;
-        fileOrder.value = data;
+    })
-      } else {
+    .catch((e) => {
-        fileTailer.value = data;
+      messageError($q, e);
-      }
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+async function fetchDocTailer(type: string, id: string) {
+  await http
+    .get(config.API.subFile("ระบบออกคำสั่ง", type, commandId.value, id))
+    .then((res) => {
+      const data = res.data[0];
+      attachmentList.value.forEach((e) => {
+        if (e.id === id) {
+          attachmentFiles.value[e.id] = data;
+        }
+      });
     })
     .catch((e) => {
       messageError($q, e);
@@ -190,18 +241,33 @@ const dataFile = ref<DataFileDownload>();
  * ดาวน์โหลดลิงก์ไฟล์
  * @param fileName file name
  */
-function downloadFile(file: any, group: string, isView: boolean = false) {
+function downloadFile(
+  file: any,
+  group: string,
+  isView: boolean = false,
+  id: string
+) {
   let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
+
+  const pathApi =
+    group === "order"
+      ? config.API.fileByFile(
+          "ระบบออกคำสั่ง",
+          type,
+          commandId.value,
+          file.fileName
+        )
+      : config.API.subFileByFileName(
+          "ระบบออกคำสั่ง",
+          type,
+          commandId.value,
+          id,
+          file.fileName
+        );
+
   showLoader();
   http
-    .get(
+    .get(pathApi)
-      config.API.fileByFile(
-        "ระบบออกคำสั่ง",
-        type,
-        commandId.value,
-        file.fileName
-      )
-    )
     .then((res) => {
       const data = res.data;
       dataFile.value = data;
@@ -257,6 +323,49 @@ function onConfirmOrder() {
   }
 }
 
+/** ดึงข้อมูล บุคคล */
+async function fetchLists() {
+  await http
+    .get(config.API.commandAction(commandId.value, "tab2"))
+    .then(async (res) => {
+      const data = await res.data.result;
+      attachmentList.value = data.commandRecives.map((item: any) => ({
+        id: item.citizenId,
+        name: item.prefix + item.firstName + " " + item.lastName,
+        file: null,
+      }));
+    })
+    .catch((e) => {
+      messageError($q, e);
+    });
+}
+
+function onUploadFileTailer(id: string, file: any) {
+  const type = "แนบท้าย";
+  const fileName = { fileName: type };
+
+  http
+    .post(config.API.subFile("ระบบออกคำสั่ง", type, commandId.value, id), {
+      replace: true,
+      fileList: fileName,
+    })
+    .then(async (res) => {
+      const foundKey: string | undefined = Object.keys(res.data).find(
+        (key) =>
+          res.data[key]?.fileName !== undefined &&
+          res.data[key]?.fileName !== ""
+      );
+      foundKey &&
+        (await uploadFileDoc(res.data[foundKey]?.uploadUrl, file, type, id));
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
 onMounted(async () => {
   isCheckDraft.value = isDraft.value;
   isCheckAuthority.value = isAuthority.value;
@@ -264,6 +373,7 @@ onMounted(async () => {
     isLoad.value = false;
     let promises = [fetchDoc("order")];
     if (isAttachment.value) {
+      await fetchLists();
       promises.push(fetchDoc("tailer"));
     }
     await Promise.all(promises).finally(() => {
@@ -318,141 +428,172 @@ onMounted(async () => {
             />
           </div>
 
-          <div
+          <div class="row col-12" style="padding-left: 50px" v-if="isAuthority">
-            class="row col-12 q-col-gutter-sm"
-            style="padding-left: 50px"
-            v-if="isAuthority"
-          >
             <div class="col-12 text-header">
               อัปโหลดเอกสารสแกนกลับเข้าสู่ระบบ
             </div>
-            <div class="col-6">
+            <div class="col-6 q-col-gutter-sm">
-              <q-card
+              <div class="col-6">
-                bordered
+                <q-card
-                class="row col-12"
+                  bordered
-                style="border: 1px solid #d6dee1"
+                  class="row col-12"
-              >
+                  style="border: 1px solid #d6dee1"
-                <div
-                  class="row items-center col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
                 >
-                  คำสั่ง
+                  <div
-                  <q-space />
+                    class="row items-center col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                  <q-btn
-                    v-if="fileOrder"
-                    rounded
-                    flat
-                    dense
-                    color="primary"
-                    icon="mdi-eye"
-                    @click.prevent="downloadFile(fileOrder, 'order', true)"
                   >
-                    <q-tooltip>ดูไฟล์คำสั่ง</q-tooltip>
+                    คำสั่ง
-                  </q-btn>
+                    <q-space />
-                  <q-btn
+                    <q-btn
-                    v-if="fileOrder"
+                      v-if="fileOrder"
-                    rounded
+                      rounded
-                    flat
+                      flat
-                    dense
+                      dense
-                    color="red"
+                      color="primary"
-                    icon="mdi-download"
+                      icon="mdi-eye"
-                    @click.prevent="downloadFile(fileOrder, 'order')"
+                      @click.prevent="
-                  >
+                        downloadFile(fileOrder, 'order', true, '')
-                    <q-tooltip>ดาวน์โหลดไฟล์คำสั่ง</q-tooltip>
+                      "
-                  </q-btn>
+                    >
-                </div>
+                      <q-tooltip>ดูไฟล์คำสั่ง</q-tooltip>
-                <div class="col-12"><q-separator /></div>
+                    </q-btn>
-                <div class="col-12 q-pa-md" v-if="step === 2">
+                    <q-btn
-                  <q-file
+                      v-if="fileOrder"
-                    outlined
+                      rounded
-                    dense
+                      flat
-                    v-model="fileUploadOrder"
+                      dense
-                    label="เลือกไฟล์คำสั่ง"
+                      color="red"
-                    hide-bottom-space
+                      icon="mdi-download"
-                    accept=".pdf"
+                      @click.prevent="
-                    :readonly="store.readonly"
+                        downloadFile(fileOrder, 'order', false, '')
-                  >
+                      "
-                    <template v-slot:prepend>
+                    >
-                      <q-icon name="attach_file" />
+                      <q-tooltip>ดาวน์โหลดไฟล์คำสั่ง</q-tooltip>
-                    </template>
+                    </q-btn>
+                  </div>
+                  <div class="col-12"><q-separator /></div>
+                  <div class="col-12 q-pa-md" v-if="step === 2">
+                    <q-file
+                      outlined
+                      dense
+                      v-model="fileUploadOrder"
+                      label="เลือกไฟล์คำสั่ง"
+                      hide-bottom-space
+                      accept=".pdf"
+                      :readonly="store.readonly"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon name="attach_file" />
+                      </template>
 
-                    <template v-slot:after>
+                      <template v-slot:after>
-                      <q-btn
+                        <q-btn
-                        @click.prevent="onUploadFile('order')"
+                          @click.prevent="onUploadFile('order')"
-                        flat
+                          flat
-                        round
+                          round
-                        icon="mdi-upload"
+                          icon="mdi-upload"
-                        :color="fileUploadOrder == null ? 'grey-5' : 'blue-5'"
+                          :color="fileUploadOrder == null ? 'grey-5' : 'blue-5'"
-                        :disable="fileUploadOrder == null"
+                          :disable="fileUploadOrder == null"
-                      />
+                        />
-                    </template>
+                      </template>
-                  </q-file>
+                    </q-file>
-                </div>
+                  </div>
-              </q-card>
+                </q-card>
-            </div>
+              </div>
 
-            <div class="col-6" v-if="isAttachment">
+              <div class="col-6" v-if="isAttachment">
-              <q-card
+                <q-card
-                bordered
+                  bordered
-                class="row col-12"
+                  class="row col-12"
-                style="border: 1px solid #d6dee1"
+                  style="border: 1px solid #d6dee1"
-              >
-                <div
-                  class="row items-center col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
                 >
-                  เอกสารแนบท้าย
+                  <div
-                  <q-space />
+                    class="row items-center col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                  <q-btn
-                    v-if="fileTailer"
-                    rounded
-                    flat
-                    dense
-                    color="primary"
-                    icon="mdi-eye"
-                    @click.prevent="downloadFile(fileTailer, 'tailer', true)"
                   >
-                    <q-tooltip>ดูไฟล์เอกสารแนบท้าย</q-tooltip>
+                    เอกสารแนบท้าย
-                  </q-btn>
+                  </div>
-                  <q-btn
+                  <div class="col-12"><q-separator /></div>
-                    v-if="fileTailer"
+                  <div class="row col-12 q-pa-md q-col-gutter-sm">
-                    rounded
+                    <div
-                    flat
+                      v-for="(person, idx) in attachmentList"
-                    dense
+                      :key="person.id"
-                    color="red"
+                      class="col-12"
-                    icon="mdi-download"
+                    >
-                    @click.prevent="downloadFile(fileTailer, 'tailer')"
+                      <q-card flat bordered class="q-pa-sm">
-                  >
+                        <div class="row items-center">
-                    <q-tooltip>ดาวน์โหลดไฟล์แนบท้าย</q-tooltip>
+                          <div class="text-weight-medium">
-                  </q-btn>
+                            {{ person.name }}
-                </div>
+                          </div>
-                <div class="col-12"><q-separator /></div>
+                          <q-space />
-                <div class="col-12 q-pa-md" v-if="step === 2">
+                          <q-btn
-                  <q-file
+                            v-if="attachmentFiles[person.id]"
-                    outlined
+                            @click.prevent="
-                    dense
+                              downloadFile(
-                    v-model="fileUploadTailer"
+                                attachmentFiles[person.id],
-                    label="เลือกไฟล์เอกสารแนบท้าย"
+                                'tailer',
-                    hide-bottom-space
+                                true,
-                    accept=".pdf"
+                                person.id
-                    :readonly="store.readonly"
+                              )
-                  >
+                            "
-                    <template v-slot:prepend>
+                            flat
-                      <q-icon name="attach_file" />
+                            dense
-                    </template>
+                            color="primary"
-
+                            icon="mdi-eye"
-                    <template v-slot:after>
+                            class="q-mr-xs"
-                      <q-btn
+                          >
-                        @click.prevent="onUploadFile('tailer')"
+                            <q-tooltip>ดูไฟล์เอกสารแนบท้าย</q-tooltip>
-                        flat
+                          </q-btn>
-                        round
+                          <q-btn
-                        icon="mdi-upload"
+                            v-if="attachmentFiles[person.id]"
-                        :color="fileUploadTailer == null ? 'grey-5' : 'blue-5'"
+                            @click.prevent="
-                        :disable="fileUploadTailer == null"
+                              downloadFile(
-                      />
+                                attachmentFiles[person.id],
-                      <q-tooltip>อัปโหลดไฟล์เอกสารแนบท้าย</q-tooltip>
+                                'tailer',
-                    </template>
+                                false,
-                  </q-file>
+                                person.id
-                </div>
+                              )
-              </q-card>
+                            "
+                            flat
+                            dense
+                            color="red"
+                            icon="mdi-download"
+                          >
+                            <q-tooltip>ดาวน์โหลดไฟล์เอกสารแนบท้าย</q-tooltip>
+                          </q-btn>
+                        </div>
+                        <q-file
+                          v-if="step === 2"
+                          outlined
+                          dense
+                          v-model="person.file"
+                          label="เลือกไฟล์เอกสารแนบท้าย"
+                          hide-bottom-space
+                          accept=".pdf"
+                          :readonly="store.readonly"
+                          class="full-width"
+                        >
+                          <template v-slot:prepend>
+                            <q-icon name="attach_file" />
+                          </template>
+                          <template v-slot:after>
+                            <q-btn
+                              @click.prevent="
+                                onUploadFileTailer(person.id, person.file)
+                              "
+                              flat
+                              round
+                              icon="mdi-upload"
+                              :color="person.file == null ? 'grey-5' : 'blue-5'"
+                              :disable="person.file == null"
+                            />
+                            <q-tooltip>อัปโหลดไฟล์เอกสารแนบท้าย</q-tooltip>
+                          </template>
+                        </q-file>
+                      </q-card>
+                    </div>
+                  </div>
+                </q-card>
+              </div>
             </div>
           </div>
 
@@ -462,7 +603,7 @@ onMounted(async () => {
               step === 2 &&
               isAuthority &&
               fileOrder &&
-              (!isAttachment || fileTailer)
+              (!isAttachment || isFileTailer)
             "
           >
             <q-btn
@@ -472,14 +613,14 @@ onMounted(async () => {
               :color="
                 !isAuthority ||
                 fileOrder === null ||
-                (fileTailer === null && isAttachment)
+                (!isFileTailer && isAttachment)
                   ? 'grey-5'
                   : 'public'
               "
               :disable="
                 !isAuthority ||
                 fileOrder === null ||
-                (fileTailer === null && isAttachment)
+                (!isFileTailer && isAttachment)
               "
             />
           </div>