refactor(PosmasterNo): replace formatPosmasterNo

src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue

@@ -5,6 +5,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
 import { usePagination } from "@/composables/usePagination";
+import { formatPosmasterNo } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -72,9 +73,12 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.orgShortName && row.posMasterNo
-        ? `${row.orgShortName} ${row.posMasterNo}`
-        : "-";
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
     },
   },
   {

src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue

@@ -19,6 +19,7 @@ import DialogMoveLevel from "@/modules/13_salary/components/04_salaryLists/Dialo
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
+import { formatPosmasterNo } from "@/utils/function";
 
 /** use*/
 const $q = useQuasar();
@@ -87,9 +88,12 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.orgShortName && row.posMasterNo
-        ? `${row.orgShortName} ${row.posMasterNo}`
-        : "-";
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
     },
   },
   {

src/modules/13_salary/components/04_salaryLists/TableTypePending.vue

@@ -19,6 +19,7 @@ import DialogInfo from "@/modules/13_salary/components/DialogInfoMain.vue";
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
+import { formatPosmasterNo } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -98,9 +99,12 @@ const columns = ref<QTableColumn[]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.orgShortName && row.posMasterNo
-        ? `${row.orgShortName} ${row.posMasterNo}`
-        : "-";
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
     },
   },
   {

src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue

@@ -5,6 +5,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
 import { usePagination } from "@/composables/usePagination";
+import { formatPosmasterNo } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -71,9 +72,12 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.orgShortName && row.posMasterNo
-        ? `${row.orgShortName} ${row.posMasterNo}`
-        : "-";
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
     },
   },
   {

src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue

@@ -5,6 +5,7 @@ import { useQuasar } from "quasar";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
+import { formatPosmasterNo } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -84,6 +85,14 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "orgShortName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
+    },
   },
   {
     name: "position",

src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue

@@ -6,6 +6,7 @@ import { checkPermission } from "@/utils/permissions";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
+import { formatPosmasterNo } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -98,9 +99,12 @@ const columns = ref<QTableColumn[]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.orgShortName && row.posMasterNo
-        ? `${row.orgShortName} ${row.posMasterNo}`
-        : "-";
+      return formatPosmasterNo(
+        row.orgShortName,
+        row.posMasterNoPrefix,
+        row.posMasterNo,
+        row.posMasterNoSuffix
+      );
     },
   },