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-02-26 18:49:29 +08:00
parent 6fa8e136ca 600db976b6
commit 5992526716
3 changed files with 99 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/common/treeCaseTable/treeTable.vue
View File

@@ -172,7 +172,7 @@
<template #payAttentionMemberIds="{ row, icon }">
<TreeEditItem
v-if="[NODE_TYPE.TASK].includes(row.nodeType)"
:data="row.payAttentionMemberList"
:data="row.payAttentionMemberIds"
:editMode="editMode"
:icon="icon"
hideTitle
@@ -188,7 +188,7 @@
(data) => changeUserFun(row, data, 'payAttentionMemberList', 'payAttentionMemberIds')
"
:multiple="true"
v-model="row.payAttentionMemberList"
v-model="row.payAttentionMemberIds"
></userSelect>
</template>
<!-- 计划开始时间 -->

4
src/views/task/simulationTask/components/demandTable.vue
View File

@@ -60,9 +60,9 @@
<template #phaseId="{ row }">
{{ row.phaseName }}
</template>
<template #workspace="{ row }">
<!-- <template #workspace="{ row }">
{{ row.workspaceName }}
</template>
</template> -->
<template #pMemberList="{ row }">
<!-- {{ row.pMemberList }} -->
{{ disposeMemberList(row, 'pMemberList') }}

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

