diff --git a/src/App.vue b/src/App.vue index 6b95833a..b03b9efd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,10 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.3.7------------"); + + +console.log("版本2.3.9------------"); + // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/components/drawers/CommonHomework.vue b/src/components/drawers/CommonHomework.vue index 9c57079a..e4875a63 100644 --- a/src/components/drawers/CommonHomework.vue +++ b/src/components/drawers/CommonHomework.vue @@ -5,7 +5,7 @@
-
{{ info.workName ? "编辑" : "添加" }}任务
+
{{ info?.workName ? "编辑" : "添加" }}任务
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 4cc78d6b..1128dbff 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -33,7 +33,7 @@
@@ -76,7 +76,7 @@ border: 1px solid #f0f0f0; "> @@ -131,8 +131,8 @@
-
@@ -397,8 +397,6 @@ const stuTreeSelectKeys = ref([]); const stuTreeExpandedKeys = ref([]); const audienceName = ref({ keyword: "", - page: 1, - pageSize: 10, }); const searchOrgName = ref({ keyword: "", @@ -550,7 +548,7 @@ const closeDrawer = () => { }; function searchAudi() { - auditTableRef.value.fetch(); + auditTableRef.value.reset(audienceName.value); } function onLoadData(treeNode) { @@ -579,8 +577,7 @@ const openDrawer = () => { }; function onSearchStu() { - nameSearch.value.page = 1; - stuTableRef.value.fetch(); + stuTableRef.value.reset(nameSearch.value); } function stuStuOrgSelect(e) { @@ -617,7 +614,7 @@ const deleteDepSelect = () => { }; //重置组织 const resetOrg = () => { - searchOrgName.value = { keyword: "", page: 1, pageSize: 10 }; + searchOrgName.value = { keyword: "" }; }; //重置受众 const resetAudienceInfo = () => { @@ -643,7 +640,7 @@ function handleDialogOk() { } function handleStageOk() { - if (props.type === 1 && props.groupId && props.groupMemberCount < projectSelectRows.value.length + stuSelectRows.value.length) { + if (props.type === 1 && props.groupId && (props.groupMemberCount < (props.groupMemberNumber * 1 + projectSelectRows.value.length + stuSelectRows.value.length))) { return message.warning("添加小组学员超过最大值"); } stageVisible.value = false;