From 0ae268ecab29456d8269c26787dacce3eadefc60 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Thu, 4 Sep 2025 09:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=B4=A8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85LLP=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ppeTool/index.vue                   |  1 +
 src/views/ppeTool/toolForm.vue                | 21 ++++++++++++-------
 .../components/QualificationDetailForm.vue    | 10 ++++-----
 .../components/QualificationDetailForm.vue    | 10 ++++-----
 .../safetyReview/examinerTasks/index.vue      |  6 +++---
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/views/ppeTool/index.vue b/src/views/ppeTool/index.vue
index b4e2d66..7bc727b 100644
--- a/src/views/ppeTool/index.vue
+++ b/src/views/ppeTool/index.vue
@@ -54,6 +54,7 @@
                 <el-table-column prop="dependencyName" label="属地" min-width="200" />
                 <el-table-column prop="escUserName" label="ESC" min-width="100" />
                 <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="toolSn" label="工具编号" min-width="130" />
                 <el-table-column prop="expireDate" label="到期日期" min-width="130">
diff --git a/src/views/ppeTool/toolForm.vue b/src/views/ppeTool/toolForm.vue
index d6d4f22..7ee7a17 100644
--- a/src/views/ppeTool/toolForm.vue
+++ b/src/views/ppeTool/toolForm.vue
@@ -18,13 +18,18 @@
                     <div class="applyFormContainer">
                         <el-row class="myRow" :gutter="20">
                             <el-col :span="8">
-                                <el-form-item label="工具名称" prop="toolName">
-                                    <el-select v-model="ruleForm.toolName" placeholder="请选择工具名称" clearable>
+                                <el-form-item label="工具及防护用品名称" prop="toolName">
+                                    <el-select v-model="ruleForm.toolName" placeholder="请选择工具及防护用品名称" clearable>
                                         <el-option v-for="dict in ppe_tool_name" :key="dict.value" :label="dict.label"
                                             :value="dict.value" />
                                     </el-select>
                                 </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>
+                            </el-col>
                             <el-col :span="8">
                                 <el-form-item label="工具编号" prop="toolSn">
                                     <el-input v-model="ruleForm.toolSn" placeholder="请输入工具编号" clearable />
@@ -32,14 +37,14 @@
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="部门" prop="deptId">
-                                    <el-tree-select v-model="ruleForm.deptId" :data="enabledDeptOptions"
+                                    <el-tree-select v-model="ruleForm.deptId" :data="enabledDeptOptions" filterable
                                         :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
                                         placeholder="请选择部门" check-strictly />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="属地" prop="dependencyId">
-                                    <el-select v-model="ruleForm.dependencyId" placeholder="请选择属地"
+                                <el-form-item label="属地" prop="dependencyId"> 
+                                    <el-select v-model="ruleForm.dependencyId" placeholder="请选择属地" 
                                         @change="handleChoseDependency">
                                         <el-option v-for="item in busDependencyData" :key="item.id"
                                             :label="item.dependencyName" :value="item.id" />
@@ -68,9 +73,9 @@
                                             将文件拖曳至此区域，或 <em>点击上传</em>
                                         </div>
                                     </el-upload>
-                                    <el-button class="downloadTemplateBtn" text v-if="ruleForm.toolName == '高压跨接盒标定'"
+                                    <el-button class="downloadTemplateBtn" text v-if="ruleForm.toolName == '高压跨接盒'"
                                         @click="downloadDocxTemplate('WI')">下载WI模板</el-button>
-                                    <el-button class="downloadTemplateBtn2" text v-if="ruleForm.toolName == '高压跨接盒标定'"
+                                    <el-button class="downloadTemplateBtn2" text v-if="ruleForm.toolName == '高压跨接盒'"
                                         @click="downloadDocxTemplate('BIAOQIANYL')">下载标签样例模板</el-button>
                                 </el-form-item>
                             </el-col>
