From 59c3d44b1a3fdd0d460ea58378c86a7d221bafe7 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 14 Jun 2024 17:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5=E5=92=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork_cfd/hotwork/components/detail.vue | 29 +++++++++----------
 .../pigeonhole/components/detail.vue          | 29 +++++++++----------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue
index 2bcb9b9..53ce14b 100644
--- a/src/views/hotwork_cfd/hotwork/components/detail.vue
+++ b/src/views/hotwork_cfd/hotwork/components/detail.vue
@@ -75,23 +75,20 @@
           <td class="bbg">动火作业实施时间</td>
           <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
         </tr>
-        <tr>
+        <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
           <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.FIRE_COMPLETED ==1">已完成</span>
-            <span v-else-if="pd.FIRE_COMPLETED ==0">未完成</span>
+            <span>已完成</span>
           </td>
-          <td class="bbg">作业现场是否清理</td>
+          <td class="bbg">动火是否完成</td>
           <td>
-            <span v-if="pd.SITE_CLEANED ==1">已清理</span>
-            <span v-else-if="pd.SITE_CLEANED ==1">未清理</span>
+            <span>已清理</span>
           </td>
         </tr>
-        <tr>
+        <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
           <td class="bbg">是否存在遗留火种</td>
           <td>
-            <span v-if="pd.NO_REMAINING_EMBERS ==1">无遗留火种</span>
-            <span v-else-if="pd.NO_REMAINING_EMBERS ==0">未确定现场是否存在遗留火种</span>
+            <span>无遗留火种</span>
           </td>
         </tr>
         <tr>
@@ -198,7 +195,7 @@
         </tr>
         <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+            <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -208,7 +205,7 @@
         </tr>
         <tr v-if="pd.BELONGING_SIGNATURE">
           <td colspan="6">
-            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+            <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -218,7 +215,7 @@
         </tr>
         <tr v-if="pd.LEADER_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
+            <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -228,7 +225,7 @@
         </tr>
         <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+            <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -238,7 +235,7 @@
         </tr>
         <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+            <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -248,7 +245,7 @@
         </tr>
         <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
           <td colspan="6">
-            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+            <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -258,7 +255,7 @@
         </tr>
         <tr v-if="imgList1.length>0">
           <td colspan="10">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+            <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
             <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
               <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
diff --git a/src/views/hotwork_cfd/pigeonhole/components/detail.vue b/src/views/hotwork_cfd/pigeonhole/components/detail.vue
index a60dc40..b1e05f3 100644
--- a/src/views/hotwork_cfd/pigeonhole/components/detail.vue
+++ b/src/views/hotwork_cfd/pigeonhole/components/detail.vue
@@ -74,23 +74,20 @@
             <td class="bbg">动火作业实施时间</td>
             <td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
           </tr>
-          <tr>
+          <tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
             <td class="bbg">动火是否完成</td>
             <td>
-              <span v-if="pd.FIRE_COMPLETED ==1">已完成</span>
-              <span v-else-if="pd.FIRE_COMPLETED ==0">未完成</span>
+              <span>已完成</span>
             </td>
-            <td class="bbg">作业现场是否清理</td>
+            <td class="bbg">动火是否完成</td>
             <td>
-              <span v-if="pd.SITE_CLEANED ==1">已清理</span>
-              <span v-else-if="pd.SITE_CLEANED ==1">未清理</span>
+              <span>已清理</span>
             </td>
           </tr>
-          <tr>
+          <tr v-if="pd.NO_REMAINING_EMBERS === '1'">
             <td class="bbg">是否存在遗留火种</td>
             <td>
-              <span v-if="pd.NO_REMAINING_EMBERS ==1">无遗留火种</span>
-              <span v-else-if="pd.NO_REMAINING_EMBERS ==0">未确定现场是否存在遗留火种</span>
+              <span>无遗留火种</span>
             </td>
           </tr>
           <tr>
@@ -196,7 +193,7 @@
           </tr>
           <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
             <td colspan="6">
-              <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
+              <div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -206,7 +203,7 @@
           </tr>
           <tr v-if="pd.BELONGING_SIGNATURE">
             <td colspan="6">
-              <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
+              <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@@ -216,7 +213,7 @@
           </tr>
           <tr v-if="pd.LEADER_USER_SIGNER_PATH">
             <td colspan="6">
-              <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
+              <div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -226,7 +223,7 @@
           </tr>
           <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
             <td colspan="6">
-              <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
+              <div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -236,7 +233,7 @@
           </tr>
           <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
             <td colspan="6">
-              <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
+              <div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -246,7 +243,7 @@
           </tr>
           <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
             <td colspan="6">
-              <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
+              <div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
               <div style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@@ -256,7 +253,7 @@
           </tr>
           <tr v-if="imgList1.length>0">
             <td colspan="10">
-              <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
+              <div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
               <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
                 <span>签字：</span>
                 <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">