From 7b4b531a50749f254ad366767322789d9708c2f7 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Wed, 13 Dec 2023 11:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E7=94=B5=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricity/components/detail.vue         |  37 +-
 .../electricity/components/list.vue           |  47 +-
 .../pigeonhole/components/detail.vue          | 477 +++++++++++-------
 .../pigeonhole/components/list.vue            |   4 +-
 4 files changed, 358 insertions(+), 207 deletions(-)

diff --git a/src/views/gf/electricity/electricity/components/detail.vue b/src/views/gf/electricity/electricity/components/detail.vue
index b8c7468..1b34546 100644
--- a/src/views/gf/electricity/electricity/components/detail.vue
+++ b/src/views/gf/electricity/electricity/components/detail.vue
@@ -3,7 +3,6 @@
     <div id="printTest" class="app-container print-work">
       <div class="level-title">
         <h1>临时用电作业许可证</h1>
-        <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
       </div>
       <table class="table-ui">
         <tr>
@@ -92,7 +91,7 @@
                 <td>{{ index + 1 }}</td>
                 <td>{{ item.PROTECTIVE_MEASURES }}</td>
                 <td>
-                  <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
+                  <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
                   <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
                 </td>
                 <td>
@@ -132,50 +131,50 @@
         <tr>
           <td class="bbg">接受交底人</td>
           <td colspan="10">
-            <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
+            <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</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>
+        <tr v-if="pd.CONFIRM_USER_SIGNER_TIME">
           <td colspan="6">
             <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer v-if="pd.CONFIRM_USER_SIGNER_PATH" :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
               <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
