From b3ff9c11cae931ff14632a613dd3eb4fe110502d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 10 Jun 2025 15:36:08 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pro-tabs/bns-timeline-tabs.vue |  36 +-
 src/views/IndexPage/index_other.vue           |   2 +
 src/views/flow/auditRecord.vue                |   2 +
 .../components/hazardApprove.vue              | 854 ++++++++++--------
 src/views/pro/apply/consEnterApply.vue        |   5 +-
 src/views/pro/apply/supervisorEnterApply.vue  |   1 +
 .../supervisorApproval.vue                    |   9 +-
 7 files changed, 527 insertions(+), 382 deletions(-)

diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue
index a0b4097..5bb072c 100644
--- a/src/components/pro-tabs/bns-timeline-tabs.vue
+++ b/src/components/pro-tabs/bns-timeline-tabs.vue
@@ -7,7 +7,7 @@
         v-if="!items"
         style="position: absolute; top: 30%; left: 43%"
       />
-      <div style="height: 90%" v-else-if="btnShow">
+      <div style="height: 90%" v-if="btnShow">
         <el-timeline :reverse="reverse">
           <el-timeline-item
             v-for="(item, index) in auditRecordList"
@@ -53,11 +53,21 @@
         </div>
       </div>
 
-      <el-table v-else :data="auditRecordList">
+      <el-table
+        v-if="(auditType.includes('审批') || auditType.includes('审核记录')) && !btnShow"
+        :data="auditRecordList"
+      >
         <el-table-column align="center" label="审批部门" prop="section" />
         <el-table-column align="center" label="审批人" prop="name" />
         <el-table-column align="center" label="审批时间" prop="time" />
-        <el-table-column align="center" label="审批状态" prop="status" />
+        <el-table-column align="center" label="审批状态" prop="status">
+          <template slot-scope="{ row }">
+            <span v-if="enterStatus && enterStatus.includes('撤回')">撤回</span>
+            <span v-else>
+              {{ row.status }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="审批意见">
           <template slot-scope="{ row }">
             {{ row.reason.replaceAll(/@@/g, ' ') || '--' }}
@@ -209,6 +219,12 @@ export default {
       type: String,
       default: () => '',
     },
+
+    // 状态
+    enterStatus: {
+      type: String,
+      default: () => '',
+    },
   },
   computed: {
     store() {
@@ -242,8 +258,18 @@ export default {
       return (item, index) => {
         if (item.auditStatus == 1 || item.auditStatus == 3) return '√'
         if (item.auditStatus == 2) return 'X'
-        if (item.auditStatus == null || this.endAuditingIndex > -1) return ''
-        if (item.auditStatus == 4 && this.endAuditingIndex < 0) return '?'
+        if (
+          item.auditStatus == null ||
+          (this.endAuditingIndex > -1 && this.enterStatus && this.enterStatus.includes('撤回'))
+        )
+          return ''
+        if (
+          item.auditStatus == 4 &&
+          this.endAuditingIndex < 0 &&
+          this.enterStatus &&
+          !this.enterStatus.includes('撤回')
+        )
+          return '?'
       }
     },
   },
diff --git a/src/views/IndexPage/index_other.vue b/src/views/IndexPage/index_other.vue
index cb5cb5c..81f172b 100644
--- a/src/views/IndexPage/index_other.vue
+++ b/src/views/IndexPage/index_other.vue
@@ -391,6 +391,7 @@ export default {
             JSON.stringify({
               type: 'edit',
               taskId: row.taskId,
+              enterStatus: row.enterStatus,
             })
           )
       )
@@ -533,6 +534,7 @@ export default {
             JSON.stringify({
               taskId: row.taskId,
               taskType: '存在',
+              enterStatus: row.enterStatus,
             })
           )
       )
diff --git a/src/views/flow/auditRecord.vue b/src/views/flow/auditRecord.vue
index e688590..9fda606 100644
--- a/src/views/flow/auditRecord.vue
+++ b/src/views/flow/auditRecord.vue
@@ -12,7 +12,9 @@
       :show-type="1"
       :show-position="2"
       :items="approvalItems"
+      :auditReason="[]"
       audit-type="审核记录"
+      :enterStatus="paramsData.enterStatus"
       :audit-record-type="paramsData.auditRecordType ? '全部' : '部分'"
       v-else
     ></bns-timeline-tabs>
diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
index 8840971..1ec5fbb 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="top-btn" v-if="row.isRectify || row.isDelay">
       <el-button type="primary" size="small" @click="handleSubmit" v-preventReClick="5000">提交</el-button>
-      <el-button type="primary" size="small" @click="">打印</el-button>
+      <el-button type="primary" size="small" @click="onHandlePrint">打印</el-button>
     </div>
     <div class="top-btn" v-if="row.isAcceptance">
       <el-button type="primary" plain size="small" @click="handleAcceptance(1)">验收通过</el-button>
@@ -17,387 +17,469 @@
     <el-tabs v-model="active">
       <!-- 隐患整改单 -->
       <el-tab-pane label="隐患整改单" name="1" v-if="!row.isRecord">
-        <!-- 基础信息 -->
-        <el-card class="box-card">
-          <div slot="header" class="card-header">
-            <span>基础信息</span>
-          </div>
-          <el-form :model="baseInfoForm" ref="baseInfoForm" label-width="99px" size="small" disabled>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="隐患问题编号" prop="pitfallCode">
-                  <el-input v-model="baseInfoForm.pitfallCode" placeholder="请输入隐患问题编号" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="检查记录编号" prop="recordCode">
-                  <el-input v-model="baseInfoForm.recordCode" placeholder="请输入检查记录编号" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="对应检查级别" prop="inspectLevelName">
-                  <el-input
-                    v-model="baseInfoForm.inspectLevelName"
-                    placeholder="请输入对应检查级别"
-                    class="cont-width" v-no-whitespace
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="排查类型" prop="checkTypeName">
-                  <el-input v-model="baseInfoForm.checkTypeName" placeholder="请输入排查类型" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="创建人" prop="createUserName">
-                  <el-input v-model="baseInfoForm.createUserName" placeholder="请输入创建人" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="创建时间">
-                  <el-input v-model="baseInfoForm.createTime" placeholder="请输入创建时间" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="整改接收时间" prop="rectificationReceiveTime">
-                  <el-input
-                    v-model="baseInfoForm.rectificationReceiveTime"
-                    placeholder="请输入整改接收时间" v-no-whitespace
-                    class="cont-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="整改反馈时间" prop="rectificationFeedbackTime">
-                  <el-input
-                    v-model="baseInfoForm.rectificationFeedbackTime"
-                    placeholder="请输入整改反馈时间" v-no-whitespace
-                    class="cont-width"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="整改状态" prop="checkStatus">
-                  <el-input v-model="baseInfoForm.checkStatus" placeholder="请输入整改状态" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-card>
+        <div id="printQrCode" ref="printContent">
+          <!-- 基础信息 -->
+          <el-card class="box-card">
+            <div slot="header" class="card-header">
+              <span>基础信息</span>
+            </div>
+            <el-form :model="baseInfoForm" ref="baseInfoForm" label-width="99px" size="small" disabled>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="隐患问题编号" prop="pitfallCode">
+                    <el-input
+                      v-model="baseInfoForm.pitfallCode"
+                      placeholder="请输入隐患问题编号"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="检查记录编号" prop="recordCode">
+                    <el-input
+                      v-model="baseInfoForm.recordCode"
+                      placeholder="请输入检查记录编号"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="对应检查级别" prop="inspectLevelName">
+                    <el-input
+                      v-model="baseInfoForm.inspectLevelName"
+                      placeholder="请输入对应检查级别"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="排查类型" prop="checkTypeName">
+                    <el-input
+                      v-model="baseInfoForm.checkTypeName"
+                      placeholder="请输入排查类型"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="创建人" prop="createUserName">
+                    <el-input
+                      v-model="baseInfoForm.createUserName"
+                      placeholder="请输入创建人"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="创建时间">
+                    <el-input
+                      v-model="baseInfoForm.createTime"
+                      placeholder="请输入创建时间"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="整改接收时间" prop="rectificationReceiveTime">
+                    <el-input
+                      v-model="baseInfoForm.rectificationReceiveTime"
+                      placeholder="请输入整改接收时间"
+                      v-no-whitespace
+                      class="cont-width"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="整改反馈时间" prop="rectificationFeedbackTime">
+                    <el-input
+                      v-model="baseInfoForm.rectificationFeedbackTime"
+                      placeholder="请输入整改反馈时间"
+                      v-no-whitespace
+                      class="cont-width"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="整改状态" prop="checkStatus">
+                    <el-input
+                      v-model="baseInfoForm.checkStatus"
+                      placeholder="请输入整改状态"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
 
