From f12e9e70bbe4f9f3bb2f5c82893b498f4712928a Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Thu, 4 Sep 2025 19:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ppeTool/index.vue    | 8 ++++----
 src/views/ppeTool/toolForm.vue | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/ppeTool/index.vue b/src/views/ppeTool/index.vue
index 7bc727b..a7c1ea7 100644
--- a/src/views/ppeTool/index.vue
+++ b/src/views/ppeTool/index.vue
@@ -24,8 +24,8 @@
                                     :value="item.id" />
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="工具名称">
-                            <el-select v-model="queryParams.toolName" placeholder="请选择工具名称" clearable
+                        <el-form-item label="工具及防护用品名称">
+                            <el-select v-model="queryParams.toolName" placeholder="请选择工具及防护用品名称" clearable
                                 style="width: 200px">
                                 <el-option v-for="dict in ppe_tool_name" :key="dict.value" :label="dict.label"
                                     :value="dict.value" />
@@ -52,10 +52,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="dependencyName" label="属地" min-width="200" />
-                <el-table-column prop="escUserName" label="ESC" min-width="100" />
+                <el-table-column prop="escUserName" label="ESC" min-width="100" show-overflow-tooltip/>
                 <el-table-column prop="deptName" label="部门" min-width="150" />
                 <el-table-column prop="toolName" label="工具及防护用品名称" width="200" />
-                <el-table-column prop="toolName" label="工具名称" min-width="180" />
+                <el-table-column prop="protectionName" label="工具名称" min-width="180" show-overflow-tooltip/>
                 <el-table-column prop="toolSn" label="工具编号" min-width="130" />
                 <el-table-column prop="expireDate" label="到期日期" min-width="130">
                     <template #default="scope">
diff --git a/src/views/ppeTool/toolForm.vue b/src/views/ppeTool/toolForm.vue
index 7ee7a17..33652dd 100644
--- a/src/views/ppeTool/toolForm.vue
+++ b/src/views/ppeTool/toolForm.vue
@@ -26,8 +26,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8" v-if="ruleForm.toolName == '其他'">
-                                <el-form-item label="工具名称" prop="toolSn">
-                                    <el-input v-model="ruleForm.toolSn" placeholder="请输入工具名称" clearable />
+                                <el-form-item label="工具名称" prop="protectionName">
+                                    <el-input v-model="ruleForm.protectionName" placeholder="请输入工具名称" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
@@ -140,6 +140,7 @@ const data = reactive({
     ruleForm: {},
     rules: {
         toolName: [{ required: true, message: "工具及防护用品名称不能为空", trigger: "change" }],
+        protectionName: [{ required: true, message: "工具名称不能为空", trigger: "blur" }],
         toolSn: [{ required: true, message: "工具编号不能为空", trigger: "blur" }],
         deptId: [{ required: true, message: "部门不能为空", trigger: "change" }],
         dependencyId: [{ required: true, message: "属地不能为空", trigger: "change" }],