-        <tr>
+        <tr v-if="pd.AUDIT_USER_SIGNER_TIME">
           <td colspan="6">
             <div>用电单位意见：{{ pd.AUDIT_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer v-if="pd.AUDIT_USER_SIGNER_PATH" :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
               <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
-        <tr>
+        <tr v-if="pd.APPROVE_USER_SIGNER_TIME">
           <td colspan="6">
             <div>配送电单位意见：{{ pd.APPROVE_CONTENT }}</div>
             <div style="text-align: right">
               <span>签字：</span>
-              <img v-viewer v-if="pd.APPROVE_USER_SIGNER_PATH" :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
               <span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
-        <tr>
-          <td colspan="6">
+        <tr v-if="imgList1.length>0">
+          <td colspan="10">
             <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
-            <div style="text-align: right">
+            <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
               <span>签字：</span>
-              <img v-viewer v-if="pd.ACCEPT_USER_SIGNER_PATH" :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
+              <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
+              <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
             </div>
           </td>
         </tr>
@@ -183,7 +182,7 @@
 
     </div>
     <div class="ui-height" />
-    <div class="ui-foot">
+    <div class="ui-foot" style="margin-left: 20px;margin-bottom: 20px;">
       <el-button type="primary" @click="goBack">返 回</el-button>
     </div>
   </div>
@@ -200,6 +199,8 @@ export default {
       pd: [], // 存放字段参数
       measuresList: [],
       gasList: [],
+      imgList: [],
+      imgList1: [],
       otherProtectiveMeasures: []
     }
   },
@@ -238,6 +239,8 @@ export default {
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
+        this.imgList = data.imgList
+        this.imgList1 = data.imgList1
         this.measuresList = data.measuresList // 参数map
         this.gasList = data.gasList // 参数map
         this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
diff --git a/src/views/gf/electricity/electricity/components/list.vue b/src/views/gf/electricity/electricity/components/list.vue
index 4dd816b..81e26c1 100644
--- a/src/views/gf/electricity/electricity/components/list.vue
+++ b/src/views/gf/electricity/electricity/components/list.vue
@@ -48,6 +48,7 @@
           <span v-else-if="row.APPLY_STATUS==-3">用电单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-4">配送电单位审核打回</span>
           <span v-else-if="row.APPLY_STATUS==-5">验收打回</span>
+          <span v-else-if="row.APPLY_STATUS==-99">已作废</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="230">
@@ -104,6 +105,38 @@
           </template>
         </el-step>
       </el-steps>
+      <div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
+        <div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
+          <div style="color: red">
+            监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+        <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: #13ce66">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
+          </div>
+        </div>
+        <div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
+          <div style="color: red">
+            接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
+          </div>
+        </div>
+      </div>
       <div slot="footer" class="dialog-footer">
         <!--        <el-button @click="dialogFormShow = false">取 消</el-button>-->
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
@@ -126,7 +159,7 @@ export default {
       edit: false,
       listQuery: {
         page: 1,
-        limit: 20
+        limit: 10
       },
       total: 0,
       KEYWORDS: '',
@@ -141,7 +174,7 @@ export default {
       replyVarList: [], // REPLY
       replyListQuery: {
         page: 1,
-        limit: 20
+        limit: 10
       },
       replyTotal: 0,
       dialogFormHuifuShow: false,
@@ -156,7 +189,8 @@ export default {
         { ID: '-2', NAME: '作业负责人审核打回' },
         { ID: '-3', NAME: '用电单位审核打回' },
         { ID: '-4', NAME: '配送电单位审核打回' },
-        { ID: '-5', NAME: '验收打回' }
+        { ID: '-5', NAME: '验收打回' },
+        { ID: '-99', NAME: '已作废' }
       ],
       STATUS: '',
       DEPTIDS: ''
@@ -281,6 +315,13 @@ export default {
           OPERATTIME: this.pd.OPERATTIME
         }
       }
+      if (this.pd.APPLY_STATUS == '-99') {
+        obj = {
+          title: '已作废',
+          AUSER_NAME: '',
+          OPERATTIME: this.pd.OPERATTIME
+        }
+      }
       return obj
     },
     getIsPase(col) {
diff --git a/src/views/gf/electricity/pigeonhole/components/detail.vue b/src/views/gf/electricity/pigeonhole/components/detail.vue
index 4863f6f..b2de876 100644
--- a/src/views/gf/electricity/pigeonhole/components/detail.vue
+++ b/src/views/gf/electricity/pigeonhole/components/detail.vue
@@ -2,204 +2,205 @@
   <div>
     <div id="printTest" class="app-container print-work">
       <el-page-header content="审批表详情" class="no-print" @back="goBack"/>
-      <table class="table-ui">
-        <thead>
+      <div v-for="pdf in 2" :key="pdf" :name="pdf === 2 ? 'pdf-box' : ''" class="pdf-content">
+        <table :class="['table-ui','table-ui' + pdf]">
           <tr>
             <td colspan="6" style="border: none">
               <div class="level-title mt-20">
                 <h1>临时用电作业票</h1>
-                <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
+                <div class="level-code">编号:{{ pd.CHECK_NO }}</div>
               </div>
             </td>
           </tr>
-        </thead>
-        <tr>
-          <td class="bbg">申请单位</td>
-          <td colspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
-          <td class="bbg">作业申请时间</td>
-          <td colspan="2">{{ pd.CREATTIME }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">作业地点</td>
-          <td colspan="2">{{ pd.WORK_PLACE }}</td>
-          <td class="bbg">作业内容</td>
-          <td colspan="2">{{ pd.WORK_CONTENT }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">电源接入点及许可用电功率</td>
-          <td colspan="2">{{ pd.ALLOW_POWER }}</td>
-          <td class="bbg">工作电压</td>
-          <td colspan="2">{{ pd.WORK_VOLTAGE }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">用电设备名称及额定功率</td>
-          <td>{{ pd.RATED_POWER }}</td>
-          <td class="bbg">监护人</td>
-          <td>
-            <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right;width: 230px">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="50" height="50">
-              <span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-          <td class="bbg">用电人</td>
-          <td>{{ pd.ELECTRICITY_USER }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">作业人</td>
-          <td colspan="2">{{ pd.WORK_USER }}</td>
-          <td class="bbg">电工证号</td>
-          <td colspan="2">{{ pd.CARD_NO }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">作业负责人</td>
-          <td colspan="2">{{ pd.CONFIRM_USER_NAME }}</td>
-          <td class="bbg">电工证号</td>
-          <td colspan="2">{{ pd.LEADER_CARD_NO }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
-          <td colspan="5">{{ pd.SPECIAL_WORK }}</td>
-        </tr>
-        <tr>
-          <td class="bbg">风险辨识结果</td>
-          <td colspan="5">{{ pd.RISK_IDENTIFICATION }}</td>
-        </tr>
-        <tr>
-          <td class="bbg" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
-        </tr>
-        <template v-for="(item,index) in gasList">
-          <tr :key="index">
-            <td class="bbg">分析时间</td>
-            <td colspan="2">{{ item.ANALYZE_TIME }}</td>
-            <td class="bbg">分析点</td>
-            <td colspan="2">{{ item.ANALYZE_PLACE }}</td>
+          <tr>
+            <td class="bbg">申请单位</td>
+            <td colspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+            <td class="bbg">作业申请时间</td>
+            <td colspan="2">{{ pd.CREATTIME }}</td>
           </tr>
-          <tr :key="index">
-            <td class="bbg">可燃气体检测结果</td>
-            <td colspan="2">{{ item.ANALYZE_RESULT }}</td>
-            <td class="bbg">分析人</td>
-            <td colspan="2">{{ item.ANALYZE_USER }}</td>
+          <tr>
+            <td class="bbg">作业地点</td>
+            <td colspan="2">{{ pd.WORK_PLACE }}</td>
+            <td class="bbg">作业内容</td>
+            <td colspan="2">{{ pd.WORK_CONTENT }}</td>
           </tr>
-        </template>
-        <tr>
-          <td class="bbg">作业实施时间</td>
-          <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <table class="table-ui">
-              <tr>
-                <td>序号</td>
-                <td>安全措施</td>
-                <td style="width: 100px;">是否涉及</td>
-                <td style="width: 100px;">确认人</td>
-              </tr>
-              <tr v-for="(item,index) in measuresList" :key="index">
-                <td>{{ index + 1 }}</td>
-                <td>{{ item.PROTECTIVE_MEASURES }}</td>
-                <td>
-                  <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;&nbsp;及</span>
-                  <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
-                </td>
-                <td>
-                  {{ item.CONFIRM_NAME }}
-                </td>
-              </tr>
-              <tr v-if="pd.CONFIRM_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES">
-                <td>{{ measuresList.length + 1 }}</td>
-                <td colspan="3">
-                  <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
-                    <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
-                  </div>
-                  <div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
-                  </div>
-                  <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
-                    <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
-                    <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr>
-          <td class="bbg">安全交底人</td>
-          <td colspan="10">
-            <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="bbg">接受交底人</td>
-          <td colspan="10">
-            <div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <div>作业负责人意见：{{ 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">
-              <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <div>用电单位意见：{{ 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">
-              <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <div>配送电单位意见：{{ 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">
-              <span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="6">
-            <div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
-            <div style="text-align: right">
-              <span>签字：</span>
-              <img v-viewer :src="config.fileUrl + pd.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
-              <span>{{ pd.ACCEPT_USER_SIGNER_TIME }}</span>
-            </div>
-          </td>
-        </tr>
-      </table>
+          <tr>
+            <td class="bbg">电源接入点及许可用电功率</td>
+            <td colspan="2">{{ pd.ALLOW_POWER }}</td>
+            <td class="bbg">工作电压</td>
+            <td colspan="2">{{ pd.WORK_VOLTAGE }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">用电设备名称及额定功率</td>
+            <td>{{ pd.RATED_POWER }}</td>
+            <td class="bbg">监护人</td>
+            <td>
+              <div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right;width: 230px">
+                <span>签字：</span>
+                <img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="50" height="50">
+                <span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
+              </div>
+            </td>
+            <td class="bbg">用电人</td>
+            <td>{{ pd.ELECTRICITY_USER }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">作业人</td>
+            <td colspan="2">{{ pd.WORK_USER }}</td>
+            <td class="bbg">电工证号</td>
+            <td colspan="2">{{ pd.CARD_NO }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">作业负责人</td>
+            <td colspan="2">{{ pd.CONFIRM_USER_NAME }}</td>
+            <td class="bbg">电工证号</td>
+            <td colspan="2">{{ pd.LEADER_CARD_NO }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">关联的其他特殊作业及安全作业票编号</td>
+            <td colspan="5">{{ pd.SPECIAL_WORK }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">风险辨识结果</td>
+            <td colspan="5">{{ pd.RISK_IDENTIFICATION }}</td>
+          </tr>
+          <tr>
+            <td class="bbg" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
+          </tr>
+          <template v-for="(item,index) in gasList">
+            <tr :key="index">
+              <td class="bbg">分析时间</td>
+              <td colspan="2">{{ item.ANALYZE_TIME }}</td>
+              <td class="bbg">分析点</td>
+              <td colspan="2">{{ item.ANALYZE_PLACE }}</td>
+            </tr>
+            <tr :key="index">
+              <td class="bbg">可燃气体检测结果</td>
+              <td colspan="2">{{ item.ANALYZE_RESULT }}</td>
+              <td class="bbg">分析人</td>
+              <td colspan="2">{{ item.ANALYZE_USER }}</td>
+            </tr>
+          </template>
+          <tr>
+            <td class="bbg">作业实施时间</td>
+            <td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
+          </tr>
+          <tr>
+            <td colspan="6">
+              <table class="table-ui">
+                <tr>
+                  <td>序号</td>
+                  <td>安全措施</td>
+                  <td style="width: 100px;">是否涉及</td>
+                  <td style="width: 100px;">确认人</td>
+                </tr>
+                <tr v-for="(item,index) in measuresList" :key="index">
+                  <td>{{ index + 1 }}</td>
+                  <td>{{ item.PROTECTIVE_MEASURES }}</td>
+                  <td>
+                    <span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
+                    <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
+                  </td>
+                  <td>
+                    {{ item.CONFIRM_NAME }}
+                  </td>
+                </tr>
+                <tr v-if="pd.CONFIRM_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES">
+                  <td>{{ measuresList.length + 1 }}</td>
+                  <td colspan="3">
+                    <div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
+                      <span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
+                      <span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
+                    </div>
+                    <div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                      <span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
+                      <span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
+                    </div>
+                    <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
+                      <span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
+                      <span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <tr>
+            <td class="bbg">安全交底人</td>
+            <td colspan="10">
+              <div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
+                <span>签字：</span>
+                <img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
+                <span>{{ pd.CONFESS_USER_SIGNER_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 colspan="6">
+              <div>作业负责人意见：{{ 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">
+                <span>{{ pd.CONFIRM_USER_SIGNER_TIME }}</span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="6">
+              <div>用电单位意见：{{ 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">
+                <span>{{ pd.AUDIT_USER_SIGNER_TIME }}</span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="6">
+              <div>配送电单位意见：{{ 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">
+                <span>{{ pd.APPROVE_USER_SIGNER_TIME }}</span>
+              </div>
+            </td>
+          </tr>
+          <tr v-if="imgList1.length>0">
+            <td colspan="10">
+              <div>完工验收：{{ 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">
+                <span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <!--    <div class="ui-height" />-->
+      <div class="ui-foot">
+        <!--        <el-button v-print="'#printTest'" icon="el-icon-printer" type="primary">打 印</el-button>-->
+        <el-button type="primary" icon="el-icon-printer" @click="handle2PDF">PDF导出</el-button>
+        <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
+      </div>
     </div>
-    <div style="padding-top: 100px"/>
-    <!--    <div class="ui-height" />-->
-    <div class="ui-foot">
-      <el-button v-print="'#printTest'" icon="el-icon-printer" type="primary">打 印</el-button>
-      <el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button>
-    </div>
-  </div>
-</template>
+</div></template>
 
 <script>
 import { requestFN } from '@/utils/request'
 import dateformat from '@/utils/dateformat'
+import JsPDF from 'jspdf'
+import html2Canvas from 'html2canvas'
 export default {
   data() {
     return {
@@ -208,6 +209,8 @@ export default {
       pd: [], // 存放字段参数
       measuresList: [],
       gasList: [],
+      imgList: [],
+      imgList1: [],
       otherProtectiveMeasures: []
     }
   },
@@ -215,6 +218,85 @@ export default {
     this.getData()
   },
   methods: {
+    handle2PDF() {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在生成,请稍候...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      const elements = document.querySelectorAll('div[name="pdf-box"]')
+      console.log(elements)
+      this.html2pdf(this.pd.CHECK_NO + '审批表详情', elements, loading)
+    },
+
+    html2pdf(filename, els, loading) {
+      const flagArr = []
+      for (let i = 0, len = els.length; i < len; i++) {
+        flagArr.push(0)
+      }
+      console.log(flagArr)
+      runself(0)
+      const pdf = new JsPDF('', 'pt', 'a4') // A4纸，纵向
+      function runself(index) {
+        const html = els[index]
+        html2Canvas(html, {
+          allowTaint: true,
+          taintTest: false,
+          logging: false,
+          useCORS: true,
+          scale: 2 // 按比例增加分辨率
+        }).then(canvas => {
+          // eslint-disable-next-line one-var
+          var ctx = canvas.getContext('2d'),
+            a4w = 532.28, a4h = 781.89, // A4大小，210mm x 297mm，四边各保留10mm的边距，显示区域190x277 pt:592.28 * 841.89
+            renderedHeight = 0
+          const allTrs = html.querySelectorAll('tr')
+          while (renderedHeight < canvas.height) {
+            let imgHeight = Math.floor(a4h * canvas.width / a4w) // 按A4显示比例换算一页图像的像素高度
+            for (let i = 0; i < allTrs.length; i++) {
+              const tr = allTrs[i]
+              const trHeight = tr.offsetHeight + tr.offsetTop
+              console.log('offsetHeight:' + tr.offsetHeight + 'offsetTop:' + tr.offsetTop + 'offsetParent:' + tr.offsetParent.offsetTop)
+              if (trHeight * 2 > (imgHeight + renderedHeight)) {
+                const btr = allTrs[i - 1]
+                const btrHeight = btr.offsetHeight + btr.offsetTop
+                console.log('i:' + (i - 1) + 'btrHeight:' + btrHeight)
+                imgHeight = btrHeight * 2 - renderedHeight
+                break
+              }
+            }
+            var page = document.createElement('canvas')
+            page.width = canvas.width
+            page.height = Math.min(imgHeight, canvas.height - renderedHeight)// 可能内容不足一页
+
+            // 用getImageData剪裁指定区域，并画到前面创建的canvas对象中
+            page.getContext('2d').putImageData(ctx.getImageData(0, renderedHeight, canvas.width, Math.min(imgHeight, canvas.height - renderedHeight)), 0, 0)
+            pdf.addImage(page.toDataURL('image/jpeg', 1.0), 'JPEG', 30, 30, a4w, Math.min(a4h, a4w * page.height / page.width)) // 添加图像到页面，保留10mm边距
+
+            renderedHeight += imgHeight
+            if (renderedHeight < canvas.height) {
+              pdf.addPage()// 如果后面还有内容，添加一个空页
+            }
+          }
+          if (index < els.length - 1) {
+            pdf.addPage()
+          }
+          return 1
+        }).then(item => {
+          flagArr[index] = item
+          if (flagArr.every(f => f === 1)) {
+            pdf.save(filename)
+          }
+          index++
+          if (index < els.length) {
+            runself(index)
+          } else {
+            loading.close()
+          }
+        })
+      }
+    },
     validStr(str) {
       if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
       return false
@@ -246,8 +328,10 @@ export default {
       ).then((data) => {
         this.listLoading = false
         this.pd = data.pd // 参数map
+        this.imgList = data.imgList
+        this.imgList1 = data.imgList1
         this.measuresList = data.measuresList // 参数map
-        this.gasList = data.gasList // 参数map
+        this.gasList = data.gasList.length > 0 ? data.gasList : [{}] // 参数map
         this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
         this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
         this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
@@ -279,3 +363,26 @@ export default {
   .bbg
   width: 300px !important
 </style>
+<style scoped lang="scss">
+  .table-ui td{
+    line-height: unset;
+  }
+  .pdf-content[name=pdf-box]{
+    position: absolute;
+    left: -999999px;
+    .level-title {
+      h1{
+        font-size: 20px;
+      }
+      .level-code{
+        font-size: 20px;
+      }
+    }
+    td{
+      font-size: 20px;
+    }
+    .bbg {
+      width: 200px;
+    }
+  }
+</style>
diff --git a/src/views/gf/electricity/pigeonhole/components/list.vue b/src/views/gf/electricity/pigeonhole/components/list.vue
index 7ba64f6..32444a2 100644
--- a/src/views/gf/electricity/pigeonhole/components/list.vue
+++ b/src/views/gf/electricity/pigeonhole/components/list.vue
@@ -74,7 +74,7 @@ export default {
       edit: false,
       listQuery: {
         page: 1,
-        limit: 20
+        limit: 10
       },
       total: 0,
       KEYWORDS: '',
@@ -89,7 +89,7 @@ export default {
       replyVarList: [], // REPLY
       replyListQuery: {
         page: 1,
-        limit: 20
+        limit: 10
       },
       replyTotal: 0,
       dialogFormHuifuShow: false,