guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

main
limingyu 2023-12-25 14:28:56 +08:00
parent c2191b9680 bb8fdbd9b7
commit 57389ffb4a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/hotwork/hotwork/components/list.vue
View File

@ -84,7 +84,11 @@
{{ translate(row.STATE.toString(), statusList) }} {{ translate(row.STATE.toString(), statusList) }}
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}"> <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>--> <!-- <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: '35', name: '（港股）安全监督部门待初审' },
{ id: '36', name: '安委会办公室待审批' }, { id: '36', name: '安委会办公室待审批' },
{ id: '37', name: '安全总监待审批' }, { id: '37', name: '安全总监待审批' },
{ id: '10', name: '延时动火' }, { id: '10', name: '延时监火' },
{ id: '11', name: '归档' }, { id: '11', name: '归档' },
{ id: '-1', name: '审核不通过' }, { id: '-1', name: '审核不通过' },
{ id: '-2', name: '特级不通过' }, { id: '-2', name: '特级不通过' },