diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue index 92b88294c..0f9c090ed 100644 --- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue +++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue @@ -82,6 +82,9 @@ const columns = ref([ label: "ตำแหน่งเลขที่", sortable: true, field: "posMasterNo", + format(val, row) { + return `${row.orgShortname} ${row.posMasterNo}`; + }, headerStyle: "font-size: 14px", style: "font-size: 14px", }, diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue index f64d86eff..f2ea25601 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue @@ -162,9 +162,7 @@ async function copyLink(name: string) { }); } -/** - * function เรียกข้อมูลวันที่ประกาศ - */ +/** function เรียกข้อมูลวันที่ประกาศ */ async function getDate() { showLoader(); await http @@ -185,9 +183,8 @@ async function getDate() { } const download10Url = ref(""); -/** - * function เช็คไฟล์อัปโหลด - */ + +/** function เช็คไฟล์อัปโหลด*/ async function checkDocResult() { showLoader(); await http @@ -297,7 +294,7 @@ onMounted(async () => { >
บันทึกแจ้งผลการประกาศคัดเลือก
-
+
{ if (props.Modal === true) { selected.value = props.selectedRow; + filterKeyword2.value = ""; } }); @@ -201,7 +202,7 @@ watch( outlined dense class="col-12 q-mb-sm" - :model-value="filterKeyword2" + v-model="filterKeyword2" placeholder="ค้นหารายชื่อ" style="max-width: 100%" @keydown.enter="onSearch" diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue index 3ae02ee09..79a9c5540 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue @@ -167,6 +167,7 @@ function onSearch() { watchEffect(() => { if (props.Modal === true) { selected.value = props.selectedRow; + filterKeyword.value = ""; } }); @@ -201,7 +202,7 @@ watch( outlined dense class="col-12 q-mb-sm" - :model-value="filterKeyword" + v-model="filterKeyword" placeholder="ค้นหารายการประชุม" style="max-width: 100%" @keydown.enter="onSearch"