ปรับแก้ วินัย อีกนิด
This commit is contained in:
setthawutttty
parent
264c53f872
commit
fc55ffc928
2 changed files with 117 additions and 111 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, reactive, watch,computed } from "vue";
|
import { ref, onMounted, reactive, watch, computed } from "vue";
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
|
|
@ -339,7 +339,7 @@ async function fetchDatadetail() {
|
||||||
email: item.email,
|
email: item.email,
|
||||||
phone: item.phone,
|
phone: item.phone,
|
||||||
duty: item.duty,
|
duty: item.duty,
|
||||||
check: 'props',
|
check: "props",
|
||||||
}));
|
}));
|
||||||
|
|
||||||
rows.value = dataMap;
|
rows.value = dataMap;
|
||||||
|
|
@ -467,8 +467,8 @@ async function selectComplainant(val: string) {
|
||||||
/** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
|
/** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
|
||||||
function changeFormData() {
|
function changeFormData() {
|
||||||
isSave.value = true;
|
isSave.value = true;
|
||||||
if(formData.disciplinaryFaultLevel !== 'อื่นๆ'){
|
if (formData.disciplinaryFaultLevel !== "อื่นๆ") {
|
||||||
formData.disciplinaryFaultLevelOther = ''
|
formData.disciplinaryFaultLevelOther = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1065,8 +1065,7 @@ onMounted(async () => {
|
||||||
|
|
||||||
<div class="col-3">
|
<div class="col-3">
|
||||||
<datepicker
|
<datepicker
|
||||||
:class="
|
:class="isReadonly ? '' : dateEndInputStyle"
|
||||||
isReadonly ? '' : dateEndInputStyle "
|
|
||||||
menu-class-name="modalfix"
|
menu-class-name="modalfix"
|
||||||
v-model="formData.disciplinaryDateEnd"
|
v-model="formData.disciplinaryDateEnd"
|
||||||
:readonly="
|
:readonly="
|
||||||
|
|
@ -1323,7 +1322,9 @@ onMounted(async () => {
|
||||||
<q-td class="text-right">
|
<q-td class="text-right">
|
||||||
<!-- แก้ไขกรรมการ -->
|
<!-- แก้ไขกรรมการ -->
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="!isReadonly && props.row.check ==='props'"
|
v-if="
|
||||||
|
!isReadonly && props.row.check === 'props'
|
||||||
|
"
|
||||||
dense
|
dense
|
||||||
size="12px"
|
size="12px"
|
||||||
flat
|
flat
|
||||||
|
|
@ -1366,95 +1367,99 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row col-12 q-col-gutter-sm">
|
||||||
|
<div class="col-xs-12 col-sm-3">
|
||||||
|
<q-input
|
||||||
|
:class="inputEdit(isReadonly)"
|
||||||
|
:readonly="isReadonly"
|
||||||
|
dense
|
||||||
|
outlined
|
||||||
|
ref="disciplinaryCaseFaultRef"
|
||||||
|
v-model="formData.disciplinaryCaseFault"
|
||||||
|
for="#casefault"
|
||||||
|
label="กรณีมีความผิด"
|
||||||
|
hide-bottom-space
|
||||||
|
:rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]"
|
||||||
|
lazy-rules
|
||||||
|
@update:model-value="changeFormData()"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-12 col-sm-3">
|
<div class="col-xs-12 col-sm-3">
|
||||||
<q-input
|
<q-input
|
||||||
:class="inputEdit(isReadonly)"
|
:class="inputEdit(isReadonly)"
|
||||||
:readonly="isReadonly"
|
:readonly="isReadonly"
|
||||||
dense
|
dense
|
||||||
outlined
|
hide-bottom-space
|
||||||
ref="disciplinaryCaseFaultRef"
|
outlined
|
||||||
v-model="formData.disciplinaryCaseFault"
|
for="#whereInvestigate"
|
||||||
for="#casefault"
|
ref="disciplinaryInvestigateAtRef"
|
||||||
label="กรณีมีความผิด"
|
v-model="formData.disciplinaryInvestigateAt"
|
||||||
hide-bottom-space
|
label="สอบสวนที่"
|
||||||
:rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]"
|
:rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
@update:model-value="changeFormData()"
|
@update:model-value="changeFormData()"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-12 col-sm-3">
|
<div class="col-xs-12 col-sm-3">
|
||||||
<q-input
|
<q-select
|
||||||
:class="inputEdit(isReadonly)"
|
:class="inputEdit(isReadonly)"
|
||||||
:readonly="isReadonly"
|
:readonly="isReadonly"
|
||||||
dense
|
dense
|
||||||
hide-bottom-space
|
outlined
|
||||||
outlined
|
for="#faultLevel"
|
||||||
for="#whereInvestigate"
|
ref="disciplinaryFaultLevelRef"
|
||||||
ref="disciplinaryInvestigateAtRef"
|
v-model="formData.disciplinaryFaultLevel"
|
||||||
v-model="formData.disciplinaryInvestigateAt"
|
option-label="name"
|
||||||
label="สอบสวนที่"
|
option-value="id"
|
||||||
:rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
|
emit-value
|
||||||
lazy-rules
|
map-options
|
||||||
@update:model-value="changeFormData()"
|
hide-bottom-space
|
||||||
/>
|
:options="investigateDis.optionsfaultLevel"
|
||||||
</div>
|
label="ระดับโทษความผิด"
|
||||||
|
:rules="[
|
||||||
<div class="col-xs-12 col-sm-3">
|
(val) => !!val || `${'กรุณาเลือกระดับโทษความผิด'}`,
|
||||||
<q-select
|
]"
|
||||||
:class="inputEdit(isReadonly)"
|
lazy-rules
|
||||||
:readonly="isReadonly"
|
group-label="group"
|
||||||
dense
|
group-values="options"
|
||||||
outlined
|
@update:model-value="changeFormData()"
|
||||||
for="#faultLevel"
|
>
|
||||||
ref="disciplinaryFaultLevelRef"
|
</q-select>
|
||||||
v-model="formData.disciplinaryFaultLevel"
|
</div>
|
||||||
option-label="name"
|
<div
|
||||||
option-value="id"
|
class="col-3"
|
||||||
emit-value
|
v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'"
|
||||||
map-options
|
|
||||||
hide-bottom-space
|
|
||||||
:options="investigateDis.optionsfaultLevel"
|
|
||||||
label="ระดับโทษความผิด"
|
|
||||||
:rules="[
|
|
||||||
(val) => !!val || `${'กรุณาเลือกระดับโทษความผิด'}`,
|
|
||||||
]"
|
|
||||||
lazy-rules
|
|
||||||
group-label="group"
|
|
||||||
group-values="options"
|
|
||||||
@update:model-value="changeFormData()"
|
|
||||||
>
|
>
|
||||||
</q-select>
|
<q-input
|
||||||
|
:class="inputEdit(isReadonly)"
|
||||||
|
outlined
|
||||||
|
dense
|
||||||
|
label="ระดับโทษความผิดอื่นๆ"
|
||||||
|
v-model="formData.disciplinaryFaultLevelOther"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-12 col-sm-3">
|
||||||
|
<q-input
|
||||||
|
:class="inputEdit(isReadonly)"
|
||||||
|
:readonly="isReadonly"
|
||||||
|
dense
|
||||||
|
for="#refLaw"
|
||||||
|
hide-bottom-space
|
||||||
|
outlined
|
||||||
|
ref="disciplinaryRefLawRef"
|
||||||
|
v-model="formData.disciplinaryRefLaw"
|
||||||
|
label="อ้างอิงมาตราตามกฎหมาย"
|
||||||
|
:rules="[
|
||||||
|
(val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
|
||||||
|
]"
|
||||||
|
lazy-rules
|
||||||
|
@update:model-value="changeFormData()"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-12 col-sm-3">
|
|
||||||
<q-input
|
|
||||||
:class="inputEdit(isReadonly)"
|
|
||||||
:readonly="isReadonly"
|
|
||||||
dense
|
|
||||||
for="#refLaw"
|
|
||||||
hide-bottom-space
|
|
||||||
outlined
|
|
||||||
ref="disciplinaryRefLawRef"
|
|
||||||
v-model="formData.disciplinaryRefLaw"
|
|
||||||
label="อ้างอิงมาตราตามกฎหมาย"
|
|
||||||
:rules="[
|
|
||||||
(val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
|
|
||||||
]"
|
|
||||||
lazy-rules
|
|
||||||
@update:model-value="changeFormData()"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col-12" v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'">
|
|
||||||
<q-input
|
|
||||||
:class="inputEdit(isReadonly)"
|
|
||||||
outlined
|
|
||||||
dense
|
|
||||||
label="ระดับโทษความผิดอื่นๆ"
|
|
||||||
v-model="formData.disciplinaryFaultLevelOther"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-12 col-sm-6">
|
<div class="col-xs-12 col-sm-6">
|
||||||
<q-input
|
<q-input
|
||||||
:readonly="isReadonly"
|
:readonly="isReadonly"
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ const saveOrder = () => {
|
||||||
async function Ordersave(){
|
async function Ordersave(){
|
||||||
const persons = selected.value.map((r) => r.id);
|
const persons = selected.value.map((r) => r.id);
|
||||||
|
|
||||||
if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
|
// if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
|
||||||
const body = {
|
const body = {
|
||||||
persons,
|
persons,
|
||||||
};
|
};
|
||||||
|
|
@ -90,25 +90,25 @@ async function Ordersave(){
|
||||||
props.getData?.();
|
props.getData?.();
|
||||||
hideLoader();
|
hideLoader();
|
||||||
});
|
});
|
||||||
} else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
|
// } else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
|
||||||
const body = {
|
// const body = {
|
||||||
persons,
|
// persons,
|
||||||
};
|
// };
|
||||||
showLoader();
|
// showLoader();
|
||||||
await http
|
// await http
|
||||||
.put(config.API.discardResult(idPath.value, type.value as string), body)
|
// .put(config.API.discardResult(idPath.value, type.value as string), body)
|
||||||
.then((res: any) => {
|
// .then((res: any) => {
|
||||||
success($q, `${props.title}สำเร็จ`);
|
// success($q, `${props.title}สำเร็จ`);
|
||||||
props.closeModal?.();
|
// props.closeModal?.();
|
||||||
})
|
// })
|
||||||
.catch((e) => {
|
// .catch((e) => {
|
||||||
messageError($q, e);
|
// messageError($q, e);
|
||||||
})
|
// })
|
||||||
.finally(async () => {
|
// .finally(async () => {
|
||||||
props.getData?.();
|
// props.getData?.();
|
||||||
hideLoader();
|
// hideLoader();
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
};
|
};
|
||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
|
|
@ -193,6 +193,7 @@ watch(
|
||||||
<div class="row justify-between">
|
<div class="row justify-between">
|
||||||
<div class="col-5">
|
<div class="col-5">
|
||||||
<q-toolbar style="padding: 0">
|
<q-toolbar style="padding: 0">
|
||||||
|
|
||||||
<q-select
|
<q-select
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue