Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-11-04 17:06:17 +08:00
commit 2c18753063
1 changed files with 7 additions and 4 deletions

View File

@ -92,7 +92,7 @@
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="230" fixed="right"> <el-table-column label="操作" align="center" min-width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -118,7 +118,7 @@
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" v-if="scope.row.taskStatusName == '未完成' && deptName.includes(signLevelDeptMap[scope.row.signLevel])" type="primary" v-if="scope.row.taskStatusName == '未完成' && (signLevelDeptMap[scope.row.signLevel] || []).some(name => deptName.includes(name))"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
> >
验收 验收
@ -305,8 +305,8 @@
printTableData: [], printTableData: [],
deptName: sessionStorage.getItem("deptName"), deptName: sessionStorage.getItem("deptName"),
signLevelDeptMap: { signLevelDeptMap: {
'2': '技术科', '2': ['技术科'],
'3': '库管' '3': ['库管', '修试二班']
} }
}; };
}, },
@ -511,4 +511,7 @@
display: none; display: none;
} }
} }
.el-button {
margin-bottom: 5px;
}
</style> </style>