@@ -249,7 +249,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
});
}
let workspaceList = [];
if (row.workspace && row.phaseId) {
if (row.workspaceId && row.phaseId) {
workspaceList = await getChildrenNodeList(NODE_TYPE.WORKSPACE, row.phaseId);
workspaceList = workspaceList.map((item: any) => {
return {
@@ -267,7 +267,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
nextTick(async () => {
tableFormRef.value.setOptionsFun('phaseId', phaseList);
tableFormRef.value.setOptionsFun('workspace', workspaceList);
tableFormRef.value.setOptionsFun('workspaceId', workspaceList);
if (simList?.A) {
tableFormRef.value.setOptionsFun('simType', simList.A);
}
@@ -315,15 +315,15 @@ const deleteDemandFun = async (uuid: number) => {
const confirmFun = async () => {
if (await tableFormRef.value.validateFun()) {
loadingInterface.value = true;
const fromData: any = tableFormRef.value.getFormDataFun();
if (fromData.planTime) {
fromData.beginTime = fromData.planTime[0];
fromData.endTime = fromData.planTime[1];
// const fromData: any = tableFormRef.value.getFormDataFun();
if (editFormInfo.value.planTime) {
editFormInfo.value.beginTime = editFormInfo.value.planTime[0];
editFormInfo.value.endTime = editFormInfo.value.planTime[1];
}
if (isCreateDialog.value) {
const demandId = await createDemandApiFun(fromData);
const demandId = await createDemandApiFun(editFormInfo.value);
// 没有demandId就是创建需求失败
if (demandId && fromData.attachments?.length > 0) {
if (demandId && editFormInfo.value.attachments?.length > 0) {
// for (let index = 0; index < fromData.attachments.length; index++) {
// const form = new FormData();
// form.append('fileType', String(FILE_TYPE.DEMAND_ATTACHMENTS));
@@ -334,12 +334,12 @@ const confirmFun = async () => {
// upload(`${PREFIX}demand/uploadDemandFiles`, form);
// }
}
const files = fromData.attachments.filter((item: any) => item.raw);
const files = editFormInfo.value.attachments.filter((item: any) => item.raw);
if (files.length > 0) {
const params = {
fileList: files, // 文件列表
// dirId: demandId, // 文件目录id
projectId: fromData.projectId, // 项目id
projectId: editFormInfo.value.projectId, // 项目id
callbackFlag: '/task/sponsor', // 回调标识
uuid: demandId,
};
@@ -348,7 +348,7 @@ const confirmFun = async () => {
// batchUploadFile(fromData.attachments, fromData.projectId, demandId);
formVisible.value = false;
} else {
await editDemandApiFun(fromData);
await editDemandApiFun(editFormInfo.value);
}
loadingInterface.value = false;
tableRef.value.tableRef.resetFun();
@@ -384,7 +384,7 @@ const createDemandApiFun = async (fromData: any) => {
demandStatus: '0',
machineId: fromData.machineId,
workspaceId: fromData.workspace,
workspaceId: fromData.workspaceId,
// 待办所属类型
demandType: simulationType.value,
@@ -424,7 +424,7 @@ const editDemandApiFun = async (fromData: any) => {
pMemberList: getPMemberId(),
eMemberList: '',
machineId: fromData.machineId,
workspaceId: fromData.workspace,
workspaceId: fromData.workspaceId,
// 待办所属类型
demandType: simulationType.value,
});
@@ -495,7 +495,7 @@ const changeSimulationType = (val: string) => {
};
const changeFun = async (val: any, type: string) => {
const formData = tableFormRef.value.getFormDataFun();
// const formData = tableFormRef.value.getFormDataFun();
// editFormInfo.value = { ...formData };
if (val.key === 'projectId') {
let nodeType = '';
@@ -511,7 +511,7 @@ const changeFun = async (val: any, type: string) => {
currentProjectUndertaker.value = val.val.extras[index].propertyValue;
}
}
if (formData.simType) {
if (editFormInfo.value.simType) {
await disposeDeptMember();
// formData.pMemberList = await disposeDeptMember();
}
@@ -520,90 +520,93 @@ const changeFun = async (val: any, type: string) => {
const optionList = await getPhaseList(nodeType, nodeId);
tableFormRef.value.setOptionsFun(nextKey, optionList);
if (nextKey === 'phaseId' && optionList.length > 0) {
formData.phaseId = optionList[0].value;
const workspaceInfo = await getWorkSpaceList(formData.phaseId);
formData.workspace = workspaceInfo.value;
formData.machineId = '';
if (formData.phaseId !== workspaceInfo.parentId) {
formData.machineId = workspaceInfo.parentId;
editFormInfo.value.phaseId = optionList[0].value;
const workspaceInfo = await getWorkSpaceList(editFormInfo.value.phaseId);
editFormInfo.value.workspaceId = workspaceInfo.value;
editFormInfo.value.machineId = '';
if (editFormInfo.value.phaseId !== workspaceInfo.parentId) {
editFormInfo.value.machineId = workspaceInfo.parentId;
}
formData.workspaceName = workspaceInfo.label;
formData.extras = setWorkSpaceValue(
formData.extras,
formData.workspace,
formData.workspaceName
);
// formData.workspaceName = workspaceInfo.label;
// formData.extras = setWorkSpaceValue(
// formData.extras,
// formData.workspace,
// formData.workspaceName
// );
}
if (optionList.length === 0) {
formData.phaseId = '';
editFormInfo.value.phaseId = '';
// 清空工位数据
formData.extras = setWorkSpaceValue(formData.extras, '', '');
tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, []);
editFormInfo.value.machineId = '';
editFormInfo.value.workspaceId = '';
// formData.extras = setWorkSpaceValue(formData.extras, '', '');
tableFormRef.value.setOptionsFun('workspaceId', []);
}
} else {
tableFormRef.value.setOptionsFun(nextKey, []);
formData.phaseId = '';
formData.workspace = '';
formData.workspaceName = '';
formData.extras = setWorkSpaceValue(formData.extras, '', '');
editFormInfo.value.phaseId = '';
editFormInfo.value.machineId = '';
editFormInfo.value.workspaceId = '';
// formData.workspaceName = '';
// formData.extras = setWorkSpaceValue(formData.extras, '', '');
}
// const formData = tableFormRef.value.getFormDataFun();
// tableFormRef.value.setFormDataFun({ ...formData, phaseId: '' });
editFormInfo.value = { ...formData };
// editFormInfo.value = { ...formData };
}
if (val.key === 'phaseId') {
if (formData.phaseId) {
const workspaceInfo = await getWorkSpaceList(formData.phaseId);
formData.machineId = '';
if (formData.phaseId !== workspaceInfo.parentId) {
formData.machineId = workspaceInfo.parentId;
if (editFormInfo.value.phaseId) {
const workspaceInfo = await getWorkSpaceList(editFormInfo.value.phaseId);
editFormInfo.value.machineId = '';
if (editFormInfo.value.phaseId !== workspaceInfo.parentId) {
editFormInfo.value.machineId = workspaceInfo.parentId;
}
formData.workspace = workspaceInfo.value;
formData.workspaceName = workspaceInfo.label;
formData.extras = setWorkSpaceValue(
formData.extras,
formData.workspace,
formData.workspaceName
);
editFormInfo.value.workspaceId = workspaceInfo.value;
// formData.workspaceName = workspaceInfo.label;
// formData.extras = setWorkSpaceValue(
// formData.extras,
// formData.workspace,
// formData.workspaceName
// );
} else {
formData.workspace = '';
formData.workspaceName = '';
formData.extras = setWorkSpaceValue(
formData.extras,
formData.workspace,
formData.workspaceName
);
editFormInfo.value.workspaceId = '';
// formData.workspaceName = '';
// formData.extras = setWorkSpaceValue(
// formData.extras,
// formData.workspace,
// formData.workspaceName
// );
}
editFormInfo.value = { ...formData };
// editFormInfo.value = { ...formData };
}
if (val.key === 'workspace') {
if (formData.workspace) {
formData.machineId = '';
if (formData.phaseId !== val.val.parentId) {
formData.machineId = val.val.parentId;
if (val.key === 'workspaceId') {
if (editFormInfo.value.workspaceId) {
editFormInfo.value.machineId = '';
if (editFormInfo.value.phaseId !== val.val.parentId) {
editFormInfo.value.machineId = val.val.parentId;
}
formData.workspace = val.val.value;
formData.workspaceName = val.val.label;
formData.extras = setWorkSpaceValue(
formData.extras,
formData.workspace,
formData.workspaceName
);
editFormInfo.value.workspaceId = val.val.value;
// formData.workspaceName = val.val.label;
// formData.extras = setWorkSpaceValue(
// formData.extras,
// formData.workspace,
// formData.workspaceName
// );
} else {
formData.machineId = '';
formData.workspace = '';
formData.workspaceName = '';
formData.extras = setWorkSpaceValue(
formData.extras,
formData.workspace,
formData.workspaceName
);
editFormInfo.value.machineId = '';
editFormInfo.value.workspaceId = '';
// formData.workspaceName = '';
// formData.extras = setWorkSpaceValue(
// formData.extras,
// formData.workspace,
// formData.workspaceName
// );
}
editFormInfo.value = { ...formData };
// editFormInfo.value = { ...formData };
}
if (val.key === 'simType') {
if (formData.projectId) {
if (editFormInfo.value.projectId) {
await disposeDeptMember();
// formData.pMemberList = await disposeDeptMember();
}
@@ -648,19 +651,19 @@ const disposeDeptMember = async () => {
return pMemberId;
};
const setWorkSpaceValue = (extras: any, workspace: string, workspaceName: string) => {
return extras.map((item: any) => {
if (item.propertyName === NODE_TYPE.WORKSPACE) {
item.propertyValue = workspace;
}
if (item.propertyName === NODE_TYPE.WORKSPACE + 'Name') {
item.propertyValue = workspaceName;
}
return {
...item,
};
});
};
// const setWorkSpaceValue = (extras: any, workspace: string, workspaceName: string) => {
// return extras.map((item: any) => {
// if (item.propertyName === NODE_TYPE.WORKSPACE) {
// item.propertyValue = workspace;
// }
// if (item.propertyName === NODE_TYPE.WORKSPACE + 'Name') {
// item.propertyValue = workspaceName;
// }
// return {
// ...item,
// };
// });
// };
const getWorkSpaceList = async (phaseId: string) => {
const res: any = await getChildrenNodeListApi({
@@ -673,7 +676,7 @@ const getWorkSpaceList = async (phaseId: string) => {
if (res.data.length === 0) {
ElMessage.warning('该阶段下没有工位，请先做仿真策划！');
// 清空工位数据
tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, []);
tableFormRef.value.setOptionsFun('workspaceId', []);
} else {
const optionList = res.data.map((item: any) => {
return {
@@ -682,7 +685,7 @@ const getWorkSpaceList = async (phaseId: string) => {
parentId: item.parentId,
};
});
tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, optionList);
tableFormRef.value.setOptionsFun('workspaceId', optionList);
if (optionList.length > 0) {
return optionList[0];
}