feat:合并

This commit is contained in:
lixg
2023-02-13 16:25:21 +08:00
6 changed files with 30 additions and 48 deletions

View File

@@ -927,7 +927,6 @@
style="width: 440px; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate"
:disabled-time="disabledRangeTime"
format="YYYY-MM-DD HH:mm"
v-model:value="xjkkinputV3"
separator="至"
@@ -1580,9 +1579,6 @@ import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
import CommonStudent from "@/components/student/CommonStudent";
import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
// import StuAdd from "../../components/drawers/StuAdd";
// import OwnPower from "../../components/drawers/OwnPower.vue";
// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
import ProjOwnerShip from "../../components/drawers/ProjectOwn";
@@ -1603,10 +1599,7 @@ import {
addStudent,
studentExport,
handleStudent,
getMemberInfoApi,
copyCoursePlan,
// listReview,
// studyRecordList,
getMemberInfoApi, copyCoursePlan,
} from "@/api/indexCourse";
import {
traverseArr,
@@ -1614,13 +1607,10 @@ import {
newFile,
getdateToDate,
} from "../../utils/utils";
// import { toDate } from "../../api/method.js";
import { fileUp } from "../../api/indexEval";
import dayjs from "dayjs";
import * as api1 from "../../api/index1";
import "@wangeditor/editor/dist/css/style.css";
//import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue";
@@ -1637,7 +1627,8 @@ 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";
//列表表格
const columns1 = [
@@ -3713,25 +3704,18 @@ export default defineComponent({
//保存开课
const handleSureStu = () => {
let startTime,
endTime = 0;
if (state.xjkkinputV3) {
startTime = parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
endTime = parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
}
let t = state.signCom ? "1," : "0,";
let p = state.comLeave ? "1" : "0";
let type = t.concat(p);
const postData = {
offcourseId: state.offcourseId,
offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2,
applyFlag: state.checked1 ? 1 : 0,
attach: state.attach,
beginTime: startTime,
beginTime: dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm:ss"),
endTime: dayjs(state.xjkkinputV3[1]).format( "YYYY-MM-DD HH:mm:ss"),
completeType: type,
endTime: endTime,
evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId),
testId: state.EditTestId,
@@ -3757,12 +3741,10 @@ export default defineComponent({
console.log("state.addLoading ", state.addLoading);
}
state.addLoading = true;
editPlan(postData).then((res) => {
if (res.data.code === 200) {
getTableDate3();
handleCancelStu();
rest();
}
editPlan(postData).then(() => {
getTableDate3();
handleCancelStu();
rest();
state.addLoading = false;
});
};