admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

Browse Source
This commit is contained in:
X_Rian 2024-06-05 20:59:01 +08:00
commit c3fd0624a5
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/projectFront/dangerousBigProject/detail.vue
View File

@ -701,12 +701,12 @@
<el-table-column prop="createUserName" label="记录人"> <el-table-column prop="createUserName" label="记录人">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="记录时间"> </el-table-column> <el-table-column prop="createTime" label="记录时间"> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == detailData.personLiableId)">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-delete delete-btn" class="el-icon-delete delete-btn"
@click="deleteDangerousEngineeringProgressRecord(scope.row.id)" @click="deleteDangerousEngineeringProgressRecord(scope.row.id)"
></i> >删除</i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -741,12 +741,12 @@
<el-table-column prop="createUserName" label="记录人"> <el-table-column prop="createUserName" label="记录人">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="记录时间"> </el-table-column> <el-table-column prop="createTime" label="记录时间"> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == detailData.personLiableId)">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-delete delete-btn" class="el-icon-delete delete-btn"
@click="deleteDangerousEngineeringSideStation(scope.row.id)" @click="deleteDangerousEngineeringSideStation(scope.row.id)"
></i> >删除</i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -795,12 +795,12 @@
<el-table-column prop="acceptanceUserName" label="记录人"> <el-table-column prop="acceptanceUserName" label="记录人">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="记录时间"> </el-table-column> <el-table-column prop="createTime" label="记录时间"> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == detailData.personLiableId)">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-delete delete-btn" class="el-icon-delete delete-btn"
@click="deleteDangerousEngineeringAcceptanceCheck(scope.row.id)" @click="deleteDangerousEngineeringAcceptanceCheck(scope.row.id)"
></i> >删除</i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -956,12 +956,12 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == detailData.personLiableId)">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-delete delete-btn" class="el-icon-delete delete-btn"
@click="deletehiddenDangerInspectRecord(scope.row.id, 1)" @click="deletehiddenDangerInspectRecord(scope.row.id, 1)"
></i> >删除</i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -1014,12 +1014,12 @@
</el-table-column> </el-table-column>
<el-table-column prop="createTime" width="180" label="检查时间"> </el-table-column> <el-table-column prop="createTime" width="180" label="检查时间"> </el-table-column>
<el-table-column prop="enterpriseName" label="分包单位"> </el-table-column> <el-table-column prop="enterpriseName" label="分包单位"> </el-table-column>
<el-table-column label="操作" width="80"> <el-table-column label="操作" width="80" v-if="$store.state.userInfo.accountType != 6 || ($store.state.userInfo.userId == detailData.personLiableId)">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
class="el-icon-delete delete-btn" class="el-icon-delete delete-btn"
@click="deletehiddenDangerInspectRecord(scope.row.id, 2)" @click="deletehiddenDangerInspectRecord(scope.row.id, 2)"
></i> >删除</i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

12
src/views/projectFront/dangerousBigProject/index.vue
View File

@ -204,6 +204,11 @@
编辑 编辑
</el-button> --> </el-button> -->
<el-button <el-button
v-if="
$store.state.userInfo.accountType != 6 ||
$store.state.userInfo.userId ==
scope.row.personLiableId
"
v-permission="{key: 'wdgc_edit', menuPath: '/project/dangerousBigProject/parameter'}" v-permission="{key: 'wdgc_edit', menuPath: '/project/dangerousBigProject/parameter'}"
@click.stop="editRow(scope.$index, tableData)" @click.stop="editRow(scope.$index, tableData)"
type="text" type="text"
@ -212,6 +217,11 @@
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
</el-button> </el-button>
<el-button <el-button
v-if="
$store.state.userInfo.accountType != 6 ||
$store.state.userInfo.userId ==
scope.row.personLiableId
"
v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}" v-permission="{key: 'wdgc_delete', menuPath: '/project/dangerousBigProject/parameter'}"
@click.stop="deleteRow(scope.$index, tableData)" @click.stop="deleteRow(scope.$index, tableData)"
type="text" type="text"
@ -884,7 +894,7 @@ export default {
this.$message.error(this.$t('message.dangerousBigProject.uploadFail')); this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
}, },
previewDetail(val) { previewDetail(val) {
console.log(val) console.log(val,'点击危大工程详情')
this.dialogFormVisible = false this.dialogFormVisible = false
this.isEdit = true this.isEdit = true
this.isAdd = false this.isAdd = false