@@ -134,7 +139,7 @@ const { ppe_tool_name } = proxy.useDict("ppe_tool_name")
 const data = reactive({
     ruleForm: {},
     rules: {
-        toolName: [{ required: true, message: "工具名称不能为空", trigger: "change" }],
+        toolName: [{ required: true, message: "工具及防护用品名称不能为空", trigger: "change" }],
         toolSn: [{ required: true, message: "工具编号不能为空", trigger: "blur" }],
         deptId: [{ required: true, message: "部门不能为空", trigger: "change" }],
         dependencyId: [{ required: true, message: "属地不能为空", trigger: "change" }],
diff --git a/src/views/qualification/escTask/components/QualificationDetailForm.vue b/src/views/qualification/escTask/components/QualificationDetailForm.vue
index ab8fdcb..f05014b 100644
--- a/src/views/qualification/escTask/components/QualificationDetailForm.vue
+++ b/src/views/qualification/escTask/components/QualificationDetailForm.vue
@@ -307,21 +307,21 @@
                                             placeholder="请选择急救证到期日期" style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="12" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证初领日期">
-                                        <el-date-picker v-model="beforeCondition.collectionDate" type="date"
+                                        <el-date-picker v-model="beforeConditionInfo.collectionDate" type="date"
                                             format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择电工证初领日期"
                                             style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="12" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证复审日期">
-                                        <el-date-picker v-model="beforeCondition.reviewDate" type="date"
+                                        <el-date-picker v-model="beforeConditionInfo.reviewDate" type="date"
                                             format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择电工证复审日期"
                                             style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="8" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证" prop="beforeCondition.certificatePhoto">
                                         <img :src="beforeConditionInfo.certificatePhoto.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.certificatePhoto"
                                             class="avatar viewFile"
diff --git a/src/views/qualification/myQualifications/components/QualificationDetailForm.vue b/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
index 9fc6bf1..a9dbf8a 100644
--- a/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
+++ b/src/views/qualification/myQualifications/components/QualificationDetailForm.vue
@@ -307,21 +307,21 @@
                                             placeholder="请选择急救证到期日期" style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="12" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证初领日期">
-                                        <el-date-picker v-model="beforeCondition.collectionDate" type="date"
+                                        <el-date-picker v-model="beforeConditionInfo.collectionDate" type="date"
                                             format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择电工证初领日期"
                                             style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="12" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证复审日期">
-                                        <el-date-picker v-model="beforeCondition.reviewDate" type="date"
+                                        <el-date-picker v-model="beforeConditionInfo.reviewDate" type="date"
                                             format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择电工证复审日期"
                                             style="width: 60%;" disabled />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8" v-if="beforeCondition.hasQualified.length > 0">
+                                <el-col :span="8" v-if="beforeConditionInfo.hasQualified.length > 0">
                                     <el-form-item label="电工证" prop="beforeCondition.certificatePhoto">
                                         <img :src="beforeConditionInfo.certificatePhoto.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.certificatePhoto"
                                             class="avatar viewFile"
diff --git a/src/views/safetyReview/examinerTasks/index.vue b/src/views/safetyReview/examinerTasks/index.vue
index 2380b14..98e2b3d 100644
--- a/src/views/safetyReview/examinerTasks/index.vue
+++ b/src/views/safetyReview/examinerTasks/index.vue
@@ -67,10 +67,10 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="130">
                     <template #default="scope">
-                        <el-button v-if="scope.row.reviewState != 1" type="primary" text class="replayTextBtn"
+                        <el-button type="primary" text class="replayTextBtn"
                             v-hasPermi="['examinerTasks:edit']" @click="handleEdit(scope.row)">编辑</el-button>
-                        <el-divider v-if="scope.row.reviewState != 1" direction="vertical" class="verticalLine" />
-                        <el-button v-if="scope.row.reviewState != 1" type="primary" text class="deleteTextBtn"
+                        <el-divider direction="vertical" class="verticalLine" />
+                        <el-button type="primary" text class="deleteTextBtn"
                             v-hasPermi="['examinerTasks:delete']" @click="handleDelete(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>