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

แก้ แสดง สังกัด

Browse source
This commit is contained in:
setthawutttty 2025-03-20 16:58:30 +07:00
parent 708170a2e5
commit fcaf891197
17 changed files with 93 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/06_retirement/components/01_retirement/AddList.vue
View file

@ -18,7 +18,7 @@ const {
showLoader,
hideLoader,
dialogConfirm,
findOrgChildName,
findOrgChildNameHtml,
} = mixin;
const route = useRoute();
const retireld_params = route.params.id;
@ -107,7 +107,7 @@ async function fecthProfile() {
e.posTypeName && e.posLevelName
? e.posTypeName + " (" + e.posLevelName + ")"
: "-",
organizationOrganization: findOrgChildName(e),
organizationOrganization: findOrgChildNameHtml(e),
}));
})
.catch((err) => {
@ -139,7 +139,7 @@ async function fecthProfile() {
e.posTypeName && e.posLevelName
? e.posTypeName + " (" + e.posLevelName + ")"
: "-",
organizationOrganization: findOrgChildName(e),
organizationOrganization: findOrgChildNameHtml(e),
}));
})
.catch((err) => {

13
src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue
View file

@ -33,7 +33,7 @@ const dataMapToSend = computed(() => {
}));
});
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable, textTranForm } = mixin;
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
/** props*/
const props = defineProps({
@ -118,9 +118,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "datetext",
@ -164,7 +166,6 @@ const modalCommand = ref<boolean>(false);
/** popup ยืนยันส่งัว */
function saveOrder() {
dialogConfirm(
$q,
() => {
@ -275,7 +276,7 @@ watch(
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

11
src/modules/06_retirement/components/02_resign/Table.vue
View file

@ -30,7 +30,6 @@ const {
hideLoader,
onSearchDataTable,
findOrgName,
textTranForm,
} = mixin;
/** Table */
@ -106,9 +105,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "datetext",
@ -393,7 +394,7 @@ onMounted(async () => {
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

12
src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue
View file

@ -33,7 +33,7 @@ const dataMapToSend = computed(() => {
}));
});
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable, textTranForm } = mixin;
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
/** props*/
const props = defineProps({
@ -119,9 +119,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "datetext",
@ -275,7 +277,7 @@ watch(
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

13
src/modules/06_retirement/components/03_resignEmp/Table.vue
View file

@ -28,8 +28,7 @@ const {
date2Thai,
showLoader,
hideLoader,
onSearchDataTable,
textTranForm,
onSearchDataTable
} = mixin;
/** Table */
@ -105,9 +104,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "datetext",
@ -388,7 +389,7 @@ onMounted(async () => {
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

11
src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue
View file

@ -52,7 +52,6 @@ const {
hideLoader,
date2Thai,
onSearchDataTable,
textTranForm,
} = mixin;
/** คอลัมน์ */
@ -106,9 +105,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "createdAt",
@ -263,7 +264,7 @@ watchEffect(() => {
<div v-else-if="col.name == 'org'" class="text-html">
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

11
src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue
View file

@ -52,7 +52,6 @@ const {
hideLoader,
date2Thai,
onSearchDataTable,
textTranForm,
} = mixin;
/** คอลัมน์ */
@ -106,9 +105,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "createdAt",
@ -266,7 +267,7 @@ watchEffect(() => {
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

11
src/modules/06_retirement/views/06_dismissOrder.vue
View file

@ -29,7 +29,6 @@ const {
success,
onSearchDataTable,
dialogRemove,
textTranForm,
} = mixin;
const modal = ref<boolean>(false);
@ -105,9 +104,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "createdAt",
@ -380,7 +381,7 @@ onMounted(async () => {
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>

11
src/modules/06_retirement/views/08_dismissOrderEmp.vue
View file

@ -29,7 +29,6 @@ const {
success,
onSearchDataTable,
dialogRemove,
textTranForm,
} = mixin;
const modal = ref<boolean>(false);
@ -105,9 +104,11 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
},
// กรณี copy ทั้งหมด เเล้ว ค้นหา
// format(val, row) {
// return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
// },
},
{
name: "createdAt",
@ -386,7 +387,7 @@ onMounted(async () => {
>
{{
props.row.organizationPositionOld
? textTranForm(props.row.organizationPositionOld)
? props.row.organizationPositionOld
: "-"
}}
</div>