refactor(PosmasterNo): replace formatPosmasterNo

src/modules/20_positionTemp/components/DialogMovePos.vue

@@ -50,7 +50,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: {

src/modules/20_positionTemp/components/DialogSuccession.vue

@@ -5,6 +5,7 @@ import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePositionEmp } from "@/modules/20_positionTemp/store/organizational";
+import { formatPosmasterNo } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -135,11 +136,12 @@ async function fetchTable() {
       const data = res.data.result.data;
       const list = data.map((e: PosMaster) => ({
         ...e,
-        posMasterNo:
-          (e.orgShortname !== null ? e.orgShortname : "") +
-          (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") +
-          (e.posMasterNo !== null ? e.posMasterNo : "") +
-          (e.posMasterNoSuffix !== null ? e.posMasterNoPrefix : ""),
+        posMasterNo: formatPosmasterNo(
+          e.orgShortname,
+          e.posMasterNoPrefix,
+          e.posMasterNo.toString(),
+          e.posMasterNoSuffix ?? ""
+        ),
       }));
       rows.value = list;
     })

src/modules/20_positionTemp/components/TableMain.vue

@@ -719,7 +719,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"