Merge branch 'lmy20231113' into 1212-八项作业迁移

src/views/hotwork/hotwork/components/list.vue

@@ -84,7 +84,11 @@
           {{ translate(row.STATE.toString(), statusList) }}
         </template>
       </el-table-column>
-      <el-table-column prop="examineUserName" label="审核人" />
+      <el-table-column prop="examineUserName" label="审核人" >
+        <template slot-scope="{row}">
+          {{ row.examineUserName || row.examineDeptName }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <!--          <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
@@ -178,7 +182,7 @@ export default {
         { id: '35', name: '（港股）安全监督部门待初审' },
         { id: '36', name: '安委会办公室待审批' },
         { id: '37', name: '安全总监待审批' },
-        { id: '10', name: '延时动火' },
+        { id: '10', name: '延时监火' },
         { id: '11', name: '归档' },
         { id: '-1', name: '审核不通过' },
         { id: '-2', name: '特级不通过' },