From 00a4807bf5339d0c52a4c0c59cb3be4f08faea4a Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 17 May 2024 01:17:07 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=8A=A8?=
 =?UTF-8?q?=E7=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/specialWork/fireWork.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue
index 059cce97..0d0cecb6 100644
--- a/src/views/projectFront/specialWork/fireWork.vue
+++ b/src/views/projectFront/specialWork/fireWork.vue
@@ -65,8 +65,8 @@
                            <div :style="scope.row.hotWorkLevel == '特级' ?'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''"> {{ scope.row.hotWorkLevel }}</div>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="动火人" prop="firemanName"></el-table-column>
-                    <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column>
+                    <el-table-column align="center" label="动火人及证书编号" prop="firemanAndCertificateNo"></el-table-column>
+                    <!-- <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column> -->
                     <el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
                     <el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
                     <!-- 状态 -->
@@ -339,15 +339,18 @@
                             <el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.assignmentPersonInChargeName }}
                             </el-form-item>
-                            <el-form-item label="动火人：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="动火人：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.firemanName }}
+                            </el-form-item> -->
+                            <el-form-item label="动火人及证书编号：" :label-width="formLabelWidthDetail">
+                                {{ workDetail.firemanAndCertificateNo }}
                             </el-form-item>
                             <el-form-item label="安全作业票编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.safetyWorkTicketCode }}
                             </el-form-item>
-                            <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
+                            <!-- <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.certificateNo }}
-                            </el-form-item>
+                            </el-form-item> -->
                             <el-form-item label="动火作业实施时间：" :label-width="formLabelWidthDetail">
                                 <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="daterange"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"