refactor(PosmasterNo): replace formatPosmasterNo
This commit is contained in:
parent
6b2d1781b0
commit
34f33e57ac
25 changed files with 152 additions and 58 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import { defineStore } from "pinia";
|
||||
import { ref } from "vue";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
/** importType*/
|
||||
import type { PositionMaim } from "@/modules/05_placement/interface/response/SelectOrg";
|
||||
import type { DataPositionNo } from "@/modules/05_placement/interface/index/SelectOrg";
|
||||
|
|
@ -12,12 +12,13 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
|
|||
const listPosNo: DataPositionNo[] = data.map((e: PositionMaim) => ({
|
||||
id: e.id,
|
||||
isPosition: e.isPosition,
|
||||
posMasterNo:
|
||||
e.orgShortname +
|
||||
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
|
||||
" " +
|
||||
e.posMasterNo +
|
||||
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
|
||||
posMasterNo: formatPosmasterNo(
|
||||
e.orgShortname,
|
||||
e.posMasterNoPrefix,
|
||||
e.posMasterNo.toString(),
|
||||
e.posMasterNoSuffix
|
||||
),
|
||||
|
||||
positionName: e.positionName,
|
||||
posTypeName: e.posTypeName,
|
||||
posLevelName: e.posLevelName,
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return findPosMasterNoOld(row);
|
||||
return row.positionNumberOld ?? "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue