diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue index 7976b7ac4..9209b125c 100644 --- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue @@ -21,11 +21,18 @@ import DialogHeader from "@/components/DialogHeader.vue"; import http from "@/plugins/http"; import config from "@/app.config"; +const rows = ref([]) const $q = useQuasar(); const selected = ref([]); const mixin = useCounterMixin(); -const { showLoader, success, messageError, dialogConfirm, hideLoader,dialogMessageNotify } = mixin; - +const { + showLoader, + success, + messageError, + dialogConfirm, + hideLoader, + dialogMessageNotify, +} = mixin; const props = defineProps({ data: { @@ -58,15 +65,15 @@ const checkSelected = computed(() => { //popup ยืนยันส่งัว const saveOrder = () => { - if(props.type){ + if (props.type) { dialogConfirm( $q, () => Ordersave(), "ยืนยันส่งไปออกคำสั่ง", "ต้องการยืนยันส่งไปออกคำสั่งใช่หรือไม่?" ); - }else{ - dialogMessageNotify($q,'กรุณาเลือกประเภทคำสั่ง') + } else { + dialogMessageNotify($q, "กรุณาเลือกประเภทคำสั่ง"); } }; //ส่งไปออกคำสั่ง @@ -75,7 +82,7 @@ const Ordersave = async () => { const body = { id, }; - console.log(body) + console.log(body); showLoader(); await http .put(config.API.reportresult(props.type as string), body) @@ -134,7 +141,8 @@ const fecthTypeOption = async () => { watchEffect(() => { if (props.Modal === true) { selected.value = []; - // rows2.value = props.data.persons + // console.log(props.data.status) + rows.value = props.data.persons.filter((item: any) => item.status !== 'REPORT'); } }); @@ -218,7 +226,7 @@ onMounted(async () => { {}); for="#detail" label="สรุปผลการพิจารณา" hide-bottom-space - :rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]" + :rules="[(val) => !!val || `${'กรุณากรอกสรุปผลการพิจารณา'}`]" lazy-rules @update:model-value="changeFormData()" /> diff --git a/src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue b/src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue index 59323050b..13bf284e4 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DismissOrder.vue @@ -31,6 +31,7 @@ const modal = ref(false); /** คอลัมน์ที่แสดง */ const visibleColumns = ref([ "no", + "title", "name", "position", "positionLevel", @@ -56,6 +57,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "title", + align: "left", + label: "เรื่องร้องเรียน", + sortable: true, + field: "title", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "name", align: "left", diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts index 4d4e4d3aa..d9f389d04 100644 --- a/src/modules/11_discipline/store/ResultStore.ts +++ b/src/modules/11_discipline/store/ResultStore.ts @@ -108,7 +108,7 @@ export const useDisciplineResultStore = defineStore( { name: "respondentType", align: "left", - label: "ผู้ถูกสืบสวน", + label: "ผู้ถูกสอบสวน", sortable: true, field: "respondentType", headerStyle: "font-size: 14px",