--fix bug

This commit is contained in:
yuping
2023-03-28 14:35:49 +08:00
parent c1d4e733ba
commit dbcf90345f
2 changed files with 31 additions and 11 deletions

View File

@@ -184,6 +184,7 @@ export const attendanceLeave = (obj) => http.post('/stu/task/attendance/leave',
export const batchFinishTask = (obj) => http.post('/admin/student/batchFinishTask', obj) export const batchFinishTask = (obj) => http.post('/admin/student/batchFinishTask', obj)
//批量更新学员状态 //批量更新学员状态
export const batchUpdateStatus = (obj) => http.post('/admin/student/batchUpdateStatus', obj) export const batchUpdateStatus = (obj) => http.post('/admin/student/batchUpdateStatus', obj)
export const auditStudentBatch = (obj) => http.post('/admin/student/auditStudentBatch', obj)
// //面授课批量导入成绩 // //面授课批量导入成绩
export const batchImportScore = (obj) => export const batchImportScore = (obj) =>
http.post('/admin/student/importHomeWork', obj, { http.post('/admin/student/importHomeWork', obj, {

View File

@@ -149,11 +149,13 @@
<div <div
class="b_zk" class="b_zk"
:style="{ display: hideshow ? 'block' : 'none', color: '#fff', lineHeight: '9px', transform: 'rotate(180deg)'}" :style="{ display: hideshow ? 'block' : 'none', color: '#fff', lineHeight: '9px', transform: 'rotate(180deg)'}"
>^</div> >^
</div>
<div <div
class="b_sq" class="b_sq"
:style="{ display: hideshow ? 'none' : 'block', color: '#fff', lineHeight: '12px'}" :style="{ display: hideshow ? 'none' : 'block', color: '#fff', lineHeight: '12px'}"
>^</div> >^
</div>
</div> </div>
<div <div
class="btn4_sup" class="btn4_sup"
@@ -166,10 +168,10 @@
<div class="btn4_op1" @click="updateStatus(1)"> <div class="btn4_op1" @click="updateStatus(1)">
<span>批量结业</span> <span>批量结业</span>
</div> </div>
<div class="btn4_op2" @click="updateStatus(0)"> <div class="btn4_op2" @click="auditStatus(0)">
<span>批量通过</span> <span>批量通过</span>
</div> </div>
<div class="btn4_op3" @click="updateStatus(2)"> <div class="btn4_op3" @click="auditStatus(2)">
<span>批量拒绝</span> <span>批量拒绝</span>
</div> </div>
</div> </div>
@@ -220,14 +222,14 @@
<a-button <a-button
v-if="type === 3 && record.status !== 2 && record.status !== 0 && checkPer(permissions)" v-if="type === 3 && record.status !== 2 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(0, record.id)" @click="auditStatus(0, record.id)"
type="link" type="link"
>通过 >通过
</a-button </a-button
> >
<a-button <a-button
v-if="type === 3 && record.status !== 2 && record.status !== 0 && checkPer(permissions)" v-if="type === 3 && record.status !== 2 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(2, record.id)" @click="auditStatus(2, record.id)"
type="link" type="link"
>拒绝 >拒绝
</a-button </a-button
@@ -390,7 +392,7 @@
</template> </template>
<script setup> <script setup>
import {computed, defineProps, onMounted, ref, watch} from "vue"; import {computed, defineProps, onMounted, ref, watch} from "vue";
import {delStudentList, getStuPage, batchUpdateStatus} from "@/api/index1"; import {delStudentList, getStuPage, batchUpdateStatus, auditStudentBatch} from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue"; import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
@@ -697,6 +699,7 @@ const deleteModalVisible = ref(false);
const deleteId = ref(null); const deleteId = ref(null);
const deleteTargetId = ref(null); const deleteTargetId = ref(null);
const deleteType = ref(null); const deleteType = ref(null);
function del(id, row) { function del(id, row) {
if (row.isLeader === "1") { if (row.isLeader === "1") {
return message.warning("" + row.name + "是小组长,请勿删除!"); return message.warning("" + row.name + "是小组长,请勿删除!");
@@ -704,7 +707,7 @@ function del(id, row) {
deleteModalVisible.value = true; deleteModalVisible.value = true;
deleteId.value = id; deleteId.value = id;
deleteTargetId.value = row.pid; deleteTargetId.value = row.pid;
deleteType.value = row.type deleteType.value = row.type;
// Modal.confirm({ // Modal.confirm({
// title: () => "确定删除?", // title: () => "确定删除?",
@@ -727,7 +730,11 @@ function del(id, row) {
const sureSameModal = () => { const sureSameModal = () => {
if (deleteId.value) { if (deleteId.value) {
tableData.value.loading = true; tableData.value.loading = true;
delStudentList({ ids: [deleteId.value],targetId: deleteTargetId.value,type:deleteType.value}).then(() => getStuList()); delStudentList({
ids: [deleteId.value],
targetId: deleteTargetId.value,
type: deleteType.value
}).then(() => getStuList());
deleteModalVisible.value = false; deleteModalVisible.value = false;
} }
}; };
@@ -864,7 +871,7 @@ const exportStu = () => {
} }
}; };
//批量操作 结业、通过、拒绝等 //批量操作 结业、拒绝等
const updateStatus = (status, id) => { const updateStatus = (status, id) => {
if (!id && stuSelectKeys.value.length === 0) { if (!id && stuSelectKeys.value.length === 0) {
message.warning("请选择学员"); message.warning("请选择学员");
@@ -889,7 +896,19 @@ const updateStatus = (status, id) => {
console.log("批量更新学员状态失败", err); console.log("批量更新学员状态失败", err);
}); });
}; };
//批量通过
const auditStatus = (status, id) => {
if (!id && stuSelectKeys.value.length === 0) {
message.warning("请选择学员");
}
auditStudentBatch({
ids: id ? [id] : stuSelectKeys.value,
status
}).then(() => {
getStuList();
stuSelectKeys.value = [];
});
};
//导入学员 //导入学员
const AddImpStuvisible = ref(false); //导入学员抽屉 const AddImpStuvisible = ref(false); //导入学员抽屉
const showImpStu = () => { const showImpStu = () => {