Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-10-17 15:37:04 +07:00
commit 5d9131d5b7
13 changed files with 663 additions and 196 deletions

View file

@ -38,6 +38,7 @@ const transferId = ref<string>(route.params.id as string); //Id รายกา
const roleAdmin = ref<boolean>(false); //admin
const edit = ref<boolean>(false); //
const dataProfile = ref<DataProfile>(); //
const workflowRef = ref<any>(null);
const organizationPositionOld = ref<string>(""); ///
const positionTypeOld = ref<string>(""); //
@ -335,7 +336,7 @@ onMounted(async () => {
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">อมลการขอโอน</div>
<q-space />
<q-btn
<!-- <q-btn
v-if="!roleAdmin && responseData.status != 'APPROVE'"
outline
color="primary"
@ -344,7 +345,7 @@ onMounted(async () => {
class="q-px-sm"
label="ส่งคำร้องไปยัง สกจ."
@click="confirmMessage"
/>
/> -->
</div>
<div class="col-12"><q-separator /></div>
<div class="row col-12 q-pa-md">
@ -489,7 +490,8 @@ onMounted(async () => {
v-if="
!(
responseData.status == 'REPORT' ||
responseData.status == 'DONE'
responseData.status == 'DONE' ||
!workflowRef?.permission.isUpdate
) && checkPermission($route)?.attrIsUpdate
"
/>
@ -686,7 +688,11 @@ onMounted(async () => {
</q-card>
<!-- Workflow -->
<WorkFlow :id="transferId" :sys-name="'transfer'" />
<WorkFlow
ref="workflowRef"
:id="transferId"
:sys-name="'PLACEMENT_TRANSFER'"
/>
</div>
</template>