hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev

Browse source 
* develop:
  fix:add fiedl email phone
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix:btn position
  fix: img
  fix:interface
  feat:page issues
  fix:org name
  fix:path upload
  fix
  fix: max-file-size="5000000"
  feat:issue
This commit is contained in:
Warunee Tamkoo 2026-02-04 13:44:40 +07:00
commit c9e5f1cd71
27 changed files with 1775 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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>

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

@ -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>

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

@ -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 {
@ -1621,6 +1624,7 @@ onMounted(async () => {
v-model:modal="modalCommand"
v-model:command="command"
v-model:commandId="commandId"
:citizen-id="citizenId"
/>
</template>

15
src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
View file

@ -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>

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

@ -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 {
@ -1624,6 +1627,7 @@ onMounted(async () => {
v-model:modal="modalCommand"
v-model:command="command"
v-model:commandId="commandId"
:citizen-id="citizenId"
/>
</template>

5
src/modules/04_registryPerson/components/detail/Salary/Main.vue
View file

@ -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" />

9
src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
View file

@ -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>