diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 2f5ae877..85ddfd21 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -62,6 +62,7 @@ placeholder="请选择" :options="finishOptions" allowClear + @change="changeStatus" > @@ -161,8 +162,13 @@ const finishOptions = ref([ value: 0, label: "未完成", }, + // { + // id: 2, + // value: 2, + // label: "进行中", + // }, { - id: 2, + id: 3, value: 1, label: "已完成", }, @@ -191,6 +197,11 @@ const props = defineProps({ }, }, }); +const changeStatus = (e) => { + if(e === undefined){ + delete params.value.status; + } +} const params = ref({ pid: 0, type: 3 }); const courseSelectRows = ref([]); const planParams = computed(() => ({ diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 5a499dd4..98a6c2aa 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -224,11 +224,11 @@ export default { value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index c79f3dfa..88ba7427 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="projectNameList" + :options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList" @change="selectProjectName" allowClear > @@ -190,17 +190,29 @@ export default { currentPage: 1, tableDataTotal: 0, projectName: undefined, + projectNameListNot: [ + { + id: 1, + value: "0", + label: "未开始", + }, + { + id: 3, + value: "1", + label: "已完成", + }, + ], projectNameList: [ { id: 1, value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index dde44b71..807f133e 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -178,17 +178,22 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: null, projectNameList: [ { id: 1, - value: "1", + value: 3, label: "未开始", }, + { + id: 2, + value: 2, + label: "进行中", + }, { id: 3, - value: "3", + value: 1, label: "已完成", }, ], @@ -337,7 +342,7 @@ ctx.emit("update:ProjectVoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -438,7 +443,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; getData(); } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index c11fea4e..4a4778c3 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="projectNameList" + :options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList" @change="selectProjectName" > @@ -193,6 +193,18 @@ export default { currentPage: 1, tableDataTotal: 0, projectName: undefined, + projectNameListNot: [ + { + id: 1, + value: "0", + label: "未开始", + }, + { + id: 3, + value: "1", + label: "已完成", + }, + ], projectNameList: [ { @@ -200,11 +212,11 @@ export default { value: "0", label: "未开始", }, - //{ - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 70ceb39c..bc394788 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -174,11 +174,11 @@ export default { value: "0", label: "未开始", }, - //{ - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 292fa987..b1e2bc9b 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -167,11 +167,11 @@ export default { value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - //}, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index f3c60456..05688fa9 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -182,17 +182,22 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: null, projectNameList: [ { id: 1, - value: "1", + value: 3, label: "未开始", }, + { + id: 2, + value: 2, + label: "进行中", + }, { id: 3, - value: "3", + value: 1, label: "已完成", } ], @@ -357,7 +362,7 @@ ctx.emit("update:VoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -459,7 +464,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; getData(); }