-        <!-- 检查方填写 -->
-        <el-card class="box-card">
-          <div slot="header" class="card-header">
-            <span>检查方填写</span>
-          </div>
-          <el-form :model="inspectForm" ref="inspectForm" label-width="120px" size="small" disabled>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="检查人" prop="checkUserName">
-                  <el-input v-model="inspectForm.checkUserName" placeholder="请输入检查人" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="发现日期" prop="findTime">
-                  <el-date-picker
-                    v-model="inspectForm.findTime"
-                    type="date"
-                    placeholder="选择发现日期"
-                    value-format="yyyy-MM-dd"
-                    clearable
-                    class="cont-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="隐患工程" prop="hazardProOptions">
-                  <el-input v-model="inspectForm.proName" placeholder="请输入隐患工程" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="整改责任承包商" prop="subName">
-                  <el-input v-model="inspectForm.subName" placeholder="请输入整改责任承包商" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="隐患问题类别" prop="pitfallTypeName">
-                  <el-input v-model="inspectForm.pitfallTypeName" placeholder="请输入隐患问题类别" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
+          <!-- 检查方填写 -->
+          <el-card class="box-card">
+            <div slot="header" class="card-header">
+              <span>检查方填写</span>
+            </div>
+            <el-form :model="inspectForm" ref="inspectForm" label-width="120px" size="small" disabled>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="检查人" prop="checkUserName">
+                    <el-input
+                      v-model="inspectForm.checkUserName"
+                      placeholder="请输入检查人"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="发现日期" prop="findTime">
+                    <el-date-picker
+                      v-model="inspectForm.findTime"
+                      type="date"
+                      placeholder="选择发现日期"
+                      value-format="yyyy-MM-dd"
+                      clearable
+                      class="cont-width"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="隐患工程" prop="hazardProOptions">
+                    <el-input
+                      v-model="inspectForm.proName"
+                      placeholder="请输入隐患工程"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="整改责任承包商" prop="subName">
+                    <el-input
+                      v-model="inspectForm.subName"
+                      placeholder="请输入整改责任承包商"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="隐患问题类别" prop="pitfallTypeName">
+                    <el-input
+                      v-model="inspectForm.pitfallTypeName"
+                      placeholder="请输入隐患问题类别"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
 
-              <el-col :span="6">
-                <el-form-item label="隐患问题级别" prop="pitfallLevelName">
-                  <el-input
-                    v-model="inspectForm.pitfallLevelName"
-                    placeholder="请输入隐患问题级别" v-no-whitespace
-                    class="cont-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="期限整改时间" prop="correctionTime">
-                  <el-date-picker
-                    v-model="inspectForm.correctionTime"
-                    type="date"
-                    placeholder="选择期限整改时间"
-                    value-format="yyyy-MM-dd"
-                    clearable
-                    class="cont-width"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="承包商责任人" prop="subPersonName">
-                  <el-input v-model="inspectForm.subPersonName" placeholder="请输入承包商责任人" class="cont-width" v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="上传图片" prop="imgList">
-                  <div style="display: flex">
-                    <div v-for="(item, index) in inspectForm.imgList" :key="index">
-                      <el-image
-                        style="width: 100px; height: 100px; margin-right: 10px"
-                        fit="fit"
-                        :src="item.url"
-                        :preview-src-list="[item.url]"
-                      ></el-image>
+                <el-col :span="6">
+                  <el-form-item label="隐患问题级别" prop="pitfallLevelName">
+                    <el-input
+                      v-model="inspectForm.pitfallLevelName"
+                      placeholder="请输入隐患问题级别"
+                      v-no-whitespace
+                      class="cont-width"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="期限整改时间" prop="correctionTime">
+                    <el-date-picker
+                      v-model="inspectForm.correctionTime"
+                      type="date"
+                      placeholder="选择期限整改时间"
+                      value-format="yyyy-MM-dd"
+                      clearable
+                      class="cont-width"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="承包商责任人" prop="subPersonName">
+                    <el-input
+                      v-model="inspectForm.subPersonName"
+                      placeholder="请输入承包商责任人"
+                      class="cont-width"
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="上传图片" prop="imgList">
+                    <div style="display: flex">
+                      <div v-for="(item, index) in inspectForm.imgList" :key="index">
+                        <el-image
+                          style="width: 100px; height: 100px; margin-right: 10px"
+                          fit="fit"
+                          :src="item.url"
+                          :preview-src-list="[item.url]"
+                        ></el-image>
+                      </div>
                     </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="隐患问题描述" prop="pitfallDescription">
+                    <el-input
+                      class="cont-width-textarea"
+                      type="textarea"
+                      v-model="inspectForm.pitfallDescription"
+                      placeholder="请输入隐患问题描述"
+                      clearable
+                      v-no-whitespace
+                      :autosize="{ minRows: 4, maxRows: 6 }"
+                      maxlength="2000"
+                      show-word-limit
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="整改措施建议" prop="suggestion">
+                    <el-input
+                      class="cont-width-textarea"
+                      type="textarea"
+                      v-model="inspectForm.suggestion"
+                      placeholder="请输入整改措施建议"
+                      clearable
+                      v-no-whitespace
+                      :autosize="{ minRows: 4, maxRows: 6 }"
+                      maxlength="2000"
+                      show-word-limit
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+
+          <!-- 整改方填写 -->
+          <el-card class="box-card">
+            <div slot="header" class="card-header">
+              <span>整改方填写</span>
+            </div>
+            <el-form
+              :model="rectificationForm"
+              ref="rectificationForm"
+              label-width="120px"
+              size="small"
+              :rules="rules1"
+            >
+              <el-form-item label="责任人" prop="dutyUserId">
+                <el-select
+                  v-model="rectificationForm.dutyUserId"
+                  placeholder="请选择责任人"
+                  class="cont-width"
+                  @change="changeDutyUserId"
+                  :disabled="!row.isRectify"
+                >
+                  <el-option
+                    v-for="item in rectificationContractorOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="产生原因描述" prop="generateReason">
+                <el-input
+                  class="cont-width-textarea"
+                  type="textarea"
+                  v-model="rectificationForm.generateReason"
+                  placeholder="请输入产生原因描述"
+                  clearable
+                  v-no-whitespace
+                  :autosize="{ minRows: 4, maxRows: 6 }"
+                  maxlength="2000"
+                  show-word-limit
+                  :disabled="!row.isRectify"
+                />
+              </el-form-item>
+              <el-form-item label="整改情况" prop="correctionStatus">
+                <el-input
+                  class="cont-width-textarea"
+                  type="textarea"
+                  v-model="rectificationForm.correctionStatus"
+                  placeholder="请输入整改情况"
+                  clearable
+                  v-no-whitespace
+                  :autosize="{ minRows: 4, maxRows: 6 }"
+                  maxlength="2000"
+                  show-word-limit
+                  :disabled="!row.isRectify"
+                />
+              </el-form-item>
+              <el-form-item label="上传图片" prop="photoList">
+                <el-upload
+                  v-if="row.isRectify"
+                  action="#"
+                  accept="image/*"
+                  :auto-upload="false"
+                  list-type="picture-card"
+                  :on-change="handleUpImg"
+                  :on-remove="handleRemoveImg"
+                  :on-exceed="handleExceedImg"
+                  :file-list="rectificationForm.photoList"
+                  :limit="9"
+                  :multiple="true"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+                <div v-else style="display: flex">
+                  <div v-for="(item, index) in rectificationForm.photoList" :key="index">
+                    <el-image
+                      style="width: 100px; height: 100px; margin-right: 10px"
+                      fit="fit"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                    ></el-image>
                   </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="隐患问题描述" prop="pitfallDescription">
