fix bug
This commit is contained in:
parent
397c7a5307
commit
81b0ba60df
8 changed files with 42 additions and 18 deletions
|
|
@ -257,6 +257,7 @@ onMounted(async () => {
|
||||||
await getData();
|
await getData();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-card flat bordered class="col-12 q-px-lg q-py-md q-mt-md no-border">
|
<q-card flat bordered class="col-12 q-px-lg q-py-md q-mt-md no-border">
|
||||||
<HeaderTop
|
<HeaderTop
|
||||||
|
|
@ -348,3 +349,5 @@ onMounted(async () => {
|
||||||
</q-card>
|
</q-card>
|
||||||
</q-card>
|
</q-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="css"></style>
|
||||||
|
|
|
||||||
|
|
@ -414,6 +414,7 @@ watch(
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
@use "sass:math";
|
||||||
.mt {
|
.mt {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
@ -433,7 +434,7 @@ $toggle-control-ease: ease-in;
|
||||||
|
|
||||||
// These are our computed variables
|
// These are our computed variables
|
||||||
// change at your own risk.
|
// change at your own risk.
|
||||||
$toggle-radius: ($toggle-height / 2);
|
$toggle-radius: math.div($toggle-height, 2);
|
||||||
$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
|
$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
|
||||||
|
|
||||||
.toggle-control {
|
.toggle-control {
|
||||||
|
|
|
||||||
|
|
@ -346,6 +346,7 @@ watch(
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
@use "sass:math";
|
||||||
.mt {
|
.mt {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
@ -365,7 +366,7 @@ $toggle-control-ease: ease-in;
|
||||||
|
|
||||||
// These are our computed variables
|
// These are our computed variables
|
||||||
// change at your own risk.
|
// change at your own risk.
|
||||||
$toggle-radius: ($toggle-height / 2);
|
$toggle-radius: math.div($toggle-height, 2);
|
||||||
$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
|
$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
|
||||||
|
|
||||||
.toggle-control {
|
.toggle-control {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import { useRoute } from "vue-router";
|
||||||
|
|
||||||
import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer";
|
import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer";
|
||||||
import type { OpType } from "@/modules/05_placement/interface/response/Main";
|
import type { OpType } from "@/modules/05_placement/interface/response/Main";
|
||||||
import type { DataListRow } from "@/modules/11_discipline/interface/request/result";
|
import type { DataPerson } from "@/modules/11_discipline/interface/index/Main";
|
||||||
|
|
||||||
import DialogHeader from "@/components/DialogHeader.vue";
|
import DialogHeader from "@/components/DialogHeader.vue";
|
||||||
|
|
||||||
|
|
@ -28,7 +28,7 @@ const {
|
||||||
const optionsType = ref<[]>([]);
|
const optionsType = ref<[]>([]);
|
||||||
const idPath = ref<string>(route.params.id as string);
|
const idPath = ref<string>(route.params.id as string);
|
||||||
const type = ref<string>("");
|
const type = ref<string>("");
|
||||||
const rows = ref<DataListRow[]>([]);
|
const rows = ref<DataPerson[]>([]);
|
||||||
const selected = ref<ResponseData[]>([]);
|
const selected = ref<ResponseData[]>([]);
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ import DialogHistory from "@/modules/11_discipline/components/8_AppealComplain/d
|
||||||
|
|
||||||
const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
|
const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
|
||||||
const mainStore = useDisciplineMainStore();
|
const mainStore = useDisciplineMainStore();
|
||||||
const router = useRouter();
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const checkRoutePermission = ref<boolean>(route.name == "appealComplainDetail");
|
const checkRoutePermission = ref<boolean>(route.name == "appealComplainDetail");
|
||||||
/** รับ props มาจากหน้าหลัก */
|
/** รับ props มาจากหน้าหลัก */
|
||||||
|
|
@ -366,6 +365,7 @@ onMounted(() => {
|
||||||
dataStore.visibleColumns = visibleColumns.value;
|
dataStore.visibleColumns = visibleColumns.value;
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="row q-col-gutter-xs">
|
<div class="row q-col-gutter-xs">
|
||||||
<form @submit.prevent="validateForm" class="col-12 row">
|
<form @submit.prevent="validateForm" class="col-12 row">
|
||||||
|
|
@ -541,7 +541,7 @@ onMounted(() => {
|
||||||
v-model="formData.title"
|
v-model="formData.title"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
:rules="[
|
:rules="[
|
||||||
(val) => !!val || 'กรุณากรอกเรื่องอุทธรณ์/ร้องทุกข์',
|
(val:string) => !!val || 'กรุณากรอกเรื่องอุทธรณ์/ร้องทุกข์',
|
||||||
]"
|
]"
|
||||||
label="เรื่องอุทธรณ์/ร้องทุกข์"
|
label="เรื่องอุทธรณ์/ร้องทุกข์"
|
||||||
/>
|
/>
|
||||||
|
|
@ -559,7 +559,7 @@ onMounted(() => {
|
||||||
v-model="formData.description"
|
v-model="formData.description"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
:rules="[
|
:rules="[
|
||||||
(val) => !!val || 'กรุณากรอกรายละเอียดอุทธรณ์/ร้องทุกข์',
|
(val:string) => !!val || 'กรุณากรอกรายละเอียดอุทธรณ์/ร้องทุกข์',
|
||||||
]"
|
]"
|
||||||
label="รายละเอียดอุทธรณ์/ร้องทุกข์"
|
label="รายละเอียดอุทธรณ์/ร้องทุกข์"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
|
|
@ -757,7 +757,7 @@ onMounted(() => {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style scoped lang="scss">
|
||||||
.icon-color {
|
.icon-color {
|
||||||
color: #4154b3;
|
color: #4154b3;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -74,8 +74,32 @@ interface FileLists {
|
||||||
|
|
||||||
interface HistoryResultCommand {
|
interface HistoryResultCommand {
|
||||||
commandSubject: string;
|
commandSubject: string;
|
||||||
createdAt: Date|null;
|
createdAt: Date | null;
|
||||||
lastUpdatedAt: Date|null;
|
lastUpdatedAt: Date | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface DataPerson {
|
||||||
|
id: string;
|
||||||
|
idInvestigate: string;
|
||||||
|
idComplaint: string;
|
||||||
|
respondentType: string;
|
||||||
|
persons: PersonType;
|
||||||
|
organizationId: string;
|
||||||
|
resultDescription: string;
|
||||||
|
}
|
||||||
|
interface PersonType {
|
||||||
|
id: string;
|
||||||
|
idcard: string;
|
||||||
|
name: string;
|
||||||
|
prefix: string;
|
||||||
|
firstName: string;
|
||||||
|
lastName: string;
|
||||||
|
position: string;
|
||||||
|
positionLevel: string;
|
||||||
|
salary: number;
|
||||||
|
personId: string;
|
||||||
|
posNo: string;
|
||||||
|
organization: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type {
|
export type {
|
||||||
|
|
@ -88,5 +112,6 @@ export type {
|
||||||
FileLists,
|
FileLists,
|
||||||
DataOptioGroup,
|
DataOptioGroup,
|
||||||
DataOptionYear,
|
DataOptionYear,
|
||||||
HistoryResultCommand
|
HistoryResultCommand,
|
||||||
|
DataPerson,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,6 @@ import type { ResPrefix } from "@/modules/15_development/interface/response/Main
|
||||||
*/
|
*/
|
||||||
import DialogHeader from "@/components/DialogHeader.vue";
|
import DialogHeader from "@/components/DialogHeader.vue";
|
||||||
|
|
||||||
/** importStore*/
|
|
||||||
|
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const {
|
const {
|
||||||
|
|
@ -487,4 +485,4 @@ watch(
|
||||||
</q-dialog>
|
</q-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped></style>
|
<style lang="scss" scoped></style>
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,6 @@ import DialogHistoryPos from "@/modules/16_positionEmployee/components/DialogHis
|
||||||
import DialogSelectPerson from "@/modules/16_positionEmployee/components/DialogSelectPerson.vue";
|
import DialogSelectPerson from "@/modules/16_positionEmployee/components/DialogSelectPerson.vue";
|
||||||
import DialogSuccession from "@/modules/16_positionEmployee/components/DialogSuccession.vue";
|
import DialogSuccession from "@/modules/16_positionEmployee/components/DialogSuccession.vue";
|
||||||
|
|
||||||
/**
|
|
||||||
* importStore
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ues
|
* ues
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue