Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
wyx
2023-02-13 21:08:13 +08:00

View File

@@ -1162,9 +1162,42 @@
:isgetStudent="isgetStudent"
>
<template #extension="{ data: { record } }">
<a-button v-if="record.source === 4 && record.status === 1" @click="() => {record.status = 0;auditStudent(record);}" type="link">审核通过</a-button>
<a-button v-if="record.source === 4 && record.status === 1" @click="() => {record.status = 2;auditStudent(record);}" type="link">拒绝</a-button>
<a-button v-if="record.source === 4 && (record.status === 0 || record.status === 2)" @click="() => {record.status = 1;auditStudent(record);}" type="link">撤回</a-button>
<a-button
v-if="record.source === 4 && record.status === 1"
@click="
() => {
record.status = 0;
auditStudent(record);
}
"
type="link"
>审核通过</a-button
>
<a-button
v-if="record.source === 4 && record.status === 1"
@click="
() => {
record.status = 2;
auditStudent(record);
}
"
type="link"
>拒绝</a-button
>
<a-button
v-if="
record.source === 4 &&
(record.status === 0 || record.status === 2)
"
@click="
() => {
record.status = 1;
auditStudent(record);
}
"
type="link"
>撤回</a-button
>
</template>
</TableStudent>
</div>
@@ -1566,7 +1599,8 @@ import {
addStudent,
studentExport,
handleStudent,
getMemberInfoApi, copyCoursePlan,
getMemberInfoApi,
copyCoursePlan,
} from "@/api/indexCourse";
import {
traverseArr,
@@ -1594,7 +1628,7 @@ import FJUpload from "@/components/common/FJUpload";
import { updateStudent } from "@/api/indexProjStu";
import { useStore } from "vuex";
import DropDown from "@/components/common/DropDown";
import {checkPer} from "@/utils/utils";
import { checkPer } from "@/utils/utils";
import dayjs from "dayjs";
//列表表格
@@ -3681,7 +3715,7 @@ export default defineComponent({
applyFlag: state.checked1 ? 1 : 0,
attach: state.attach,
beginTime: dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm:ss"),
endTime: dayjs(state.xjkkinputV3[1]).format( "YYYY-MM-DD HH:mm:ss"),
endTime: dayjs(state.xjkkinputV3[1]).format("YYYY-MM-DD HH:mm:ss"),
completeType: type,
evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId),
@@ -3718,7 +3752,6 @@ export default defineComponent({
//编辑开课
const handelEditStu = async (item) => {
state.offcourseId = item.offcourseId;
state.offcoursePlanId = item.id;
@@ -3744,7 +3777,7 @@ export default defineComponent({
}
console.log("res");
console.log("获取面授课详情", item);
console.log("获取面授课开课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
@@ -3969,9 +4002,12 @@ export default defineComponent({
//确认复制课程 操作
const handleDeleteExit = async () => {
state.addLoading = true;
console.log(
"开课的复制删除面授id及开课id",
state.offcourseId,
state.offcoursePlanId
);
if (state.del_hs) {
console.log(11111111);
if (state.offcourseId && state.offcoursePlanId && state.studentId) {
console.log(111111);
handleStudent({
@@ -4076,7 +4112,7 @@ export default defineComponent({
}
};
const handleDeleteKaike = (value) => {
state.offcoursePlanId = value.offcoursePlanId;
state.offcoursePlanId = value.id;
state.delete_hs = true;
state.del_hs = true;
@@ -4294,9 +4330,9 @@ export default defineComponent({
state.copy_hs = true;
};
const handleCopyP = async (itm) => {
console.log(itm);
state.offcourseId = itm.id;
state.offcoursePlanId = itm.offcoursePlanId;
console.log("开课复制", itm);
state.offcourseId = itm.offcourseId;
state.offcoursePlanId = itm.id;
state.delete_hs = true;
state.copy_hs = true;
@@ -4666,6 +4702,7 @@ export default defineComponent({
//二维码
const qrcodeVisible = (record, type) => {
console.log("点击签到信息", record);
state.codevisible = true;
state.codeInfo = {
title: type == 1 ? "【课程】二维码" : "【签到】二维码",
@@ -4677,7 +4714,7 @@ export default defineComponent({
record.offcourseId
: process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
record.offcoursePlanId
record.id
}&taskType=${2}&type=${3}`,
};
console.log("codeInfo", state.codeInfo);