-                  <el-input
-                    class="cont-width-textarea"
-                    type="textarea"
-                    v-model="inspectForm.pitfallDescription"
-                    placeholder="请输入隐患问题描述"
-                    clearable v-no-whitespace
-                    :autosize="{ minRows: 4, maxRows: 6 }"
-                    maxlength="2000"
-                    show-word-limit
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="整改措施建议" prop="suggestion">
-                  <el-input
-                    class="cont-width-textarea"
-                    type="textarea"
-                    v-model="inspectForm.suggestion"
-                    placeholder="请输入整改措施建议"
-                    clearable v-no-whitespace
-                    :autosize="{ minRows: 4, maxRows: 6 }"
-                    maxlength="2000"
-                    show-word-limit
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-card>
-
-        <!-- 整改方填写 -->
-        <el-card class="box-card">
-          <div slot="header" class="card-header">
-            <span>整改方填写</span>
-          </div>
-          <el-form :model="rectificationForm" ref="rectificationForm" label-width="120px" size="small" :rules="rules1">
-            <el-form-item label="责任人" prop="dutyUserId">
-              <el-select
-                v-model="rectificationForm.dutyUserId"
-                placeholder="请选择责任人"
-                class="cont-width"
-                @change="changeDutyUserId"
-                :disabled="!row.isRectify"
-              >
-                <el-option
-                  v-for="item in rectificationContractorOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="产生原因描述" prop="generateReason">
-              <el-input
-                class="cont-width-textarea"
-                type="textarea"
-                v-model="rectificationForm.generateReason"
-                placeholder="请输入产生原因描述"
-                clearable v-no-whitespace
-                :autosize="{ minRows: 4, maxRows: 6 }"
-                maxlength="2000"
-                show-word-limit
-                :disabled="!row.isRectify"
-              />
-            </el-form-item>
-            <el-form-item label="整改情况" prop="correctionStatus">
-              <el-input
-                class="cont-width-textarea"
-                type="textarea"
-                v-model="rectificationForm.correctionStatus"
-                placeholder="请输入整改情况"
-                clearable v-no-whitespace
-                :autosize="{ minRows: 4, maxRows: 6 }"
-                maxlength="2000"
-                show-word-limit
-                :disabled="!row.isRectify"
-              />
-            </el-form-item>
-            <el-form-item label="上传图片" prop="photoList">
-              <el-upload
-                v-if="row.isRectify"
-                action="#"
-                accept="image/*"
-                :auto-upload="false"
-                list-type="picture-card"
-                :on-change="handleUpImg"
-                :on-remove="handleRemoveImg"
-                :on-exceed="handleExceedImg"
-                :file-list="rectificationForm.photoList"
-                :limit="9"
-                :multiple="true"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
-              <div v-else style="display: flex">
-                <div v-for="(item, index) in rectificationForm.photoList" :key="index">
-                  <el-image
-                    style="width: 100px; height: 100px; margin-right: 10px"
-                    fit="fit"
-                    :src="item.url"
-                    :preview-src-list="[item.url]"
-                  ></el-image>
                 </div>
