hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-18 15:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

-- fix bug

Browse Source
This commit is contained in:
yuping
2023-02-27 23:30:07 +08:00
parent a74d5a151b
commit c4f71e7521
2 changed files with 71 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/components/student/CommonStudent.vue
View File

@@ -85,7 +85,8 @@
<div class="tab2">
<a-form-item label="组织：">
<a-input v-model:value="searchOrgName.keyword"
style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" @click="orgValue"/>
style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织"
@click="orgValue"/>
<a-button type="primary" @click="searchOrg" style="margin-left: 20px; border-radius: 4px">
<template #icon>
<SearchOutlined/>
@@ -97,7 +98,8 @@
</a-form-item>
</div>
<div class="boeTree">
<a-tree v-model:selectedKeys="selectedOrgKeys" :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
<a-tree v-model:selectedKeys="selectedOrgKeys"
:tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
:loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
children: 'treeChildList',
key: 'id',
@@ -112,7 +114,8 @@
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
<a-form-item label="受众名称：">
<a-input v-model:value="audienceName.keyword" style="width: 260px; height: 40px; border-radius: 8px"
<a-input v-model:value="audienceName.keyword"
style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称"/>
<a-button type="primary" @click="searchAudi" style="margin-left: 20px; border-radius: 4px">
<template #icon>
@@ -267,7 +270,8 @@
<div class="inher">
<!-- <div class="cur">当前关卡：关卡2</div> -->
<div class="select">
<a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'" v-model:value="selectsData.stageId"
<a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
v-model:value="selectsData.stageId"
className="cus-select">
<a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id">{{ item.name || "默认" }}
</a-select-option>
@@ -278,7 +282,7 @@
<button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
取消
</button>
<button class="sameb btn2" @click="handleStageOk" style="cursor: pointer">
<button class="sameb btn2" @click="handleDialogOk" style="cursor: pointer">
确定
</button>
</div>
@@ -303,6 +307,7 @@ import {
// addGroupMember,
getStuPage,
} from "@/api/index1";
import dialog from "@/utils/dialog";
// import { getProjStu } from "@/api/indexProjStu";
const emit = defineEmits({});
const props = defineProps({
@@ -357,7 +362,7 @@ const props = defineProps({
default: null,
},
});
console.log("props.activeKey1" + props.activeKey1)
console.log("props.activeKey1" + props.activeKey1);
// 获取项目学员;
const procurrentPage = ref(1);
const projectList = ref([]);
@@ -414,6 +419,7 @@ const projectChangePagination = (page) => {
procurrentPage.value = page;
getStu();
};
function onProjectSelectChange(e, l) {
console.log("eeeee", e, l);
projectSelectKeys.value = e;
@@ -670,14 +676,14 @@ function stuDel(i) {
const selectedOrgKeys = ref([]);
watch(selectedOrgKeys, () => {
console.log('selectedKeys', selectedOrgKeys);
console.log("selectedKeys", selectedOrgKeys);
});
function orgDel(i) {
console.log(selectedOrgKeys.value)
orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
selectedOrgKeys.value.splice(i, 1)
selectsData.value.deptList.splice(i, 1)
console.log(selectedOrgKeys.value);
orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id);
selectedOrgKeys.value.splice(i, 1);
selectsData.value.deptList.splice(i, 1);
}
function AuditDel(i) {
@@ -777,6 +783,14 @@ const submitAuth = () => {
}
};
function handleDialogOk() {
if (selectsData.value.groupList.length || selectsData.value.deptList.length) {
dialog({ content: "您选择了组织或受众，此添加为异步添加，请稍后手动刷新学员！", ok: handleStageOk });
return;
}
handleStageOk();
}
function handleStageOk() {
// debugger
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
@@ -784,19 +798,19 @@ function handleStageOk() {
if (props.groupMemberCount !== null) { // 只有添加组员的时候判断
let selectMember = 0;
if (activeKey.value === 4) { // 项目内选人
selectMember = selectsData.value.projectMemberList.length
selectMember = selectsData.value.projectMemberList.length;
} else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length
selectMember = selectsData.value.studentList.length;
} else if (activeKey.value === 2) {
selectMember = selectsData.value.groupList.length
selectMember = selectsData.value.groupList.length;
} else if (activeKey.value === 3) {
selectMember = selectsData.value.deptList.length
selectMember = selectsData.value.deptList.length;
}
if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值");
}
// 判断是否是组长，组长不能添加
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
if (leaderArray.length > 0) {
return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
}

18
src/views/learningpath/LevelAddDetail.vue
View File

@@ -475,23 +475,7 @@ const subdeleteAll = () => {
message.warning("请选择要删除的任务！");
return
}
dialog({
content: '确定要删除所选任务吗?',
ok: () => {
for (let i = 0; i < routerInfo.value.chapterList[activeIndex.value].draftTaskList.length; i++) {
const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i]
if (t.checked) {
if (t.id) {
t.checked = false;
t.deleted = true;
} else {
routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(i, 1);
i--;
}
}
}
},
});
};
//全选任务或全不选任务