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-01-29 12:16:16 +08:00
parent 5019c316b2 22a8be78c9
commit e4cf9c95e7
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/common/fileTable/fileTypeChange.vue
View File

@@ -42,8 +42,12 @@ const changeFileType = () => {
id: props.id, id: props.id,
fileType: Number(fileType.value), fileType: Number(fileType.value),
}; };
dataUpdateFileApi(params).then(() => { dataUpdateFileApi(params).then((res: any) => {
ElMessage.success('修改文件类型成功'); if (res.code === 200) {
ElMessage.success('修改文件类型成功');
} else {
fileType.value = props.modelValue === null ? '' : String(props.modelValue);
}
}); });
}; };
</script> </script>

2
src/components/project/projectInfoDialog.vue
View File

@@ -237,6 +237,8 @@ const initTableForm = () => {
// tableFormRef.value.resetFun(); // tableFormRef.value.resetFun();
editRowInfo.value = {}; editRowInfo.value = {};
// setEditForm({ exeStatus: PROJECT_EXE_STATUS_CODE.NOT_STARTED }); // setEditForm({ exeStatus: PROJECT_EXE_STATUS_CODE.NOT_STARTED });
editRowInfo.value.projectSource = 'EP';
projectInfo.projectSource = 'EP';
} else { } else {
// setEditForm({ ...props.currentRow }); // setEditForm({ ...props.currentRow });
statusList = getProjectExeStatus(projectInfo.exeStatus as PROJECT_EXE_STATUS_CODE); statusList = getProjectExeStatus(projectInfo.exeStatus as PROJECT_EXE_STATUS_CODE);

6
src/views/competenceCenter/condition/components/addApprove.vue
View File

@@ -23,7 +23,11 @@
prop="approveTemplateId" prop="approveTemplateId"
v-if="form.bApprove === true" v-if="form.bApprove === true"
> >
<ApproveList v-model="form.approveTemplateId" @change="onApproveChangeFun" /> <ApproveList
v-model="form.approveTemplateId"
@change="onApproveChangeFun"
:attrs="{ moduleCode: 'TASK_POOL_APPROVAL' }"
/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('工况库.升版')" prop="bNewVersion"> <el-form-item :label="$t('工况库.升版')" prop="bNewVersion">
<el-radio-group v-model="form.bNewVersion" :disabled="props.isInitial"> <el-radio-group v-model="form.bNewVersion" :disabled="props.isInitial">

14
src/views/task/projectDetail/components/statisticAnalysis.vue
View File

@@ -130,13 +130,13 @@ watchEffect(() => {
// 进度状态颜色列表：已驳回、未开始、进行中、已完成、已暂停、已关闭、已延期 // 进度状态颜色列表：已驳回、未开始、进行中、已完成、已暂停、已关闭、已延期
const statusColorList = [ const statusColorList = [
'rgb(200, 201, 204)', // 未开始 getThemeColor('--el-color-danger'),
getThemeColor('--el-color-primary'), // 进行中 'rgb(200, 201, 204)',
getThemeColor('--el-color-danger'), // 已驳回 getThemeColor('--el-color-primary'),
getThemeColor('--el-color-success'), // 已完成 getThemeColor('--el-color-success'),
getThemeColor('--el-color-warning'), // 已暂停 getThemeColor('--el-color-warning'),
getThemeColor('--el-color-info'), // 已关闭 'rgb(222, 223, 224)',
'rgb(248, 152, 152)', // 已延期 'rgb(250, 182, 182)',
'rgb(179, 225, 157)', // 已闭环 'rgb(179, 225, 157)', // 已闭环
]; ];