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

fix filter placemrnt

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-20 18:12:39 +07:00
parent fc4404a391
commit f7ed037ba6
7 changed files with 172 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
View file

@ -16,7 +16,13 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
const $q = useQuasar();
const storeCommand = useCommandMainStore();
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
const {
dialogConfirm,
date2Thai,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const { statusText } = useTransferDataStore();
const props = defineProps({
@ -166,7 +172,14 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""} ${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -429,44 +442,21 @@ watch(
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<div>
{{
props.row.position !== null
? props.row.position
: ""
}}{{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
</div>
<div>
{{ props.row.root !== null ? props.row.root : "" }}
{{
props.row.rootShortName !== null
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div>
{{
props.row.nodeName !== null
? props.row.nodeName
: "-"
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{
props.row.position !== null ? props.row.position : ""
}}
{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>

95
src/modules/05_placement/components/AppointMent/DialogOrders.vue
View file

@ -19,7 +19,13 @@ const $q = useQuasar();
const storeFn = useTransferDataStore();
const storeCommand = useCommandMainStore();
const { statusText } = storeFn;
const { dialogConfirm, onSearchDataTable, date2Thai } = useCounterMixin();
const {
dialogConfirm,
onSearchDataTable,
date2Thai,
findOrgNameHtml,
findOrgName,
} = useCounterMixin();
/**
* props
@ -163,7 +169,22 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${
row.positionExecutive !== null
? `${row.positionExecutive}${
row.positionExecutiveField
? ` (${row.positionExecutiveField})`
: ""
}`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -436,44 +457,38 @@ watch(
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<div>
{{
props.row.position !== null
? props.row.position
: "-"
}}{{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
</div>
<div>
{{ props.row.root !== null ? props.row.root : "-" }}
{{
props.row.rootShortName !== null
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div>
{{
props.row.nodeName !== null
? props.row.nodeName
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{
props.row.position !== null ? props.row.position : ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
<!-- {{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}} -->
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div>
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>
<div v-else-if="col.name == 'createdAt'">

63
src/modules/05_placement/components/Receive/DialogOrders.vue
View file

@ -32,7 +32,13 @@ const dataMapToSend = computed(() => {
}));
});
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
const {
dialogConfirm,
date2Thai,
onSearchDataTable,
findOrgName,
findOrgNameHtml,
} = mixin;
const rows = defineModel<any[]>("rows", { required: true });
const rowsData = defineModel<any[]>("rowsData", { required: true });
@ -136,7 +142,14 @@ const columns2 = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
format: (val, row) => {
return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -324,29 +337,33 @@ watchEffect(() => {
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.root !== null ? props.row.root : "-" }}
{{
props.row.rootShortName !== null
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.nodeName !== null
? props.row.nodeName
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{ props.row.position !== null ? props.row.position : ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<!-- <div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div> -->
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>

10
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -38,6 +38,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -163,7 +164,14 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
format: (val, row) => {
return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

22
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -37,6 +37,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = useCounterMixin();
const status = ref<string>("");
@ -147,9 +148,24 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
// format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// },
format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${
row.positionExecutive !== null
? `${row.positionExecutive}${
row.positionExecutiveField
? ` (${row.positionExecutiveField})`
: ""
}`
: ""
} ${findOrgName(row)}`;
},
},
{
name: "dateOfBirth",

10
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -36,6 +36,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -166,7 +167,14 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""} ${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

12
src/modules/05_placement/views/08_otherMain.vue
View file

@ -35,6 +35,7 @@ const {
dialogRemove,
onSearchDataTable,
findChildNameHtml,
findOrgName,
} = useCounterMixin();
const modal = ref<boolean>(false);
@ -134,8 +135,15 @@ const columns = ref<QTableProps["columns"]>([
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionReturn.replace(/\n/g, " ");
format: (val, row) => {
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",