From 3739a47340c8d8b6edf5fdcbb0534f5fc8d96530 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 29 一月 2026 15:02:38 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/safeProduction/dangerInvestigation/index.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/views/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index a918bef..1878370 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -215,7 +215,7 @@
prop="createUser">
<el-select v-model="form.createUser"
placeholder="璇烽�夋嫨"
- @change="handleChange"
+ disabled
clearable>
<el-option v-for="item in userList"
:key="item.userId"
@@ -228,14 +228,13 @@
<el-form-item label="涓婃姤鏃堕棿锛�"
prop="createTime">
<el-date-picker style="width: 100%"
- readonly
+ disabled
v-model="form.createTime"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable
- :disabled="operationType === 'view'" />
+ clearable />
</el-form-item>
</el-col>
</el-row>
@@ -263,8 +262,7 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable
- :disabled="operationType === 'view'" />
+ clearable />
</el-form-item>
</el-col>
</el-row>
@@ -288,7 +286,9 @@
<span class="detail-title">{{ form.type }}</span>
</el-descriptions-item>
<el-descriptions-item label="闅愭偅椋庨櫓绛夌骇">
- <span class="detail-title">{{ form.riskLevel }}</span>
+ <el-tag :type="getTypeTagType(form.riskLevel)">
+ {{ form.riskLevel }}
+ </el-tag>
</el-descriptions-item>
<el-descriptions-item label="涓婃姤浜�">
<span class="detail-title">{{ form.createUserName }}</span>
@@ -343,8 +343,7 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
- clearable
- :disabled="operationType === 'view'" />
+ clearable />
</el-form-item>
</el-col>
</el-row>
@@ -466,6 +465,16 @@
return "楠屾敹椤甸潰";
}
};
+ // 鑾峰彇绫诲瀷鏍囩绫诲瀷
+ const getTypeTagType = type => {
+ const typeMap = {
+ 杈冨ぇ椋庨櫓: "warning",
+ 浣庨闄�: "info",
+ 涓�鑸闄�: "info",
+ 閲嶅ぇ椋庨櫓: "danger",
+ };
+ return typeMap[type] || "info";
+ };
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
const dialogFormVisible = ref(false);
@@ -574,12 +583,6 @@
customer: "",
});
- const handleChange = userId => {
- const selectedUser = userList.value.find(user => user.userId === userId);
- if (selectedUser) {
- form.value.createUserName = selectedUser.nickName;
- }
- };
const handleChange2 = userId => {
const selectedUser = userList.value.find(user => user.userId === userId);
if (selectedUser) {
@@ -710,8 +713,8 @@
hiddenCode: "", // 闅愭偅缂栧彿
location: "", // 闅愭偅浣嶇疆
hiddenDesc: "", // 闅愭偅鎻忚堪
- createUser: "", // 涓婃姤浜�
- createUserName: "",
+ createUser: Number(currentUserId.value), // 涓婃姤浜�
+ createUserName: currentUserName.value,
createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 涓婃姤鏃堕棿
rectifyUserId: "", // 鏁存敼璐ｄ换浜�
rectifyUserName: "",
@@ -940,9 +943,11 @@
});
};
const currentUserId = ref("");
+ const currentUserName = ref("");
const getCurrentFactoryName = async () => {
let res = await userStore.getInfo();
currentUserId.value = res.user.userId;
+ currentUserName.value = res.user.nickName;
};
/**
--
Gitblit v1.9.3