From 8fc09566cc3ee8d0dae10992de31d0f09f257bb4 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 08 七月 2025 17:58:04 +0800
Subject: [PATCH] 1、删除通过审核进入正式库存的采购记录，页面弹出报错信息 2、开发首页模块 3、开发设备领用记录 4、调整生产明细不能为负数 5、修复采购登记人匹配问题
---
src/views/procureMent/index.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/procureMent/index.vue b/src/views/procureMent/index.vue
index 3881e50..24929ac 100644
--- a/src/views/procureMent/index.vue
+++ b/src/views/procureMent/index.vue
@@ -20,9 +20,9 @@
<el-button type="primary" :icon="Plus" @click="handleAdd"
>鏂板缓
</el-button>
- <el-button type="danger" :icon="Delete" @click="handleDelete"
+ <!-- <el-button type="danger" :icon="Delete" @click="handleDelete"
>鍒犻櫎
- </el-button>
+ </el-button> -->
</el-row>
<!-- 琛ㄦ牸缁勪欢 -->
<data-table
@@ -76,8 +76,12 @@
delPR
} from "@/api/procureMent";
import { useDelete } from "@/hooks/useDelete";
-
+const userStore = useUserStore();
import useUserStore from "@/store/modules/user";
+let userList = ref([]);
+userStore.getUserList().then((res) => {
+ userList.value = res;
+});
// 寮曞叆瀛楀吀鏁版嵁
const { proxy } = getCurrentInstance();
const dialogFormVisible = ref(false);
@@ -109,7 +113,7 @@
// 杩欓噷娣诲姞瀹為檯鐨勬煡璇㈤�昏緫
getList();
};
-const userStore = useUserStore();
+
// 鑾峰彇鐢ㄦ埛淇℃伅
const userInfo = ref({});
onMounted(async () => {
@@ -148,7 +152,13 @@
{ prop: "totalPriceIncludingTax", label: "鎬讳环锛堝惈绋庯級", minWidth: 100 },
{ prop: "taxRate", label: "绋庣巼", minWidth: 100 },
{ prop: "priceExcludingTax", label: "涓嶅惈绋庡崟浠�", minWidth: 100 },
- { prop: "registrantId", label: "鐧昏浜�", minWidth: 100 },
+ { prop: "registrantId", label: "鐧昏浜�", minWidth: 100,
+ formatter: (row) => {
+ // 鍖归厤鐢ㄦ埛淇℃伅
+ const user = userList.value.find((user) => user.userId === row.registrantId);
+ return user ? user.nickName : "鏈煡鐢ㄦ埛";
+ },
+ },
{ prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
]);
--
Gitblit v1.9.3