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

แก้ไขคำสั่งให้รองรับ 2 คำสั่งที่เพิ่มใหม่, แก้ css และข้อความ

Browse source
This commit is contained in:
Warunee Tamkoo 2023-10-10 17:29:29 +07:00
parent daad016d2c
commit bbc5c7ed5e
6 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/05_placement/components/AppointEmployee/Main.vue
View file

@ -6,7 +6,7 @@ import { useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import { useTransferDataStore } from "@/modules/05_placement/store";
import Dialogbody from "@/modules/05_placement/components/AppointEmployee/Dialogbody.vue";
import DialogOrgTree from "@/modules/05_placement/components/AppointEmployee/Modal.vue";
// import DialogOrgTree from "@/modules/05_placement/components/AppointEmployee/Modal.vue";
import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue";
import type {
listAppointType,
@ -665,7 +665,7 @@ const savePosition = async () => {
transition-show="jump-down"
transition-hide="jump-up"
>
<q-list dense style="min-width: 100px">
<q-list dense style="min-width: 200px">
<q-item
clickable
v-close-popup
@ -682,7 +682,7 @@ const savePosition = async () => {
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section>เลือกหน่วยงาน/ตำแหน่ง</q-item-section>
<q-item-section>กำหนดตำแหน่ง</q-item-section>
</q-item>
<q-item
clickable
@ -799,11 +799,11 @@ const savePosition = async () => {
:nextPage="nextPage"
:fecthlistappointment="fecthlistappointment"
/>
<DialogOrgTree
<!-- <DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"
:personal="personal"
:personalId="personalId"
/>
/> -->
</template>
<style scoped lang="scss"></style>

2
src/modules/05_placement/components/AppointMent/Main.vue
View file

@ -443,7 +443,7 @@ onMounted(() => {
transition-show="jump-down"
transition-hide="jump-up"
>
<q-list dense style="min-width: 100px">
<q-list dense style="min-width: 250px">
<q-item
clickable
v-close-popup

4
src/modules/06_retirement/components/resign/ResignByid.vue
View file

@ -274,7 +274,7 @@ const conditionSave = () => {
dialogMessage(
$q,
"ต้องการแก้ไขข้อมูลหรือไม่?",
"แก้ไขข้อมูลรายละเอียดการลาออก",
"แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย",
"mdi-help-circle-outline",
"ตกลง",
"public",
@ -724,7 +724,7 @@ const downloadFile = (response: any, filename: string) => {
<q-card bordered class="row col-12 text-dark q-mt-sm">
<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 />
<div class="q-gutter-sm" v-if="!edit">

3
src/modules/10_order/components/step/step02.vue
View file

@ -168,7 +168,8 @@ const statuscode = computed(() => {
orderTypeCode.value === "c-pm-08" ||
orderTypeCode.value === "c-pm-09" ||
orderTypeCode.value === "c-pm-14" ||
orderTypeCode.value === "c-pm-21"
orderTypeCode.value === "c-pm-21" ||
orderTypeCode.value === "c-pm-22"
) {
return false;
}

16
src/modules/10_order/components/step/step04.vue
View file

@ -76,7 +76,8 @@ const getCommandDetail = async () => {
code.value != "c-pm-18" &&
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21"
code.value != "c-pm-21" &&
code.value != "c-pm-22"
) {
fetchReportAttachment("pdf", orderId.value);
}
@ -272,7 +273,8 @@ const saveUpload = () => {
code.value != "c-pm-18" &&
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21"
code.value != "c-pm-21" &&
code.value != "c-pm-22"
) {
await postfileTailer();
}
@ -306,7 +308,8 @@ const saveDetail = () => {
code.value != "c-pm-18" &&
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21"
code.value != "c-pm-21" &&
code.value != "c-pm-22"
) {
// ดึงรายงานในส่วนของแนบท้ายมาใหม่
await fetchReportAttachment("pdf", orderId.value);
@ -404,6 +407,7 @@ const validateFormUpload = () => {
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21" &&
code.value != "c-pm-22" &&
fileOrder.value !== null &&
fileTailer.value !== null
) {
@ -503,7 +507,8 @@ const viewFileUpload = async (url: string) => {
code != 'c-pm-18' &&
code != 'c-pm-19' &&
code != 'c-pm-20' &&
code != 'c-pm-21'
code != 'c-pm-21' &&
code != 'c-pm-22'
"
@click="setTab('second')"
:class="getClass(tab == 'second')"
@ -682,7 +687,8 @@ const viewFileUpload = async (url: string) => {
code != 'c-pm-18' &&
code != 'c-pm-19' &&
code != 'c-pm-20' &&
code != 'c-pm-21'
code != 'c-pm-21' &&
code != 'c-pm-22'
"
>
<label class="text-file">เอกสารแนบท้าย</label>

6
src/modules/10_order/store.ts
View file

@ -141,8 +141,12 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
return "ลงโทษไล่ออกจากราชการ";
case "C-PM-21":
return "จ้างและแต่งตั้งลูกจ้างประจำ";
case "C-PM-22":
return "จ้างและแต่งตั้งลูกจ้างประจำ";
case "C-PM-23":
return "อนุญาตให้ลูกจ้างประจำลาออกจากราชการ";
default:
return "error";
return "";
}
};