1.八项作业强制回档
parent
cc83fc0828
commit
1354982c6a
|
@ -81,7 +81,8 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="STATE" label="审核状态" >
|
<el-table-column prop="STATE" label="审核状态" >
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
{{ translate(row.STATE.toString(), statusList) }}
|
<template v-if="row.IS_FORCED_END ===1">强制回档 </template>
|
||||||
|
<template v-else > {{ translate(row.STATE.toString(), statusList) }} </template>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="examineUserName" label="审核人" >
|
<el-table-column prop="examineUserName" label="审核人" >
|
||||||
|
@ -89,11 +90,12 @@
|
||||||
{{ row.examineUserName || row.examineDeptName }}
|
{{ row.examineUserName || row.examineDeptName }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="200">
|
<el-table-column label="操作" align="center" width="300">
|
||||||
<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>-->
|
||||||
<!-- <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
|
<!-- <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
|
||||||
<el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
|
<el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
|
||||||
|
<el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="primary" icon="el-icon-document" size="mini" @click="forcedEnd(row.HOTWORKAPPLICATION_ID,row.STATE)">强制结束</el-button>
|
||||||
<!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
|
<!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
|
||||||
<el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
|
<el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
@ -184,7 +186,7 @@ export default {
|
||||||
{ id: '36', name: '安委会办公室待审批' },
|
{ id: '36', name: '安委会办公室待审批' },
|
||||||
{ id: '37', name: '安全总监待审批' },
|
{ id: '37', name: '安全总监待审批' },
|
||||||
{ id: '10', name: '延时监火' },
|
{ id: '10', name: '延时监火' },
|
||||||
{ id: '11', name: '归档' },
|
{ id: '11', name: '归档' }, // 分成两部分 1.回档,2.强制回档 有字段表示
|
||||||
{ id: '-1', name: '审核不通过' },
|
{ id: '-1', name: '审核不通过' },
|
||||||
{ id: '-2', name: '特级不通过' },
|
{ id: '-2', name: '特级不通过' },
|
||||||
{ id: '-3', name: '关闭归档' },
|
{ id: '-3', name: '关闭归档' },
|
||||||
|
@ -294,6 +296,7 @@ export default {
|
||||||
this.$parent.HOTWORKAPPLICATION_ID = id
|
this.$parent.HOTWORKAPPLICATION_ID = id
|
||||||
this.$parent.HOTWORKAPPLICATION_TYPE = type
|
this.$parent.HOTWORKAPPLICATION_TYPE = type
|
||||||
},
|
},
|
||||||
|
|
||||||
getDictTreeData() {
|
getDictTreeData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
|
@ -354,6 +357,35 @@ export default {
|
||||||
})
|
})
|
||||||
}).catch(() => {
|
}).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(() => {
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue