diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 24e619c..8139ac9 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -2,5 +2,4 @@ export {} declare global { const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] } diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue index 8b9a7ba..84ed6be 100644 --- a/src/views/personal/project/childSystem/manage.vue +++ b/src/views/personal/project/childSystem/manage.vue @@ -45,7 +45,7 @@ 查看详情 - diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue index 1f795c1..a55f2b1 100644 --- a/src/views/personal/project/childSystem/participate.vue +++ b/src/views/personal/project/childSystem/participate.vue @@ -44,7 +44,7 @@ 查看详情 - @@ -67,6 +67,7 @@ const projectid = route.query.projectId ? route.query.projectId : 1 ; + //跳转到子模块 const router = useRouter(); diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue index 141e90d..31d4c1b 100644 --- a/src/views/personal/project/childmodel/manage.vue +++ b/src/views/personal/project/childmodel/manage.vue @@ -46,7 +46,7 @@ 查看详情 - diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue index 035ea54..e298d24 100644 --- a/src/views/personal/project/detail/manage.vue +++ b/src/views/personal/project/detail/manage.vue @@ -16,7 +16,7 @@ -
+
@@ -24,7 +24,7 @@ {{ item.value }}
- @@ -52,13 +52,14 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import { getProjectModDetail, editModule, deleteModule } from '@/api/manage'; import { getToken } from '@/utils/auth'; +import { ElMessage, ElMessageBox } from 'element-plus'; const projectItems = ref([ { label: '01.模块名称', value: '项目名称1' }, { label: '02.模块周期', value: '3个月' }, { label: '03.工作量', value: '100小时' }, - { label: '04.负责人', value: '张三' }, + { label: '04.负责人ID', value: '张三' }, { label: '05.状态', value: '进行中' }, { label: '06.时间', value: '2024-01-01 12:00:00' }, { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' }, @@ -87,10 +88,10 @@ const parseData = (data) => { item.value = data.workLoad; } else if (item.label === '03.工作量') { item.value = data.workLoad ; - } else if (item.label === '04.负责人') { + } else if (item.label === '04.负责人ID') { item.value = "1"; } else if (item.label === '05.状态') { - item.value = data.workLoad.toString(); + item.value = data.status.toString(); } else if (item.label === '06.时间') { item.value = new Date(data.deadLine).toLocaleDateString(); } else if (item.label === '07.简介') { @@ -197,12 +198,16 @@ const deleteModuleClick = () => { const confirm = ElMessageBox.confirm('确认删除吗?'); confirm.then(() => { const res = deleteModule(projectId, getToken()); + console.log(res); + res.then(response => { if (response.data.code === 200) { ElMessage.success('删除成功!'); //返回上一级页面 window.history.go(-1); - } else { + } else if(response.data.code === 40019) { + ElMessage.error('删除失败!没有权限'); + }else{ ElMessage.error('删除失败!'); } }).catch(error => { diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue index 56926b8..28b50f8 100644 --- a/src/views/personal/project/detail/participate.vue +++ b/src/views/personal/project/detail/participate.vue @@ -1,9 +1,7 @@ +