|
@@ -62,21 +62,15 @@
|
|
import { examRuleDetail } from "../../../base/api";
|
|
import { examRuleDetail } from "../../../base/api";
|
|
import { teacherSubmitTaskApply } from "../../api";
|
|
import { teacherSubmitTaskApply } from "../../api";
|
|
import { printPlanTemplateList } from "../../../print/api";
|
|
import { printPlanTemplateList } from "../../../print/api";
|
|
-import InfoPrintPlan from "./InfoPrintPlan";
|
|
|
|
import InfoExamTask from "./InfoExamTask";
|
|
import InfoExamTask from "./InfoExamTask";
|
|
import InfoPrintTask from "./InfoPrintTask";
|
|
import InfoPrintTask from "./InfoPrintTask";
|
|
-import { COMMON_CARD_RULE_ID } from "@/constants/enumerate";
|
|
|
|
-import { deepCopy } from "@/plugins/utils";
|
|
|
|
|
|
+// import { deepCopy } from "@/plugins/utils";
|
|
|
|
|
|
const STEPS_LIST = [
|
|
const STEPS_LIST = [
|
|
{
|
|
{
|
|
name: "exam-task",
|
|
name: "exam-task",
|
|
title: "命题信息"
|
|
title: "命题信息"
|
|
},
|
|
},
|
|
- {
|
|
|
|
- name: "print-plan",
|
|
|
|
- title: "备卷印品信息"
|
|
|
|
- },
|
|
|
|
{
|
|
{
|
|
name: "print-task",
|
|
name: "print-task",
|
|
title: "考务信息"
|
|
title: "考务信息"
|
|
@@ -85,10 +79,10 @@ const STEPS_LIST = [
|
|
|
|
|
|
const initExamTask = {
|
|
const initExamTask = {
|
|
semesterId: "",
|
|
semesterId: "",
|
|
|
|
+ examId: "",
|
|
courseCode: "",
|
|
courseCode: "",
|
|
courseName: "",
|
|
courseName: "",
|
|
paperNumber: "",
|
|
paperNumber: "",
|
|
- cardRuleId: COMMON_CARD_RULE_ID,
|
|
|
|
teachingRoomId: "",
|
|
teachingRoomId: "",
|
|
teacherName: "",
|
|
teacherName: "",
|
|
paperName: ""
|
|
paperName: ""
|
|
@@ -111,43 +105,6 @@ const initExamTaskDetail = {
|
|
customCard: false
|
|
customCard: false
|
|
};
|
|
};
|
|
|
|
|
|
-const initPrintPlan = {
|
|
|
|
- name: "",
|
|
|
|
- examStartTime: "",
|
|
|
|
- examEndTime: "",
|
|
|
|
- semesterId: "",
|
|
|
|
- printContent: [],
|
|
|
|
- backupMethod: "ROOM",
|
|
|
|
- backupCount: 1,
|
|
|
|
- drawRule: "ONE",
|
|
|
|
- templateSources: {},
|
|
|
|
- variableContent: [
|
|
|
|
- {
|
|
|
|
- type: "SIGN",
|
|
|
|
- templateId: "",
|
|
|
|
- oldTemplateId: "",
|
|
|
|
- backupMethod: "ROOM",
|
|
|
|
- backupCount: 1
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- type: "PACKAGE",
|
|
|
|
- templateId: "",
|
|
|
|
- oldTemplateId: "",
|
|
|
|
- backupMethod: "ROOM",
|
|
|
|
- backupCount: 1
|
|
|
|
- }
|
|
|
|
- ],
|
|
|
|
- ordinaryContent: [
|
|
|
|
- {
|
|
|
|
- type: "CHECK_IN",
|
|
|
|
- templateId: "",
|
|
|
|
- oldTemplateId: "",
|
|
|
|
- backupMethod: "ROOM",
|
|
|
|
- backupCount: 1
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
const initPrintTask = {
|
|
const initPrintTask = {
|
|
examStartTime: "",
|
|
examStartTime: "",
|
|
examEndTime: "",
|
|
examEndTime: "",
|
|
@@ -159,7 +116,7 @@ const initPrintTask = {
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "create-exam-and-print-task",
|
|
name: "create-exam-and-print-task",
|
|
- components: { InfoPrintPlan, InfoExamTask, InfoPrintTask },
|
|
|
|
|
|
+ components: { InfoExamTask, InfoPrintTask },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
modalIsShow: false,
|
|
modalIsShow: false,
|
|
@@ -213,20 +170,9 @@ export default {
|
|
customCard: this.examRule.customCard
|
|
customCard: this.examRule.customCard
|
|
});
|
|
});
|
|
|
|
|
|
- // printPlan
|
|
|
|
- let printPlan = deepCopy(initPrintPlan);
|
|
|
|
- printPlan.variableContent = printPlan.variableContent.filter(
|
|
|
|
- item => this.templateSources[item.type]
|
|
|
|
- );
|
|
|
|
- printPlan.ordinaryContent = printPlan.ordinaryContent.filter(
|
|
|
|
- item => this.templateSources[item.type]
|
|
|
|
- );
|
|
|
|
- printPlan.templateSources = this.templateSources;
|
|
|
|
-
|
|
|
|
this.infos = {
|
|
this.infos = {
|
|
examTask: { ...initExamTask },
|
|
examTask: { ...initExamTask },
|
|
examTaskDetail,
|
|
examTaskDetail,
|
|
- printPlan,
|
|
|
|
printTask: { ...initPrintTask },
|
|
printTask: { ...initPrintTask },
|
|
approveUserIds: []
|
|
approveUserIds: []
|
|
};
|
|
};
|
|
@@ -297,19 +243,9 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- let examPrintPlan = deepCopy(this.infos.printPlan);
|
|
|
|
- delete examPrintPlan.templateSources;
|
|
|
|
- examPrintPlan.variableContent = JSON.stringify(
|
|
|
|
- examPrintPlan.variableContent
|
|
|
|
- );
|
|
|
|
- examPrintPlan.ordinaryContent = JSON.stringify(
|
|
|
|
- examPrintPlan.ordinaryContent
|
|
|
|
- );
|
|
|
|
-
|
|
|
|
const examTaskContent = {
|
|
const examTaskContent = {
|
|
examTask: this.infos.examTask,
|
|
examTask: this.infos.examTask,
|
|
examTaskDetail: this.infos.examTaskDetail,
|
|
examTaskDetail: this.infos.examTaskDetail,
|
|
- examPrintPlan,
|
|
|
|
examDetail: this.infos.printTask
|
|
examDetail: this.infos.printTask
|
|
};
|
|
};
|
|
let datas = {
|
|
let datas = {
|