From 682124f3e573a24523dd643f23d16bb7d3c7e08d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 29 九月 2026 18:22:17 +0800
Subject: [PATCH] fix(inventory): 移除不合格库存相关字段并修复日期时间处理
---
src/views/equipmentManagement/calibration/index.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/equipmentManagement/calibration/index.vue b/src/views/equipmentManagement/calibration/index.vue
index 0d5b9cf..d1ce0bb 100644
--- a/src/views/equipmentManagement/calibration/index.vue
+++ b/src/views/equipmentManagement/calibration/index.vue
@@ -69,8 +69,16 @@
import useUserStore from "@/store/modules/user.js";
import CalibrationDia from "@/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue";
import {ledgerRecordListPage, ledgerRecordDelete} from "@/api/equipmentManagement/calibration.js";
+import {userListNoPageByTenantId} from "@/api/system/user.js";
const { proxy } = getCurrentInstance();
const userStore = useUserStore()
+
+const userList = ref([]);
+const getUserName = (userId) => {
+ if (!userId) return "--";
+ const user = userList.value.find(u => String(u.userId) === String(userId));
+ return user ? user.nickName : userId;
+};
const data = reactive({
searchForm: {
@@ -164,8 +172,9 @@
},
{
label: "纭浜�",
- prop: "confirmerName",
+ prop: "confirmerId",
width: 120,
+ formatData: (cell) => getUserName(cell),
},
{
label: "褰曞叆浜�",
@@ -305,7 +314,9 @@
proxy.$modal.msg("宸插彇娑�");
});
};
-onMounted(() => {
+onMounted(async () => {
+ const { data } = await userListNoPageByTenantId();
+ userList.value = data || [];
getList();
});
</script>
--
Gitblit v1.9.3