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:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-17 10:16:50 +07:00
parent 8a5a9f3e20
commit a3bfe8dd51
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/16_positionEmployee/components/DialogSortPosition.vue
View file

@ -104,7 +104,7 @@ function getData() {
const dataMap = dataList.map((item: any) => ({ const dataMap = dataList.map((item: any) => ({
id: item.id, id: item.id,
name: `${item.orgShortname}${ name: `${item.orgShortname} ${
item.posMasterNoPrefix ? item.posMasterNoPrefix : "" item.posMasterNoPrefix ? item.posMasterNoPrefix : ""
}${item.posMasterNo ? item.posMasterNo : ""}${ }${item.posMasterNo ? item.posMasterNo : ""}${
item.posMasterNoSuffix ? item.posMasterNoSuffix : "" item.posMasterNoSuffix ? item.posMasterNoSuffix : ""

2
src/modules/16_positionEmployee/store/organizational.ts
View file

@ -73,7 +73,7 @@ export const usePositionEmp = defineStore("positionEmpStore", () => {
posMasterNo: posMasterNo:
e.orgShortname + e.orgShortname +
(e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") +
(e.posMasterNo ? e.posMasterNo : "") + (e.posMasterNo ? ` ${e.posMasterNo}` : "") +
(e.posMasterNoSuffix ? e.posMasterNoSuffix : ""), (e.posMasterNoSuffix ? e.posMasterNoSuffix : ""),
positionName: e.isSit ? e.profilePosition : e.positionName, positionName: e.isSit ? e.profilePosition : e.positionName,
posTypeName: e.isSit ? e.profilePostype : e.posTypeName, posTypeName: e.isSit ? e.profilePostype : e.posTypeName,

4
src/modules/19_condition/view/Main.vue
View file

@ -65,8 +65,8 @@ const columns = ref<QTableProps["columns"]>([
field: "posMasterNo", field: "posMasterNo",
format(val, row) { format(val, row) {
return row.isSit return row.isSit
? `${row.orgShortname}${row.posMasterNo}(นั่งทับตำแหน่ง)` ? `${row.orgShortname} ${row.posMasterNo}(นั่งทับตำแหน่ง)`
: `${row.orgShortname}${row.posMasterNo}`; : `${row.orgShortname} ${row.posMasterNo}`;
}, },
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",