-              </div>
-            </el-form-item>
-            <el-form-item label="上传文件" prop="fileList">
-              <el-upload
-                v-if="row.isRectify"
-                action="#"
-                accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt,.DOC,.DOCX,.XLS,.XLSX,.PPT,.PPTX,.PDF,.TXT"
-                :auto-upload="false"
-                :on-change="handleUpFile"
-                :on-remove="handleRemoveFile"
-                :on-exceed="handleExceedFile"
-                :file-list="rectificationForm.fileList"
-                :limit="9"
-                :multiple="true"
-              >
-                <el-button size="small" type="primary">选择上传文件</el-button>
-              </el-upload>
-              <el-button v-else size="small" type="primary" @click="document = true">查看文件</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
+              </el-form-item>
+              <el-form-item label="上传文件" prop="fileList">
+                <el-upload
+                  v-if="row.isRectify"
+                  action="#"
+                  accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt,.DOC,.DOCX,.XLS,.XLSX,.PPT,.PPTX,.PDF,.TXT"
+                  :auto-upload="false"
+                  :on-change="handleUpFile"
+                  :on-remove="handleRemoveFile"
+                  :on-exceed="handleExceedFile"
+                  :file-list="rectificationForm.fileList"
+                  :limit="9"
+                  :multiple="true"
+                >
+                  <el-button size="small" type="primary">选择上传文件</el-button>
+                </el-upload>
+                <el-button v-else size="small" type="primary" @click="document = true">查看文件</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
 
-        <!-- 验收方填写 -->
-        <el-card class="box-card">
-          <div slot="header" class="card-header">
-            <span>验收方填写</span>
-          </div>
-          <el-form :model="acceptForm" ref="acceptForm" size="small" :rules="rules3">
-            <el-row :gutter="10">
-              <el-col :span="7" :offset="0">
-                <el-form-item label="整改验收部门" prop="deptName" label-width="110px">
-                  <el-input
-                    v-model="acceptForm.deptName"
-                    placeholder="请输入整改验收部门"
-                    class="cont-width" v-no-whitespace
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="7" :offset="0">
-                <el-form-item label="整改验收人" prop="userName">
-                  <el-input v-model="acceptForm.userName" placeholder="请输入整改验收人" class="cont-width" disabled v-no-whitespace />
-                </el-form-item>
-              </el-col>
-              <el-col :span="7" :offset="0">
-                <el-form-item label="是否进行流程审批" prop="isProcess">
-                  <el-input
-                    v-model="acceptForm.isProcess"
-                    placeholder="请输入是否进行流程审批"
-                    class="cont-width"
-                    disabled v-no-whitespace
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <!-- 验收方填写 -->
+          <el-card class="box-card">
+            <div slot="header" class="card-header">
+              <span>验收方填写</span>
+            </div>
+            <el-form :model="acceptForm" ref="acceptForm" size="small" :rules="rules3">
+              <el-row :gutter="10">
+                <el-col :span="7" :offset="0">
+                  <el-form-item label="整改验收部门" prop="deptName" label-width="110px">
+                    <el-input
+                      v-model="acceptForm.deptName"
+                      placeholder="请输入整改验收部门"
+                      class="cont-width"
+                      v-no-whitespace
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7" :offset="0">
+                  <el-form-item label="整改验收人" prop="userName">
+                    <el-input
+                      v-model="acceptForm.userName"
+                      placeholder="请输入整改验收人"
+                      class="cont-width"
+                      disabled
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7" :offset="0">
+                  <el-form-item label="是否进行流程审批" prop="isProcess">
+                    <el-input
+                      v-model="acceptForm.isProcess"
+                      placeholder="请输入是否进行流程审批"
+                      class="cont-width"
+                      disabled
+                      v-no-whitespace
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
 
-            <el-form-item label="整改意见" prop="opinion" label-width="110px">
-              <el-input
-                class="cont-width-textarea"
-                type="textarea"
-                v-model="acceptForm.opinion"
-                placeholder="请输入整改意见"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 6 }"
-                maxlength="2000"
-                show-word-limit v-no-whitespace
-                :disabled="!row.isAcceptance"
-              />
-            </el-form-item>
-            <el-form-item label="备注" prop="remarks" label-width="110px">
-              <el-input
-                class="cont-width-textarea"
-                type="textarea"
-                v-model="acceptForm.remarks"
-                placeholder="请输入备注"
-                clearable
-                :autosize="{ minRows: 4, maxRows: 6 }"
-                maxlength="2000"
-                show-word-limit v-no-whitespace
-                :disabled="!row.isAcceptance"
-              />
-            </el-form-item>
-          </el-form>
-        </el-card>
+              <el-form-item label="整改意见" prop="opinion" label-width="110px">
+                <el-input
+                  class="cont-width-textarea"
+                  type="textarea"
+                  v-model="acceptForm.opinion"
+                  placeholder="请输入整改意见"
+                  clearable
+                  :autosize="{ minRows: 4, maxRows: 6 }"
+                  maxlength="2000"
+                  show-word-limit
+                  v-no-whitespace
+                  :disabled="!row.isAcceptance"
+                />
+              </el-form-item>
+              <el-form-item label="备注" prop="remarks" label-width="110px">
+                <el-input
+                  class="cont-width-textarea"
+                  type="textarea"
+                  v-model="acceptForm.remarks"
+                  placeholder="请输入备注"
+                  clearable
+                  :autosize="{ minRows: 4, maxRows: 6 }"
+                  maxlength="2000"
+                  show-word-limit
+                  v-no-whitespace
+                  :disabled="!row.isAcceptance"
+                />
+              </el-form-item>
+            </el-form>
+          </el-card>
 
-        <!-- 延期信息 -->
-        <el-card class="box-card">
-          <div slot="header" class="card-header">
-            <span>延期信息</span>
-          </div>
-          <el-form
-            :model="delayInfoForm"
-            ref="delayInfoForm"
-            size="small"
-            label-width="110px"
-            :disabled="!row.isDelay"
-            :rules="rules2"
-          >
-            <el-form-item label="延期整改时间" prop="delayTime">
-              <el-date-picker
-                v-model="delayInfoForm.delayTime"
-                type="date"
-                placeholder="选择延期整改时间"
-                value-format="yyyy-MM-dd"
-                clearable
-                class="cont-width"
-              />
-            </el-form-item>
-            <el-form-item label="延期原因" prop="delayReason">
-              <el-input
-                class="cont-width-textarea"
-                type="textarea"
-                v-model="delayInfoForm.delayReason"
-                placeholder="请输入延期原因"
-                clearable v-no-whitespace
-                :autosize="{ minRows: 4, maxRows: 6 }"
-                maxlength="1000"
-                show-word-limit
-              />
-            </el-form-item>
-          </el-form>
-        </el-card>
+          <!-- 延期信息 -->
+          <el-card class="box-card">
+            <div slot="header" class="card-header">
+              <span>延期信息</span>
+            </div>
+            <el-form
+              :model="delayInfoForm"
+              ref="delayInfoForm"
+              size="small"
+              label-width="110px"
+              :disabled="!row.isDelay"
+              :rules="rules2"
+            >
+              <el-form-item label="延期整改时间" prop="delayTime">
+                <el-date-picker
+                  v-model="delayInfoForm.delayTime"
+                  type="date"
+                  placeholder="选择延期整改时间"
+                  value-format="yyyy-MM-dd"
+                  clearable
+                  class="cont-width"
+                />
+              </el-form-item>
+              <el-form-item label="延期原因" prop="delayReason">
+                <el-input
+                  class="cont-width-textarea"
+                  type="textarea"
+                  v-model="delayInfoForm.delayReason"
+                  placeholder="请输入延期原因"
+                  clearable
+                  v-no-whitespace
+                  :autosize="{ minRows: 4, maxRows: 6 }"
+                  maxlength="1000"
+                  show-word-limit
+                />
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </div>
       </el-tab-pane>
       <!-- 审批信息 -->
       <el-tab-pane label="审批信息" name="2" v-if="row.isApprove || row.isRecord || row.isDetail">
@@ -978,6 +1060,30 @@ export default {
         }
       })
     },
+
+    onHandlePrint() {
+      // 直接使用浏览器打印指定的dom
+      window.print('#printQrCode')
+      // const printWindow = window.open('', '_blank')
+      // printWindow.document.write(`
+      //   <html>
+      //     <head>
+      //       <title>打印</title>
+      //     </head>
+      //     <body>
+      //       ${this.$refs.printContent.innerHTML}
+      //     </body>
+      //   </html>
+      // `)
+      // printWindow.document.close()
+      // printWindow.focus()
+
+      // // 延迟执行打印，确保内容加载完成
+      // setTimeout(() => {
+      //   printWindow.print()
+      //   printWindow.close()
+      // }, 300)
+    },
   },
 }
 </script>
diff --git a/src/views/pro/apply/consEnterApply.vue b/src/views/pro/apply/consEnterApply.vue
index 78ac48f..0623fe5 100644
--- a/src/views/pro/apply/consEnterApply.vue
+++ b/src/views/pro/apply/consEnterApply.vue
@@ -82,7 +82,7 @@
                     <el-option label="离场" value="0" />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="是否上传文件" prop="fileIsActive"  label-width="140px">
+                <el-form-item label="是否上传文件" prop="fileIsActive" label-width="140px">
                   <el-select v-model="personQueryParams.fileIsActive" placeholder="请选择" clearable>
                     <el-option label="已上传" value="1" />
                     <el-option label="未上传" value="0" />
@@ -959,6 +959,7 @@
               final-check="0"
               :show-type="1"
               :items="approvalItems"
+              :enterStatus="paramsData.enterStatus"
             />
           </el-tab-pane>
         </el-tabs>
@@ -1189,7 +1190,7 @@ export default {
         status: undefined,
         startDate: undefined,
         endDate: undefined,
-        fileIsActive:undefined,
+        fileIsActive: undefined,
       },
       equipQueryParams: {
         pageNum: 1,
diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue
index 7ea0f91..69ea4d5 100644
--- a/src/views/pro/apply/supervisorEnterApply.vue
+++ b/src/views/pro/apply/supervisorEnterApply.vue
@@ -470,6 +470,7 @@
               final-check="0"
               :show-type="1"
               :items="approvalItems"
+              :enterStatus="paramsData.enterStatus"
             />
           </el-tab-pane>
         </el-tabs>
diff --git a/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue b/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue
index 30bc039..892145b 100644
--- a/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue
+++ b/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue
@@ -59,9 +59,16 @@
           <el-table-column label="人脸照片" align="center" prop="faceUrl">
             <template slot-scope="scope">
               <el-popover placement="right" title="" trigger="hover">
-                <img :src="`${lookFaceFile + scope.row.faceUrl}`" :min-width="300" :height="300" alt="照片" />
+                <img
+                  v-if="scope.row.faceUrl"
+                  :src="`${lookFaceFile + scope.row.faceUrl}`"
+                  :min-width="300"
+                  :height="300"
+                  alt="照片"
+                />
                 <img
                   slot="reference"
+                  v-if="scope.row.faceUrl"
                   :src="`${lookFaceFile + scope.row.faceUrl}`"
                   style="max-height: 50px; max-width: 50px"
                   :alt="`${lookFaceFile + scope.row.faceUrl}`"