From 4a5b0dc000ec28fe6e70524e8a460de43ae33005 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Tue, 4 Mar 2025 14:04:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hyx?=
 =?UTF-8?q?=5F2024-03-04=5FfireWork):=20=20=20-=20=E5=8A=A8=E7=81=AB?=
 =?UTF-8?q?=E5=8F=8A=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork/otherUnit/components/detail.vue   | 414 +++++++++++++
 .../hotwork/otherUnit/components/info.vue     | 568 ++++++++++++++++++
 .../hotwork/otherUnit/components/list.vue     | 368 ++++++++++++
 src/views/hotwork/otherUnit/index.vue         |  37 ++
 4 files changed, 1387 insertions(+)
 create mode 100644 src/views/hotwork/otherUnit/components/detail.vue
 create mode 100644 src/views/hotwork/otherUnit/components/info.vue
 create mode 100644 src/views/hotwork/otherUnit/components/list.vue
 create mode 100644 src/views/hotwork/otherUnit/index.vue

diff --git a/src/views/hotwork/otherUnit/components/detail.vue b/src/views/hotwork/otherUnit/components/detail.vue
new file mode 100644
index 0000000..36c48fa
--- /dev/null
+++ b/src/views/hotwork/otherUnit/components/detail.vue
@@ -0,0 +1,414 @@
+<template>
+  <div>
+    <div id="printTest" class="app-container print-work">
+      <div class="level-title">
+        <h1>动火安全作业票（证）</h1>
+      </div>
+      <table class="table-ui">
+        <tr>
+          <td colspan="4" style="padding: 0;">
+            <table class="table-vi">
+              <tr>
+                <td class="bbg">申请单位</td>
+                <td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+                <td class="bbg">申请人</td>
+                <td>{{ pd.APPLY_USER_NAME }}</td>
+                <td class="bbg">作业证编号</td>
+                <td>{{ pd.JOB_NUMBER }}</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td class="bbg">申请日期</td>
+          <td>{{ formatTime(pd.APPLICATION_DATE) }}</td>
+          <td class="bbg">作业类型</td>
+          <td>{{ pd.JOB_TYPE_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">动火部位</td>
+          <td>{{ pd.HOT_WORK_POSITION }}</td>
+          <td class="bbg">动火方法</td>
+          <td>{{ pd.HOT_WORK_METHOD_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">动火作业级别</td>
+          <td>{{ pd.HOT_WORK_LEVEL_NAME }}</td>
+          <td class="bbg">作业内容</td>
+          <td>{{ pd.JOB_CONTENT }}</td>
+        </tr>
+
+        <tr >
+          <td class="bbg">动火单位负责人部门</td>
+          <td>{{ pd.HOT_WORK_DEPARTMENT_NAME }}</td>
+          <td class="bbg">动火单位负责人</td>
+          <td>{{ pd.HOT_WORK_USER_NAME }}</td>
+        </tr>
+        <tr v-if="pd.JOB_TYPE_INDEX == '1'">
+          <td class="bbg">项目发包单位负责人部门</td>
+          <td>{{ pd.PROJECT_UNIT_LEADER_DEPARTMENT_NAME }}</td>
+          <td class="bbg">项目发包单位负责人</td>
+          <td>{{ pd.PROJECT_UNIT_LEADER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">现场管辖单位负责人部门</td>
+          <td>{{ pd.UNIT_LEADER_DEPARTMENT_NAME }}</td>
+          <td class="bbg">现场管辖单位负责人</td>
+          <td>{{ pd.UNIT_LEADER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">动火前现场管辖单位人员部门</td>
+          <td>{{ pd.HOT_WORK_PERSON_DEPARTMENT_NAME }}</td>
+          <td class="bbg">动火前现场管辖单位人员</td>
+          <td>{{ pd.HOT_WORK_PERSON_USER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">现场负责人部门</td>
+          <td>{{ pd.SITE_LEADER_DEPARTMENT_NAME }}</td>
+          <td class="bbg">现场负责人</td>
+          <td>{{ pd.SITE_LEADER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">动火后现场管辖单位人员部门</td>
+          <td>{{ pd.SITE_LEADER_DEPARTMENT_NAME }}</td>
+          <td class="bbg">动火后现场管辖单位人员</td>
+          <td>{{ pd.SITE_LEADER_NAME }}</td>
+        </tr>
+        <tr>
+          <td class="bbg">延时监火人部门</td>
+          <td>{{ pd.TIME_LAPSE_FIREMAN_DEPARTMENT_NAME }}</td>
+          <td class="bbg">延时监火人</td>
+          <td>{{ pd.TIME_LAPSE_FIREMAN_NAME }}</td>
+        </tr>
+
+        <tr>
+          <td colspan="4" style="padding: 0;">
+            <table class="table-vi">
+              <tr>
+                <th>主要安全措施</th>
+                <!--                <th class="tcenter select">选项√</th>-->
+              </tr>
+              <tr v-for="item in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                <td>
+                  {{ item.PROTECTIVE_MEASURES }}
+                  <template v-if="item.QUESTION1">
+                    {{ item.QUESTION1 }}({{ item.ANSWER1 }})
+                  </template>
+                  <template v-if="item.QUESTION2">
+                    、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }}) 、{{ item.QUESTION4 }}({{ item.ANSWER4 }})
+                  </template>
+                </td>
+                <!--                <td class="tcenter select">-->
+                <!--                  <span v-if="item.STATUS=='1'"><input type="checkbox" disabled checked></span>-->
+                <!--                  <span v-if="item.STATUS=='-1'"><input type="radio" disabled checked></span>-->
+                <!--                </td>-->
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <template v-if="HOTWORKAPPLICATION_TYPE=='see'">
+          <tr>
+            <td colspan="4">
+              <div><span>动火单位负责人：</span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_USER_PRINCIPAL">
+              </span>
+              <span v-if="pd.HOT_WORK_USER_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_USER_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr v-if="pd.JOB_TYPE_INDEX == '1'">
+            <td colspan="4">
+              <div><span>项目发包单位负责人：</span>
+                <span>
+                  {{ pd.GUARDIAN_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.PROJECT_UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.PROJECT_UNIT_LEADER_PRINCIPAL">
+              </span>
+              <span v-if="pd.PROJECT_UNIT_LEADER_PRINCIPAL_TIME">{{ formatTime(pd.PROJECT_UNIT_LEADER_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="4">
+              <div><span>现场管辖单位负责人：</span>
+                <span>
+                  {{ pd.LEADER_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.UNIT_LEADER_PRINCIPAL">
+              </span>
+              <span v-if="pd.UNIT_LEADER_PRINCIPAL_TIME">{{ formatTime(pd.UNIT_LEADER_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="4">
+              <div><span>动火前现场管辖单位人员：</span>
+                <span>
+                  {{ pd.AUDIT_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_PERSON_PRINCIPAL">
+              </span>
+              <span v-if="pd.HOT_WORK_PERSON_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_PERSON_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="4">
+              <div><span>现场负责人：</span>
+                <span>
+                  {{ pd.APPROVE_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.PERSON_CONFIRM_PRINCIPAL" :src="config.fileUrl+pd.PERSON_CONFIRM_PRINCIPAL">
+              </span>
+              <span v-if="pd.PERSON_CONFIRM_PRINCIPAL_TIME">{{ formatTime(pd.PERSON_CONFIRM_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="4">
+              <div><span>动火后现场管辖单位人员：</span>
+                <span>
+                  {{ pd.MONITOR_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_AFTER_PRINCIPAL">
+              </span>
+              <span v-if="pd.HOT_WORK_AFTER_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_AFTER_PRINCIPAL_TIME) }}</span>
+            </td>
+          </tr>
+          <tr v-if="pd.HOT_WORK_LEVEL_INDEX == '0'">
+            <td colspan="4">
+              <div><span>特级动火申请人：</span>
+                <span>
+                  {{ pd.ACCEPT_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.SUPERVISOR_OF_HOT_WORK_UNIT_IMG" :src="config.fileUrl+pd.SUPERVISOR_OF_HOT_WORK_UNIT_IMG">
+              </span>
+              <span v-if="pd.SUPERVISOR_OF_HOT_WORK_UNIT_TIME">{{ formatTime(pd.SUPERVISOR_OF_HOT_WORK_UNIT_TIME) }}</span>
+            </td>
+          </tr>
+          <tr v-if="pd.HOT_WORK_LEVEL_INDEX == '0'">
+            <td colspan="4">
+              <div><span>特级动火审批人：</span>
+                <span>
+                  {{ pd.ACCEPT_CONTENT }}
+                </span>
+              </div>
+              <span class="print-approval-img">
+                <img v-if="pd.APPROVER_DEPARTMENT_IMG" :src="config.fileUrl+pd.APPROVER_DEPARTMENT_IMG">
+              </span>
+              <span v-if="pd.APPROVER_DEPARTMENT_TIME">{{ formatTime(pd.APPROVER_DEPARTMENT_TIME) }}</span>
+            </td>
+          </tr>
+        </template>
+        <template v-if="HOTWORKAPPLICATION_TYPE=='apply'">
+          <tr>
+            <td class="bbg">申请人</td>
+            <td>{{ myUserInfo.USERNAME }}</td>
+            <td class="bbg">申请时间</td>
+            <td>{{ myUserInfo.nowDate }}</td>
+          </tr>
+          <tr>
+            <td class="bbg">申请说明</td>
+            <td>
+              <el-input id="description" ref="description" :rows="3" v-model="form.description" type="textarea" />
+            </td>
+          </tr>
+          <tr>
+            <td class="bbg">审批人部门</td>
+            <td>
+              <SelectTree
+                ref="deptTree"
+                :clearable="false"
+                :options="rectificationDeptList"
+                :props="defaultProps"
+                v-model="form.APPROVER_DEPARTMENT_NAME"
+                placeholder="请选择整改负责人"
+                @change="updateOtherDep(form.APPROVER_DEPARTMENT_NAME)"
+              />
+            </td>
+            <td class="bbg">审批人</td>
+            <td>
+              <el-select v-model="form.APPROVER_INDEX" placeholder="请选择">
+                <el-option v-for="item in rectificationUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </td>
+          </tr>
+        </template>
+      </table>
+
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <!--      <el-button v-print="'#printTest'" v-if="pd.APPLY_STATUS==8">打 印</el-button>-->
+      <el-button v-if="HOTWORKAPPLICATION_TYPE=='apply'" type="primary" @click="confirmApply">提 交</el-button>
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { SelectTree },
+  data() {
+    return {
+      config: config,
+      HOTWORKAPPLICATION_ID: this.$parent.HOTWORKAPPLICATION_ID, // 主键ID
+      HOTWORKAPPLICATION_TYPE: this.$parent.HOTWORKAPPLICATION_TYPE,
+      pd: [], // 存放字段参数
+      measuresList: [],
+      form: {},
+      rules: {},
+      myUserInfo: {},
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name',
+        checkStrictly: true
+      },
+      rectificationDeptList: [],
+      rectificationUserList: []
+    }
+  },
+  created() {
+    console.info(this.HOTWORKAPPLICATION_TYPE)
+    this.getData()
+    this.getDept()
+    this.getListAllMeasures()
+    this.getEditMyInfo()
+  },
+  methods: {
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.HOTWORKAPPLICATION_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/hotworkapplication/goEdit',
+        {
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.pd = data.pd // 参数map
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getListAllMeasures() {
+      this.listLoading = true
+      requestFN(
+        '/app/hotworkapplication/listAllMeasures',
+        {
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.measuresList = data.varList // 参数map
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getEditMyInfo() { // 获取登录人信息
+      requestFN(
+        '/user/goEditMyInfo',
+        {}
+      ).then((data) => {
+        this.myUserInfo.DEPARTMENT_ID = data.depname
+        this.myUserInfo.USERNAME = data.pd.USERNAME
+        var datetime = new Date()
+        var year = datetime.getFullYear()
+        var month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1
+        var date = datetime.getDate() < 10 ? '0' + datetime.getDate() : datetime.getDate()
+        this.myUserInfo.nowDate = year + '年' + month + '月' + date + '日'
+        this.$forceUpdate()
+      }).catch((e) => {
+
+      })
+    },
+    getDept() {
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.rectificationDeptList = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+    confirmApply() {
+      requestFN(
+        '/hotworkapplication/superApproveUser',
+        {
+          APPROVER_ID: this.form.APPROVER_INDEX,
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID,
+          description: this.form.description
+        }
+      ).then((data) => {
+        this.$parent.activeName = 'List'
+      }).catch((e) => {
+      })
+    },
+    // 修改其他检查人部门
+    updateOtherDep(DEPARTMENT_ID) {
+      // this.form.APPROVER_INDEX = ''
+      this.listLoading = true
+      requestFN(
+        '/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.rectificationUserList = data.userList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+</style>
diff --git a/src/views/hotwork/otherUnit/components/info.vue b/src/views/hotwork/otherUnit/components/info.vue
new file mode 100644
index 0000000..48225a7
--- /dev/null
+++ b/src/views/hotwork/otherUnit/components/info.vue
@@ -0,0 +1,568 @@
+<template>
+  <div>
+    <div id="printContent" class="app-container print-work">
+      <div>
+        <table class="table-ui">
+          <thead>
+            <tr>
+              <td colspan="6" style="border: none">
+                <div class="no-print">
+                  <div class="level-title">
+                    <h1>动火申请审批许可证</h1>
+                  </div>
+                </div>
+                <h3 class="no-show" style="text-align: center">动火申请审批许可证</h3>
+              </td>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="tbg" rowspan="2">动火申请人</td>
+              <td rowspan="2">{{ pd.APPLY_USER_NAME }}</td>
+              <td class="tbg" rowspan="2">动火申请单位/部门</td>
+              <td rowspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+              <td class="tbg" colspan="2" style="text-align: center;">动火许可证编号</td>
+            </tr>
+            <tr>
+              <td colspan="2" style="text-align: center;">{{ pd.JOB_NUMBER }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">动火部位</td>
+              <td>{{ pd.HOT_WORK_POSITION }}</td>
+              <td class="tbg">动火方法</td>
+              <td>{{ pd.HOT_WORK_METHOD_NAME }}</td>
+              <td class="tbg">动火等级</td>
+              <td>
+                <template v-if="pd.HOT_WORK_LEVEL_INDEX == '0'">特级</template>
+                <template v-else-if="pd.HOT_WORK_LEVEL_INDEX == '1'">一级</template>
+                <template v-else-if="pd.HOT_WORK_LEVEL_INDEX == '2'">二级</template>
+                <template v-else-if="pd.HOT_WORK_LEVEL_INDEX == '3'">三级</template>
+              </td>
+            </tr>
+            <tr>
+              <td class="tbg">作业内容</td>
+              <td colspan="5">{{ pd.JOB_CONTENT }}</td>
+            </tr>
+            <tr>
+              <td class="tbg" rowspan="2">现场管辖人</td>
+              <td>姓名：{{ pd.SITE_LEADER_NAME }}</td>
+              <td class="tbg" rowspan="2">动火操作人</td>
+              <td rowspan="2">{{ pd.HOT_WORK_OPERATOR_NAME }}</td>
+              <td class="tbg" rowspan="2">动火监火人</td>
+              <td rowspan="2">{{ pd.SUPERVISOR_OF_HOT_WORK_UNIT }}</td>
+            </tr>
+            <tr>
+              <td>电话:{{ pd.SITE_LEADER_PHONE }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">动火时间</td>
+              <td colspan="5">{{ pd.HOT_WORK_TIME_START }} 至 {{ pd.HOT_WORK_TIME_END }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">
+                动火要求<br>
+                安全措施<br>
+                安全提示
+              </td>
+              <td colspan="5">
+                <table class="table-vi">
+                  <tr v-for="item in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                    <td>
+                      {{ item.PROTECTIVE_MEASURES }}
+                      <template v-if="item.ANSWER1">及({{ item.ANSWER1 }}){{ item.QUESTION1 }}</template>
+                      <template v-if="item.QUESTION2">
+                        、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }}) 、{{ item.QUESTION4 }}({{ item.ANSWER4 }})
+                      </template>
+                    </td>
+                  </tr>
+                  <tr v-for="item in safetymethodrecordList" :key="item.HOTWORKSAFETYMETHODRECORD_ID">
+                    <td>{{ item.CONTENT }}</td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td class="tbg">动火单位(部门)负责人意见</td>
+              <td colspan="2">
+                <img v-viewer v-if="pd.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px">
+              </td>
+              <td class="tbg">项目发包单位(部门)人员意见</td>
+              <td colspan="2">
+                <img v-viewer v-if="pd.PROJECT_UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.PROJECT_UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
+              </td>
+            </tr>
+            <tr>
+              <td class="tbg">现场管辖单位(部门)负责人意见</td>
+              <td colspan="2">
+                <img v-viewer v-if="pd.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
+              </td>
+              <td class="tbg">动火许可证签发单位意见</td>
+              <td colspan="2">
+                <img v-viewer v-if="pd.ISSUING_PRINCIPAL" :src="config.fileUrl+pd.ISSUING_PRINCIPAL" width="50px" height="50px">
+              </td>
+            </tr>
+            <tr>
+              <td class="tbg" rowspan="2">动火前管辖单位现场人员许可</td>
+              <td colspan="2">
+                姓名：
+                <img v-viewer v-if="pd.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px">
+              </td>
+              <td class="tbg" rowspan="2">动火后管辖单位现场人员验收</td>
+              <td colspan="2">
+                姓名：
+                <img v-viewer v-if="pd.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px">
+              </td>
+            </tr>
+            <tr>
+              <td v-if="pd.HOT_WORK_PERSON_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_AFTER_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
+            </tr>
+            <tr>
+              <td class="tbg">延时监火记录</td>
+              <td colspan="5">
+                <table class="table-vi">
+                  <tr>
+                    <td>监火人</td>
+                    <td>时间</td>
+                    <td>照片</td>
+                  </tr>
+                  <tr v-for="item in delayedList" :key="item.HOTWORKAPPLICATIONDELAYED_ID">
+                    <td>{{ item.userName }}</td>
+                    <td>{{ item.TIME }}</td>
+                    <td>
+                      <img v-viewer v-if="item.FILEPATH" :src="config.fileUrl+item.FILEPATH" width="50px" height="50px">
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <!--<div v-if="pd.HOT_WORK_LEVEL_INDEX =='0'">
+        <table class="table-ui">
+          <thead>
+            <tr>
+              <td colspan="6" style="border: none">
+                <div class="no-print">
+                  <div class="level-title">
+                    <h1>动火申请审批许可证</h1>
+                  </div>
+                </div>
+                <h3 class="no-show" style="text-align: center">动火申请审批许可证</h3>
+              </td>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="4" style="padding: 0;">
+                <table class="table-vi">
+                  <tr>
+                    <td class="bbg">申请单位</td>
+                    <td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
+                    <td class="bbg">申请人</td>
+                    <td>{{ pd.APPLY_USER_NAME }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">作业证编号</td>
+                    <td>{{ pd.JOB_NUMBER }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">申请日期</td>
+                    <td>{{ formatTime(pd.APPLICATION_DATE) }}</td>
+                    <td class="bbg">作业类型</td>
+                    <td>{{ pd.JOB_TYPE_NAME }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">动火部位</td>
+                    <td>{{ pd.HOT_WORK_POSITION }}</td>
+                    <td class="bbg">动火方法</td>
+                    <td>{{ pd.HOT_WORK_METHOD_NAME }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">动火作业级别</td>
+                    <td>{{ pd.HOT_WORK_LEVEL_NAME }}</td>
+                    <td class="bbg">动火时间：</td>
+                    <td>{{ pd.HOT_WORK_TIME }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">作业内容</td>
+                    <td>{{ pd.JOB_CONTENT }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">动火操作人：</td>
+                    <td>{{ pd.HOT_WORK_OPERATOR_NAME }}</td>
+                  </tr>
+                  <tr v-if="pd.IS_GAS_TESTING =='1'">
+                    <td class="bbg">气体检测人：</td>
+                    <td>{{ pd.GAS_TESTING_USER_NAME }}</td>
+                  </tr>
+                  <tr>
+                    <td class="bbg">延时监火：</td>
+                    <td>{{ pd.HOT_WORK_OPERATOR_NAME }}</td>
+                  </tr>
+
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="4" style="padding: 0;">
+                <table class="table-vi">
+                  <tr>
+                    <th>主要安全措施</th>
+                    &lt;!&ndash;                <th class="tcenter select">选项√</th>&ndash;&gt;
+                  </tr>
+                  <tr v-for="item in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+                    <td>
+                      {{ item.PROTECTIVE_MEASURES }}
+                      <template v-if="item.QUESTION1">
+                        {{ item.QUESTION1 }}({{ item.ANSWER1 }})
+                      </template>
+                      <template v-if="item.QUESTION2">
+                        、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }}) 、{{ item.QUESTION4 }}({{ item.ANSWER4 }})
+                      </template>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <template v-if="HOTWORKAPPLICATION_TYPE=='see'">
+              <tr>
+                <td colspan="4">
+                  <div><span>动火单位负责人：{{ pd.HOT_WORK_USER_NAME }}</span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_USER_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.HOT_WORK_USER_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_USER_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr v-if="pd.JOB_TYPE_INDEX == '1'">
+                <td colspan="4">
+                  <div><span>项目发包单位负责人：</span>
+                    <span>
+                      {{ pd.PROJECT_UNIT_LEADER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.PROJECT_UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.PROJECT_UNIT_LEADER_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.PROJECT_UNIT_LEADER_PRINCIPAL_TIME">{{ formatTime(pd.PROJECT_UNIT_LEADER_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>现场管辖单位负责人：</span>
+                    <span>
+                      {{ pd.UNIT_LEADER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+pd.UNIT_LEADER_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.UNIT_LEADER_PRINCIPAL_TIME">{{ formatTime(pd.UNIT_LEADER_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>动火许可签发单位负责人：</span>
+                    <span>
+                      {{ pd.ISSUING_USER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.ISSUING_PRINCIPAL" :src="config.fileUrl+pd.ISSUING_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.ISSUING_PRINCIPAL_TIME">{{ formatTime(pd.ISSUING_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td v-if="pd.IS_SAFETY_DIRECTOR =='1'" colspan="4">
+                  <div><span>安全总监负责人：</span>
+                    <span>
+                      {{ pd.SAFETY_DIRECTOR_USER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.SAFETY_DIRECTOR_PRINCIPAL" :src="config.fileUrl+pd.SAFETY_DIRECTOR_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.SAFETY_DIRECTOR_PRINCIPAL_TIME">{{ formatTime(pd.SAFETY_DIRECTOR_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>现场负责人接收负责人：</span>
+                    <span>
+                      {{ pd.SITE_LEADER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.SITE_DIRECTOR_PRINCIPAL" :src="config.fileUrl+pd.SITE_DIRECTOR_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.SITE_DIRECTOR_PRINCIPAL_TIME">{{ formatTime(pd.SITE_DIRECTOR_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>动火前现场管辖单位确认：</span>
+                    <span>
+                      {{ pd.HOT_WORK_PERSON_USER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_PERSON_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.HOT_WORK_PERSON_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_PERSON_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>现场负责人确认：</span>
+                    <span>
+                      {{ pd.PERSON_CONFIRM_USER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.PERSON_CONFIRM_PRINCIPAL" :src="config.fileUrl+pd.PERSON_CONFIRM_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.PERSON_CONFIRM_PRINCIPAL_TIME">{{ formatTime(pd.PERSON_CONFIRM_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">
+                  <div><span>动火后现场管辖人：</span>
+                    <span>
+                      {{ pd.HOT_WORK_AFTER_USER_NAME }}
+                    </span>
+                  </div>
+                  <span class="print-approval-img">
+                    <img v-if="pd.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+pd.HOT_WORK_AFTER_PRINCIPAL">
+                  </span>
+                  <span v-if="pd.HOT_WORK_AFTER_PRINCIPAL_TIME">{{ formatTime(pd.HOT_WORK_AFTER_PRINCIPAL_TIME) }}</span>
+                </td>
+              </tr>
+              <tr>
+                <td class="tbg">延时监火</td>
+                <td class="img-select">
+                  &lt;!&ndash;              <viewer :images="hImgs">&ndash;&gt;
+                  &lt;!&ndash;                <img v-for="item in hImgs" :src="config.fileUrl + item.FILEPATH" :key="item.HOTWORKAPPLICATIONDELAYED_ID" width="100" height="100">&ndash;&gt;
+                  &lt;!&ndash;              </viewer>&ndash;&gt;
+                  <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(pd.HOTWORKAPPLICATION_ID)">记录</el-button>
+                </td>
+              </tr>
+            </template>
+            <tr>
+              <td colspan="4">
+                <div class="level-title">
+                  <h1>分公司动火审批</h1>
+                </div>
+                <div class="mb-20">
+                  <table class="table-ui">
+                    <tr>
+                      <td class="abg">动火负责确认人部门</td>
+                      <td >{{ pd.projectCompetent_DEPT_NAME }}</td>
+                      <td class="abg">动火负责确认人</td>
+                      <td >{{ pd.projectCompetent_USER_NAME }}</td>
+                      <td class="abg">审批结果</td>
+                      <td >{{ pd.projectCompetent_TYPE=='2'?'通过':'未通过' }}</td>
+                      <td class="abg">审批时间</td>
+                      <td colspan="2">{{ pd.projectCompetent_OPERATTIME }}</td>
+                    </tr>
+                    <tr>
+                      <td class="abg">项目主管初审人员部门</td>
+                      <td v-if="pd.projectCompetent_DEPT_NAME">{{ pd.projectCompetent_DEPT_NAME }}</td>
+                      <td class="abg">项目主管初审人员</td>
+                      <td >{{ pd.projectSupervisor_USER_NAME }}</td>
+                      <td class="abg">审批结果</td>
+                      <td >{{ pd.projectSupervisor_TYPE=='2'?'通过':'未通过' }}</td>
+                      <td class="abg">审批时间</td>
+                      <td colspan="2">{{ pd.projectCompetent_OPERATTIME }}</td>
+                    </tr>
+                    <tr>
+                      <td class="abg">项目主管负责人部门</td>
+                      <td >{{ pd.projectPreliminarily_DEPT_NAME }}</td>
+                      <td class="abg">项目主管负责人</td>
+                      <td >{{ pd.projectPreliminarily_USER_NAME }}</td>
+                      <td class="abg">审批结果</td>
+                      <td >{{ pd.projectPreliminarily_TYPE=='2'?'通过':'未通过' }}</td>
+                      <td class="abg">审批时间</td>
+                      <td >{{ pd.projectPreliminarily_OPERATTIME }}</td>
+                      <td v-if="pd.projectPreliminarily_PRINCIPAL">
+                        <span class="print-approval-img">
+                          <img v-if="pd.projectPreliminarily_PRINCIPAL" :src="config.fileUrl+pd.projectPreliminarily_PRINCIPAL">
+                        </span>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="abg">分公司安全总监部门</td>
+                      <td >{{ pd.inspectorGeneral_DEPT_NAME }}</td>
+                      <td class="abg">分公司安全总监人员</td>
+                      <td >{{ pd.inspectorGeneral_USER_NAME }}</td>
+                      <td class="abg">审批结果</td>
+                      <td >{{ pd.inspectorGeneral_TYPE=='2'?'通过':'未通过' }}</td>
+                      <td class="abg">审批时间</td>
+                      <td >{{ pd.inspectorGeneral_OPERATTIME }}</td>
+                      <td v-if="pd.inspectorGeneral_PRINCIPAL">
+                        <span class="print-approval-img">
+                          <img :src="config.fileUrl+pd.inspectorGeneral_PRINCIPAL">
+                        </span>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="abg">分公司主要负责人</td>
+                      <td >{{ pd.OFFICE_RESPOMSIBLE_DEPT_NAME }}</td>
+                      <td class="abg">分公司主要负责人</td>
+                      <td >{{ pd.OFFICE_RESPOMSIBLE_USER_NAME }}</td>
+                      <td class="abg">审批结果</td>
+                      <td >{{ pd.OFFICE_RESPOMSIBLE_TYPE=='2'?'通过':'未通过' }}</td>
+                      <td class="abg">审批时间</td>
+                      <td >{{ pd.OFFICE_RESPOMSIBLE_OPERATTIME }}</td>
+                      <td v-if="pd.OFFICE_RESPOMSIBLE_PRINCIPAL">
+                        <span class="print-approval-img">
+                          <img :src="config.fileUrl+pd.OFFICE_RESPOMSIBLE_PRINCIPAL">
+                        </span>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>-->
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button @click="goBack">返 回</el-button>
+      <!--      <el-button v-print="'#printContent'" type="primary">打印</el-button>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import dateformat from '@/utils/dateformat'
+import SelectTree from '@/components/SelectTree'
+export default {
+  components: { SelectTree },
+  data() {
+    return {
+      config: config,
+      HOTWORKAPPLICATION_ID: this.$parent.HOTWORKAPPLICATION_ID, // 主键ID
+      HOTWORKAPPLICATION_TYPE: this.$parent.HOTWORKAPPLICATION_TYPE,
+      pd: [], // 存放字段参数
+      measuresList: [],
+      form: {},
+      rules: {},
+      myUserInfo: {},
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name',
+        checkStrictly: true
+      },
+      rectificationDeptList: [],
+      rectificationUserList: [],
+      hImgs: [],
+      hotUserList: [],
+      safetymethodrecordList: [],
+      delayedList: []
+    }
+  },
+  created() {
+    this.getData()
+    this.getListAllMeasures()
+    this.getDelayed()
+  },
+  methods: {
+    formatTime(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY年MM月DD日HH时mm分')
+      } else {
+        return ''
+      }
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getRowKey(row) {
+      return row.HOTWORKAPPLICATION_ID
+    },
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/hotworkapplication/goEdit',
+        {
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        if (data.pd && data.pd.HOT_WORK_OPERATOR_NAME && data.pd.HOT_WORK_OPERATOR_NAME.length > 0) {
+          data.pd.HOT_WORK_OPERATOR_NAME = data.pd.HOT_WORK_OPERATOR_NAME.substring(0, data.pd.HOT_WORK_OPERATOR_NAME.length - 1)
+        }
+        this.pd = data.pd // 参数map
+        this.safetymethodrecordList = data.safetymethodrecordList
+        this.delayedList = data.delayedList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getDelayed() {
+      this.listLoading = true
+      requestFN(
+        '/hotworkapplicationdelayed/list',
+        {
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.hImgs = data.varList // 参数map
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getListAllMeasures() {
+      this.listLoading = true
+      requestFN(
+        '/app/hotworkapplication/listAllMeasures',
+        {
+          HOTWORKAPPLICATION_ID: this.HOTWORKAPPLICATION_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.measuresList = data.varList // 参数map
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goDetail(id) {
+      console.log(id)
+      this.$parent.HOTWORKAPPLICATION_ID = id
+      this.$parent.activeName = 'Delayed'
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.print-approval-p10
+  padding: 20px 0
+  span
+    vertical-align: middle
+
+.print-approval-img
+  width: 200px
+  height: 97px
+  display: inline-block
+  img
+    width: 100%
+    height: 100%
+</style>
diff --git a/src/views/hotwork/otherUnit/components/list.vue b/src/views/hotwork/otherUnit/components/list.vue
new file mode 100644
index 0000000..2061ac6
--- /dev/null
+++ b/src/views/hotwork/otherUnit/components/list.vue
@@ -0,0 +1,368 @@
+<template>
+  <div class="app-container">
+    <el-form ref="searchForm" :model="searchForm" label-width="80px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="作业编号" prop="keySource">
+            <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
+            <el-select v-model="searchForm.keyState" placeholder="请选择">
+              <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火等级" prop="HOT_WORK_LEVEL_INDEX" >
+            <el-select v-model="searchForm.HOT_WORK_LEVEL_INDEX" placeholder="请选择" style="width: 80%">
+              <el-option v-for="item in hotworklevelList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
+            搜索
+          </el-button>
+          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="chongzhi">
+            重置
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="JOB_NUMBER" label="作业编号" />
+      <el-table-column prop="JOB_TYPE_INDEX" label="作业类型" >
+        <template slot-scope="{row}">
+          {{ translate(row.JOB_TYPE_INDEX, jobTypeList) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="HOT_WORK_LEVEL_INDEX" label="动火等级" >
+        <template slot-scope="{row}">
+          {{ getFireLevel(row.HOT_WORK_LEVEL_INDEX) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="JOB_CONTENT" label="动火内容" />
+      <el-table-column prop="HOT_WORK_POSITION" label="动火部位" />
+      <el-table-column prop="UNIT_LEADER_DEPARTMENT_NAME" label="动火区域管辖单位" />
+      <el-table-column prop="DEPARTMENTNAME" label="申请单位" />
+      <el-table-column prop="CREATORNAME" label="申请人" />
+      <el-table-column prop="CREATE_TIME" label="申请时间" />
+      <el-table-column prop="STATE" label="审核状态" >
+        <template slot-scope="{row}">
+          <template v-if="row.IS_FORCED_END ===1">强制归档  </template>
+          <template v-else >  {{ translate(row.STATE.toString(), statusList) }} </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="OPERATORNAME" label="审核人" />
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="{row}">
+          <el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      treeData: [], // 动火前管辖单位
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      jobTypeList: [
+        { id: '0', name: '内部作业' },
+        { id: '1', name: '相关方作业' }
+      ],
+      statusSuperList: [
+        { id: '0', name: '请选择' },
+        { id: '1', name: '待提交' },
+        { id: '2', name: '待审批' },
+        { id: '3', name: '审批通过' },
+        { id: '4', name: '已打回' }
+      ],
+      hotworklevelList: [
+        { id: '0', name: '特级' },
+        { id: '1', name: '一级' },
+        { id: '2', name: '二级' },
+        { id: '3', name: '三级' }
+      ],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      statusList: [
+        { id: '0', name: '申请人' },
+        { id: '1', name: '动火单位待确认' },
+        { id: '2', name: '项目发包单位待确认' },
+        { id: '3', name: '现场管辖单位待签发' },
+        { id: '4', name: '动火许可签发单位待审核' },
+        { id: '5', name: '安全总监待确认' },
+        { id: '6', name: '现场管辖人待接收' },
+        { id: '7', name: '动火前现场管辖人待确认' },
+        { id: '8', name: '现场管辖人待确认' },
+        { id: '9', name: '动火后现场管辖人待确认' },
+        { id: '30', name: '动火负责人待确认' },
+        { id: '31', name: '项目主管人员待待初审' },
+        { id: '32', name: '项目主管部门负责人待审核' },
+        { id: '33', name: '分公司安全总监待审批' },
+        { id: '34', name: '分公司主要负责人待签批' },
+        { id: '35', name: '（港股）安全监督部门待初审' },
+        { id: '36', name: '安委会办公室待审批' },
+        { id: '37', name: '安全总监待审批' },
+        { id: '10', name: '延时监火' },
+        { id: '11', name: '归档' }, // 分成两部分 1.回档,2.强制回档 有字段表示
+        { id: '-1', name: '审核不通过' },
+        { id: '-2', name: '特级不通过' },
+        { id: '-3', name: '关闭归档' },
+        { id: '-4', name: '延期' },
+        { id: '-5', name: '已打回' },
+        { id: '-6', name: '超期未动火' }
+      ],
+      STATUS: '',
+      DEPTIDS: '',
+      searchForm: {
+        keyJobNumber: '',
+        keyState: '',
+        keyApplyUserName: '',
+        keyApproveUserName: '',
+        keyApproveTime: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: '',
+        UNIT_LEADER_DEPARTMENT_ID: ''
+      },
+      loginUserID: '',
+      loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER
+    }
+  },
+  created() {
+    this.getList()
+    this.getEditMyInfo()
+    this.getDictTreeData()
+  },
+  methods: {
+    getFireLevel(HOT_WORK_LEVEL_INDEX) {
+      if (HOT_WORK_LEVEL_INDEX === '0') {
+        return '特级动火'
+      } else if (HOT_WORK_LEVEL_INDEX === '1') {
+        return '一级动火'
+      } else if (HOT_WORK_LEVEL_INDEX === '2') {
+        return '二级动火'
+      } else if (HOT_WORK_LEVEL_INDEX === '3') {
+        return '三级动火'
+      }
+    },
+    getRowKey(row) {
+      return row.HOTWORK_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    // 获取登录人信息
+    getEditMyInfo() {
+      requestFN(
+        '/user/goEditMyInfo',
+        {}
+      ).then((data) => {
+        this.loginUserID = data.pd.USER_ID				// 主职角色ID
+      }).catch((e) => {
+
+      })
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/hotworkapplication/OtherUnitsSetFire?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          ...this.searchForm,
+          STATE: 0,
+          tm: new Date().getTime(),
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.hotWorkApplicationList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'hotwork:add,hotwork:del,hotwork:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.hotworkfhadminadd		// 新增权限
+        this.del = data.hotworkfhadmindel		// 删除权限
+        this.edit = data.hotworkfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    translate(id, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].BIANMA === id || list[i].value === id || list[i].id === id) return list[i].NAME || list[i].label || list[i].name
+      }
+    },
+    getUserName(keyName, list) {
+      if (list) {
+        var keyVal = ''
+        for (let i = 0; i < list.length; i++) {
+          if (list[i][keyName]) {
+            keyVal += list[i][keyName] + ','
+          }
+        }
+        return keyVal.substring(0, (keyVal.length - 1))
+      }
+    },
+    goDetail(id, type) {
+      this.$parent.activeName = 'Detail'
+      this.$parent.HOTWORKAPPLICATION_ID = id
+      this.$parent.HOTWORKAPPLICATION_TYPE = type
+    },
+    goInfo(id, type) {
+      this.$parent.activeName = 'Info'
+      this.$parent.HOTWORKAPPLICATION_ID = id
+      this.$parent.HOTWORKAPPLICATION_TYPE = type
+    },
+
+    getDictTreeData() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/department/listTreeCorpDept',
+          {}
+        ).then((data) => {
+          this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          resolve('ok')
+        }).catch((e) => {
+        })
+      })
+    },
+    chongzhi() {
+      this.searchForm = {
+        stateConfirm: '',
+        keySource: '',
+        UNIT_LEADER_DEPARTMENT_ID: '',
+        keyHiddenDescr: '',
+        keyFindUserName: '',
+        keyFindUserDept: '',
+        keyHiddenType: '',
+        keyHiddenPart: '',
+        keyHiddenlevel: '',
+        keyFindTime: [],
+        keyFindStateTime: '',
+        keyFindEndTime: '',
+        keyConfirmUser: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: ''
+      }
+      this.$refs.deptTree_Inspected.clearHandle()
+      this.$refs.searchForm.resetFields()
+      this.getList()
+    },
+    batchDel(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/hotworkapplication/delete',
+          {
+            HOTWORKAPPLICATION_ID: id,
+            loginUserId: this.loginUserID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          // this.getList()
+          // this.listQuery.page = 1
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    forcedEnd(id, STATE) { // 强制结束
+      this.$confirm('确定要强制结束吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/hotworkapplication/forcedEnd',
+          {
+            HOTWORKAPPLICATION_ID: id,
+            STATE: STATE,
+            loginUserId: this.loginUserID
+          }
+        ).then(() => {
+          this.$message({
+            message: '结束成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          // this.listQuery.page = 1
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+
+</script>
diff --git a/src/views/hotwork/otherUnit/index.vue b/src/views/hotwork/otherUnit/index.vue
new file mode 100644
index 0000000..8d1885c
--- /dev/null
+++ b/src/views/hotwork/otherUnit/index.vue
@@ -0,0 +1,37 @@
+<template>
+  <div>
+    <List v-show="activeName=='List'" ref="list" />
+    <Detail v-if="activeName=='Detail'"/>
+    <Info v-if="activeName=='Info'"/>
+  </div>
+</template>
+
+<script>
+import List from './components/list'
+import Detail from './components/detail'
+import Info from './components/info'
+export default {
+  components: {
+    List: List,
+    Detail: Detail,
+    Info: Info
+  },
+  data() {
+    return {
+      activeName: 'List',
+      HOTWORKAPPLICATION_ID: '',
+      HOTWORKAPPLICATION_TYPE: ''
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getList()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 3d566a4c78ea12733a266b89876ab742c472ce24 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Thu, 6 Mar 2025 08:48:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hyx?=
 =?UTF-8?q?=5F2024-03-04=5FfireWork):=20=20=20-=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=9C=89=E6=95=88=E6=9C=9F=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=A1=AB=E5=86=99=E7=9A=84=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/list.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 8e40fb1..a105f3d 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -39,8 +39,7 @@
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
-      <el-table-column prop="VALIDITY_PERIOD_START" label="培训有效期开始时间" align="center"/>
-      <el-table-column prop="VALIDITY_PERIOD_END" label="培训有效期结束时间" align="center"/>
+      <el-table-column prop="LIMIT_END_TIME" label="培训有效期结束时间" align="center"/>
       <el-table-column label="操作" align="center" width="450">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>