diff --git a/public/File/สรรหาสอบแข่งขัน_จำนวนผู้สอบทั้งหมด.xlsx b/public/File/สรรหาสอบแข่งขัน_จำนวนผู้สอบทั้งหมด.xlsx index bee4fe908..0611f9be0 100644 Binary files a/public/File/สรรหาสอบแข่งขัน_จำนวนผู้สอบทั้งหมด.xlsx and b/public/File/สรรหาสอบแข่งขัน_จำนวนผู้สอบทั้งหมด.xlsx differ diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index 8fec84eac..02830028f 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -37,6 +37,7 @@ const { date2Thai, dialogRemove, onSearchDataTable, + findOrgNameHtml, } = mixin; const status = ref(""); @@ -635,8 +636,32 @@ onMounted(async () => {
-
-
+ {{ props.row.position !== null ? props.row.position : "" + }}{{ + props.row.posLevelName !== null + ? `${props.row.posLevelName}` + : "" + }} + {{ + props.row.nodeShortName !== null + ? `(${props.row.nodeShortName}${props.row.posMasterNo})` + : "" + }} + +
+ {{ findOrgNameHtml(props.row) }} +
+
{{ col.value ? col.value : "-" }} diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue index c992b92c2..7859676c9 100644 --- a/src/modules/05_placement/views/06_appointPromoteMain.vue +++ b/src/modules/05_placement/views/06_appointPromoteMain.vue @@ -614,45 +614,39 @@ onMounted(async () => {
-
-
- {{ - props.row.position !== null ? props.row.position : "" - }}{{ - props.row.posLevelName !== null - ? `${props.row.posLevelName}` - : "" - }} - {{ - props.row.nodeShortName !== null - ? `(${props.row.nodeShortName}${props.row.posMasterNo})` - : "" - }} - -
- {{ - props.row.positionExecutive !== null - ? `${props.row.positionExecutive}${ - props.row.positionExecutiveField - ? ` (${props.row.positionExecutiveField})` - : "" - }` - : "" - }} -
-
-
- {{ findOrgNameHtml(props.row) }} -
+ {{ + props.row.nodeShortName !== null + ? `(${props.row.nodeShortName}${props.row.posMasterNo})` + : "" + }} +
+ {{ + props.row.positionExecutive !== null + ? `${props.row.positionExecutive}${ + props.row.positionExecutiveField + ? ` (${props.row.positionExecutiveField})` + : "" + }` + : "" + }} +
+
+ {{ findOrgNameHtml(props.row) }}
-
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue index 4a4bbff29..80d500bb7 100644 --- a/src/modules/05_placement/views/07_appointEmployeeMain.vue +++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue @@ -35,6 +35,7 @@ const { date2Thai, dialogRemove, onSearchDataTable, + findOrgNameHtml, } = mixin; const status = ref(""); @@ -584,41 +585,19 @@ onMounted(async () => {
-
-
- {{ - 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})` - : "" - }} -
-
- {{ props.row.root !== null ? props.row.root : "-" }} - {{ - props.row.rootShortName !== null - ? `(${props.row.rootShortName})` - : "" - }} -
-
- {{ - props.row.nodeName !== null ? props.row.nodeName : "" - }} - {{ - props.row.nodeShortName !== null - ? `(${props.row.nodeShortName}${props.row.posMasterNo})` - : "" - }} -
+ {{ props.row.position !== null ? props.row.position : "" }} + {{ + props.row.posLevelName !== null + ? `${props.row.posLevelName}` + : "" + }} + {{ + props.row.nodeShortName !== null + ? `(${props.row.nodeShortName}${props.row.posMasterNo})` + : "" + }} +
+ {{ findOrgNameHtml(props.row) }}
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue index 95a9fdb3c..ac3e91c5d 100644 --- a/src/modules/05_placement/views/08_otherMain.vue +++ b/src/modules/05_placement/views/08_otherMain.vue @@ -489,41 +489,37 @@ onMounted(() => {
-
-
- - {{ - props.row.position !== null ? props.row.position : "" - }}{{ - props.row.posLevelName !== null - ? `${props.row.posLevelName}` - : "" - }} - {{ - props.row.nodeShortName !== null - ? `(${props.row.nodeShortName}${props.row.posMasterNo})` - : "" - }} -
- -
- {{ findChildNameHtml(props.row) }} -
+ {{ props.row.position !== null ? props.row.position : "" + }}{{ + props.row.posLevelName !== null + ? `${props.row.posLevelName}` + : "" + }} + + {{ + props.row.nodeShortName !== null + ? `(${props.row.nodeShortName}${props.row.posMasterNo})` + : "" + }} +
+ {{ + props.row.positionExecutive !== null + ? `${props.row.positionExecutive}${ + props.row.positionExecutiveField + ? ` (${props.row.positionExecutiveField})` + : "" + }` + : "" + }} +
+
+ {{ findChildNameHtml(props.row) }}