refactor(PosmasterNo): replace formatPosmasterNo
This commit is contained in:
parent
6b2d1781b0
commit
34f33e57ac
25 changed files with 152 additions and 58 deletions
|
|
@ -48,7 +48,7 @@ const modal = defineModel<boolean>("modal", { required: true });
|
|||
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
|
||||
const totalPage = defineModel<number>("totalPage", { required: true });
|
||||
const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
|
||||
const columns = defineModel<QTableProps[]>("columns", {});
|
||||
const columns = defineModel<QTableProps['columns']>("columns", {});
|
||||
const rows = defineModel<PosMaster2[]>("rows", { required: true });
|
||||
const props = defineProps({
|
||||
fetchDataTree: {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import { checkPermission } from "@/utils/permissions";
|
|||
import { updateCurrentPage } from "@/utils/function";
|
||||
import { useOrganizational } from "@/modules/02_organization/store/organizational";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type { QTableProps } from "quasar";
|
||||
|
|
@ -205,6 +206,14 @@ const columns = ref<QTableProps["columns"]>([
|
|||
sortable: false,
|
||||
field: "posMasterNo",
|
||||
headerStyle: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNoMain,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
},
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
|
|
@ -1124,7 +1133,7 @@ watch(
|
|||
<DialogMovePos
|
||||
v-model:modal="modalDialogMMove"
|
||||
v-model:nodeTree="nodeTree"
|
||||
v-model:columns="columns as QTableProps[]"
|
||||
v-model:columns="columns"
|
||||
v-model:rows="posMaster"
|
||||
v-model:totalPage="totalPage"
|
||||
v-model:reqMaster="reqMaster"
|
||||
|
|
|
|||
|
|
@ -108,6 +108,11 @@ export const useOrganizational = defineStore("organizationalStore", () => {
|
|||
posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,
|
||||
posExecutiveName: e.posExecutiveName,
|
||||
isSit: e.isSit,
|
||||
orgShortname: e.orgShortname,
|
||||
posMasterNoPrefix: e.posMasterNoPrefix,
|
||||
posMasterNoSuffix: e.posMasterNoSuffix,
|
||||
posMasterNoMain: e.posMasterNo,
|
||||
|
||||
}));
|
||||
|
||||
return newPosMaster || [];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue