diff --git a/src/views/task/simulationTask/newDemand/index.vue b/src/views/task/simulationTask/newDemand/index.vue index fc02681e..f1e84e1d 100644 --- a/src/views/task/simulationTask/newDemand/index.vue +++ b/src/views/task/simulationTask/newDemand/index.vue @@ -68,6 +68,9 @@ projectId: { auth: false, }, + workspaceCode: { + filterable: true, + }, }" :colNum="2" :hideKeys="hideKeys.concat(formHideKeys)" @@ -264,12 +267,13 @@ const visibleDialog = async (isCreate: boolean, row?: any) => { }); } let workspaceList = []; - if (row.workspaceId && row.phaseId) { + if (row.workspaceCode && row.phaseId) { workspaceList = await getChildrenNodeList(NODE_TYPE.WORKSPACE, row.phaseId); workspaceList = workspaceList.map((item: any) => { return { - label: item.nodeName, - value: item.uuid, + label: item.nodeCode, + value: item.nodeCode, + uuid: item.uuid, parentId: item.parentId, }; }); @@ -282,7 +286,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => { nextTick(async () => { tableFormRef.value.setOptionsFun('phaseId', phaseList); - tableFormRef.value.setOptionsFun('workspaceId', workspaceList); + tableFormRef.value.setOptionsFun('workspaceCode', workspaceList); if (simList?.A) { tableFormRef.value.setOptionsFun('simType', simList.A); } @@ -537,7 +541,8 @@ const changeFun = async (val: any, type: string) => { if (nextKey === 'phaseId' && optionList.length > 0) { editFormInfo.value.phaseId = optionList[0].value; const workspaceInfo = await getWorkSpaceList(editFormInfo.value.phaseId); - editFormInfo.value.workspaceId = workspaceInfo.value; + editFormInfo.value.workspaceId = workspaceInfo.uuid; + editFormInfo.value.workspaceCode = workspaceInfo.value; editFormInfo.value.machineId = ''; if (editFormInfo.value.phaseId !== workspaceInfo.parentId) { editFormInfo.value.machineId = workspaceInfo.parentId; @@ -554,14 +559,17 @@ const changeFun = async (val: any, type: string) => { // 清空工位数据 editFormInfo.value.machineId = ''; editFormInfo.value.workspaceId = ''; + editFormInfo.value.workspaceCode = ''; // formData.extras = setWorkSpaceValue(formData.extras, '', ''); tableFormRef.value.setOptionsFun('workspaceId', []); + tableFormRef.value.setOptionsFun('workspaceCode', []); } } else { tableFormRef.value.setOptionsFun(nextKey, []); editFormInfo.value.phaseId = ''; editFormInfo.value.machineId = ''; editFormInfo.value.workspaceId = ''; + editFormInfo.value.workspaceCode = ''; // formData.workspaceName = ''; // formData.extras = setWorkSpaceValue(formData.extras, '', ''); } @@ -577,7 +585,8 @@ const changeFun = async (val: any, type: string) => { if (editFormInfo.value.phaseId !== workspaceInfo.parentId) { editFormInfo.value.machineId = workspaceInfo.parentId; } - editFormInfo.value.workspaceId = workspaceInfo.value; + editFormInfo.value.workspaceId = workspaceInfo.uuid; + editFormInfo.value.workspaceCode = workspaceInfo.value; // formData.workspaceName = workspaceInfo.label; // formData.extras = setWorkSpaceValue( // formData.extras, @@ -586,6 +595,7 @@ const changeFun = async (val: any, type: string) => { // ); } else { editFormInfo.value.workspaceId = ''; + editFormInfo.value.workspaceCode = ''; // formData.workspaceName = ''; // formData.extras = setWorkSpaceValue( // formData.extras, @@ -595,13 +605,14 @@ const changeFun = async (val: any, type: string) => { } // editFormInfo.value = { ...formData }; } - if (val.key === 'workspaceId') { - if (editFormInfo.value.workspaceId) { + if (val.key === 'workspaceCode') { + if (editFormInfo.value.workspaceCode) { editFormInfo.value.machineId = ''; if (editFormInfo.value.phaseId !== val.val.parentId) { editFormInfo.value.machineId = val.val.parentId; } - editFormInfo.value.workspaceId = val.val.value; + editFormInfo.value.workspaceCode = val.val.value; + editFormInfo.value.workspaceId = val.val.uuid; // formData.workspaceName = val.val.label; // formData.extras = setWorkSpaceValue( // formData.extras, @@ -611,6 +622,7 @@ const changeFun = async (val: any, type: string) => { } else { editFormInfo.value.machineId = ''; editFormInfo.value.workspaceId = ''; + editFormInfo.value.workspaceCode = ''; // formData.workspaceName = ''; // formData.extras = setWorkSpaceValue( // formData.extras, @@ -691,16 +703,17 @@ const getWorkSpaceList = async (phaseId: string) => { if (res.data.length === 0) { ElMessage.warning('该阶段下没有工位,请先做仿真策划!'); // 清空工位数据 - tableFormRef.value.setOptionsFun('workspaceId', []); + tableFormRef.value.setOptionsFun('workspaceCode', []); } else { const optionList = res.data.map((item: any) => { return { - label: item.nodeName, - value: item.uuid, + label: item.nodeCode, + value: item.nodeCode, + uuid: item.uuid, parentId: item.parentId, }; }); - tableFormRef.value.setOptionsFun('workspaceId', optionList); + tableFormRef.value.setOptionsFun('workspaceCode', optionList); if (optionList.length > 0) { return optionList[0]; }