Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-03-06 16:14:25 +08:00
parent 5f915d5436 ed27e092a8
commit 4de9e3ab85
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/enum/permission.ts
View File

@@ -21,7 +21,7 @@ export const permissionGroups = [
{
name: '需求管理',
permissions: [
{ btn: '需求管理-创建需求', code: 'demand_add_demand' },
{ btn: '需求管理-创建待办', code: 'demand_add_demand' },
{ btn: '需求管理-编辑需求', code: 'demand_edit_demand' },
{ btn: '需求管理-删除需求', code: 'demand_delete_demand' },
],

40
src/views/task/simulationTask/newDemand/index.vue
View File

@@ -30,14 +30,14 @@
type="primary"
v-permission="'demand_add_demand'"
@click="visibleDialog(true)"
>创建需求</el-button
>创建待办</el-button
>
</template>
</demandTable>
<Dialog
v-model="formVisible"
:loading="loadingInterface"
:diaTitle="isCreateDialog ? '创建需求' : '编辑需求'"
:diaTitle="isCreateDialog ? '创建待办' : '编辑需求'"
width="60%"
:height="700"
@close="closeFun"
@@ -341,7 +341,7 @@ const confirmFun = async () => {
}
if (isCreateDialog.value) {
const demandId = await createDemandApiFun(editFormInfo.value);
// 没有demandId就是创建需求失败
// 没有demandId就是创建待办失败
if (demandId && editFormInfo.value.attachments?.length > 0) {
const files = editFormInfo.value.attachments.filter((item: any) => item.raw);
if (files.length > 0) {
@@ -401,7 +401,7 @@ const createDemandApiFun = async (fromData: any) => {
// 待办所属类型
demandType: simulationType.value,
// 是否走利元亨创建需求直接创建任务逻辑
// 是否走利元亨创建待办直接创建任务逻辑
isLyric: enableConfigByTenant([TENANT_ENUM.LYRIC]),
};
// return;
@@ -664,23 +664,23 @@ const disposeDeptMember = async () => {
}
return pMemberId;
}
const disFun = (simType: string) => {
for (let index = 0; index < deptList.value.length; index++) {
if (deptList.value[index].deptName.includes(simType)) {
editFormInfo.value.pMemberList =
deptList.value[index].userId + '-' + deptList.value[index].deptName;
pMemberId = deptList.value[index].userId;
}
}
return pMemberId;
};
if (editFormInfo.value.simType.includes('流体')) {
return disFun('流体');
}
// const disFun = (simType: string) => {
// for (let index = 0; index < deptList.value.length; index++) {
// if (deptList.value[index].deptName.includes(simType)) {
// editFormInfo.value.pMemberList =
// deptList.value[index].userId + '-' + deptList.value[index].deptName;
// pMemberId = deptList.value[index].userId;
// }
// }
// return pMemberId;
// };
// if (editFormInfo.value.simType.includes('流体')) {
// return disFun('流体');
// }
if (editFormInfo.value.simType.includes('热力学')) {
return disFun('热力学');
}
// if (editFormInfo.value.simType.includes('热力学')) {
// return disFun('热力学');
// }
const matchingDeptList = deptList.value.filter((item: any) => {
return item.deptName.indexOf(currentProjectUndertaker.value) !== -1;
});