Merge branch 'develop' into devTee

src/components/Workflow/Main.vue

@@ -250,7 +250,7 @@ defineExpose({
                   @click.prevent="
                     (modalSelectPerson = true), (typeSelectPerson = 'operate')
                   "
-                  label="ส่งยังไปผู้บังคับบัญชา"
+                  label="ส่งไปยังผู้บังคับบัญชา"
                   color="public"
                 />
                 <q-btn

src/modules/02_organization/components/TableMain.vue

@@ -833,6 +833,7 @@ watch(
                   ? `(${props.row.conditionReason})`
                   : ""
               }}
+
               <q-btn
                 v-if="props.row.positionIsSelected != 'ว่าง'"
                 size="12px"
@@ -843,7 +844,10 @@ watch(
                 round
                 @click="
                   (modalPerson = true),
-                    (personalId = props.row.current_holderId)
+                    (personalId =
+                      store.typeOrganizational === 'draft'
+                        ? props.row.next_holderId
+                        : props.row.current_holderId)
                 "
               >
                 <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>

src/modules/05_placement/components/Receive/DialogOrders.vue

@@ -255,7 +255,7 @@ watchEffect(() => {
 </script>
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 1200px; max-width: 80vw">
+    <q-card style="min-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่งรับโอน'" :close="clickClose" />
       <q-separator />
       <q-card-section>
@@ -336,6 +336,13 @@ watchEffect(() => {
                       {{ props.rowIndex + 1 }}
                     </div>
 
+                    <div
+                      v-else-if="col.name === 'organizationNameOld'"
+                      class="text-html"
+                    >
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+
                     <div v-else-if="col.name == 'organizationName'">
                       {{ props.row.position !== null ? props.row.position : ""
                       }}{{

src/modules/07_insignia/components/5_Borrow/DialogForm.vue

@@ -462,6 +462,7 @@ onMounted(() => {
                     ref="table"
                     :columns="columns"
                     :rows="rows"
+                    :visible-columns="visibleColumns"
                     row-key="id"
                     flat
                     bordered