From fcf94011d3670b0c905b24c06a5f62f2d71b1e95 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Tue, 11 Jun 2024 08:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=8D=B1=E9=99=A9?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->=E6=8E=A5=E5=8F=97?=
 =?UTF-8?q?=E4=BA=A4=E5=BA=95=E4=BA=BA=E4=BB=8E=E6=98=BE=E7=A4=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=EF=BC=9B=20=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=8D=B1?=
 =?UTF-8?q?=E9=99=A9=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=98=BE=E7=A4=BA=E5=8A=A8=E7=81=AB=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=8E=B0=E6=88=90?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=B8=85=E7=90=86=EF=BC=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=81=97=E7=95=99=E7=81=AB=E7=A7=8D=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_list/components/detail_cfd.vue    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
index 0422aaa..1263ea0 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
@@ -75,6 +75,25 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
+        <tr>
+          <td class="bbg">动火是否完成</td>
+          <td>
+            <span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
+            <span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
+          </td>
+          <td class="bbg">作业现场是否清理</td>
+          <td>
+            <span v-if="pd.SITE_CLEANED == 1">已清理</span>
+            <span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="bbg">是否存在遗留火种</td>
+          <td>
+            <span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
+            <span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
+          </td>
+        </tr>
         <tr>
           <td colspan="4">
             <table class="table-ui">
@@ -146,13 +165,23 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
+            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
+              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
             </div>
           </td>
         </tr>
+<!--        <tr>-->
+<!--          <td class="bbg">接受交底人</td>-->
+<!--          <td colspan="10">-->
+<!--            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">-->
+<!--              <span>签字：</span>-->
+<!--              <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">-->
+<!--              <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>-->
+<!--            </div>-->
+<!--          </td>-->
+<!--        </tr>-->
         <tr>
           <td class="bbg">监护人</td>
           <td colspan="3">
@@ -267,6 +296,7 @@ export default {
       imgList: [],
       imgList1: [],
       otherProtectiveMeasures: [],
+      acceptConfessList: [],
       confessList: []
     }
   },
@@ -312,6 +342,11 @@ export default {
             this.confessList.push(item)
           }
         })
+        data.pd.acceptConfessList.forEach(item => {
+          if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
+            this.acceptConfessList.push(item)
+          }
+        })
         for (let i = 0; i < data.measuresList.length; i++) {
           // 将字符串转成数组
           const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')