From 11e1de7bb345bc937cce53a2ac7672476b5b4db3 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 02 二月 2026 16:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/safeProduction/dangerInvestigation/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index 7ff2a64..90093fa 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -125,7 +125,7 @@
<el-button link
type="primary"
size="small"
- :disabled="!isPeople(scope.row.rectifyUserId)"
+ :disabled="scope.row.isRectify"
@click="openForm('edit2', scope.row)">鏁存敼</el-button>
<el-button link
type="primary"
@@ -659,6 +659,14 @@
tableLoading.value = false;
tableData.value = res.data.records;
total.value = res.data.total;
+ tableData.value.forEach(item => {
+ // console.log(item.rectifyUserId, currentUserId.value, "=======");
+ if (Number(item.rectifyUserId) != Number(currentUserId.value)) {
+ item.isRectify = true;
+ } else {
+ item.isRectify = false;
+ }
+ });
return res;
})
.catch(() => {
@@ -893,8 +901,8 @@
proxy.$modal.msg("宸插彇娑�");
});
};
- const isPeople = row => {
- return row.rectifyUserId === Number(currentUserId.value);
+ const isPeople = rectifyUserId => {
+ return Number(rectifyUserId) == Number(currentUserId.value);
};
/**
@@ -976,11 +984,11 @@
};
onMounted(() => {
+ getCurrentFactoryName();
getList();
userListNoPage().then(res => {
userList.value = res.data;
});
- getCurrentFactoryName();
});
// 涓婁紶闄勪欢
const handleUpload = async () => {
--
Gitblit v1.9.3