|
@@ -135,13 +135,23 @@ function DropdownMenu(props) {
|
|
.split(',')
|
|
.split(',')
|
|
.some(id => currentUser.roleList?.find(role => role.ID == id));
|
|
.some(id => currentUser.roleList?.find(role => role.ID == id));
|
|
}
|
|
}
|
|
- const uidsStr = classifyList.find(item => item.classify_id == version.classify_id)?.uid;
|
|
|
|
- if (uidsStr && uidsStr.split(',')?.findIndex(item => item == currentUser.ID) < 0) {
|
|
|
|
- bool = false;
|
|
|
|
|
|
+ // 非全部分类判断是否含有权限
|
|
|
|
+ if(version.classify_id != 1) {
|
|
|
|
+ // 判断在特定分类下是否有权限
|
|
|
|
+ const uidsStr = classifyList.find(item => item.classify_id == version.classify_id)?.uid;
|
|
|
|
+ if (uidsStr && uidsStr.split(',')?.findIndex(item => item == currentUser.ID) < 0) {
|
|
|
|
+ bool = false;
|
|
|
|
+
|
|
|
|
+ // 判断在全部分类下是否有权限
|
|
|
|
+ const allUidsStr = classifyList.find(item => item.classify_id == 1)?.uid
|
|
|
|
+ if (allUidsStr && allUidsStr.split(',')?.findIndex(item => item == currentUser.ID) != -1) {
|
|
|
|
+ bool = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return bool;
|
|
return bool;
|
|
};
|
|
};
|
|
- if (getIsSubmit() && version.audit_status != 3)
|
|
|
|
|
|
+ if (getIsSubmit() && version.audit_status == 0)
|
|
menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
|
|
menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
|
|
|
|
|
|
if (!isAuditor && canEdit() && !version.flow_id) {
|
|
if (!isAuditor && canEdit() && !version.flow_id) {
|