From 7ce609d18a9f947b1b29ab99165c89efe01774b6 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Wed, 19 Jun 2024 17:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=B7=A5=E9=AA=8C=E6=94=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E5=BC=A0=E7=AD=BE=E5=AD=97=E5=9B=BE=E7=89=87=E9=80=BB?=
 =?UTF-8?q?=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 | 20 ++++++++---
 .../pigeonhole/components/detail.vue          | 19 ++++++++---
 src/views/map/dialog/hotworkFirst.vue         | 33 ++++++++++++-------
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue
index 53ce14b..e2f2347 100644
--- a/src/views/hotwork_cfd/hotwork/components/detail.vue
+++ b/src/views/hotwork_cfd/hotwork/components/detail.vue
@@ -165,14 +165,15 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-              <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
+            <div v-for="item in acceptConfessList" :key="item.USER_ID">
+              <div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
+                <span>签字：</span>
+                <img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
+                <span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
+              </div>
             </div>
           </td>
         </tr>
-
         <tr>
           <td class="bbg">监护人</td>
           <td colspan="3">
@@ -333,7 +334,16 @@ 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)
+        //   }
+        // })
         data.pd.acceptConfessList.forEach(item => {
+          // 将 APPROVAL_SIGNATURE 转换为数组
+          if (item.APPROVAL_SIGNATURE) {
+            item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
+          }
           if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
             this.acceptConfessList.push(item)
           }
diff --git a/src/views/hotwork_cfd/pigeonhole/components/detail.vue b/src/views/hotwork_cfd/pigeonhole/components/detail.vue
index b1e05f3..3d9b64b 100644
--- a/src/views/hotwork_cfd/pigeonhole/components/detail.vue
+++ b/src/views/hotwork_cfd/pigeonhole/components/detail.vue
@@ -164,10 +164,12 @@
           <tr>
             <td class="bbg">接受交底人</td>
             <td colspan="10">
-              <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
-                <span>签字：</span>
-                <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-                <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
+              <div v-for="item in acceptConfessList" :key="item.USER_ID">
+                <div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
+                  <span>签字：</span>
+                  <img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
+                  <span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
+                </div>
               </div>
             </td>
           </tr>
@@ -415,7 +417,16 @@ 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)
+        //   }
+        // })
         data.pd.acceptConfessList.forEach(item => {
+          // 将 APPROVAL_SIGNATURE 转换为数组
+          if (item.APPROVAL_SIGNATURE) {
+            item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
+          }
           if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
             this.acceptConfessList.push(item)
           }
diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 19a8b7f..9e4c116 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -138,10 +138,12 @@
       <tr>
         <td class="bbg-transparent">接受交底人</td>
         <td colspan="10">
-          <div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
-            <span>签字：</span>
-            <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
-            <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
+          <div v-for="item in acceptConfessList" :key="item.USER_ID">
+            <div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
+              <span>签字：</span>
+              <img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
+              <span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
+            </div>
           </div>
         </td>
       </tr>
@@ -167,7 +169,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">
@@ -177,7 +179,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">
@@ -187,7 +189,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">
@@ -197,7 +199,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">
@@ -207,7 +209,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">
@@ -217,7 +219,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">
@@ -227,7 +229,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">
@@ -319,7 +321,16 @@ 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)
+        //   }
+        // })
         data.pd.acceptConfessList.forEach(item => {
+          // 将 APPROVAL_SIGNATURE 转换为数组
+          if (item.APPROVAL_SIGNATURE) {
+            item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
+          }
           if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
             this.acceptConfessList.push(item)
           }