diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index 3f1cd7ff..d583e01a 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -267,6 +267,7 @@ export default { }; const getTableDate = (tableData) => { let data = tableData; + console.log('我是获取的评估数据', data) let array = []; data.map((value) => { let n1 = value.essayQuestionVoList @@ -289,7 +290,7 @@ export default { assessmentId: value.id, num: num, name: value.assessmentName ? value.assessmentName : "-", - creator: value.createUserName ? value.createUserName : "-", + creator: value.createName ? value.createName : "-", time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"), }; array.push(obj); diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 241cd263..4621290e 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -124,6 +124,98 @@ + + +
+
+
+
+
+ 请选择教师 +
+
+
+
+
教师：
+
+ + +
+
+
+
+ +
+
邀请说明：
+
+ +
+
+
+
+
+
取消
+
+
+
转审
+
+
+
+
+ + + +
+
+
+
+
+ 审核信息 +
+
+
+
+
审核人：
+
+ 董瑞华 +
+
+
+
审核结果：
+
+ 拒绝 + 通过 +
+
+
+
+ +
+
审核备注：
+
+ +
+
+
+
审核时间：
+
+ 2023-02-14 11:23:45 +
+
+
+
+
+
关闭
+
+
+
+
+ @@ -139,6 +231,7 @@ import {reactive, toRefs, onMounted, ref, computed} from "vue"; import { list, courseAuditView, courseDetail } from "../../api/indexAudit"; import { message } from "ant-design-vue"; +import ProjectManager from "@/components/project/ProjectManagerNew"; import SeeModal from "../courselibrary/components/seeModal.vue"; import { iframeUrl } from "../../api/method"; import {useStore} from "vuex"; @@ -148,6 +241,7 @@ export default { name: "CoursereViewedN", components: { SeeModal, + ProjectManager }, setup() { const state = reactive({ @@ -162,6 +256,10 @@ export default { label: "rose", }, ], + memberValue: { + value: "", + label: "", + }, calssifyList: [], //分类字典 valueproj: null, valuecreater: "", @@ -171,9 +269,13 @@ export default { total: null, pageSize: 10, courAuditModal: false, //审核弹窗 + courInvitationAuditModal: false, //邀请审核弹窗 + transferInvitationAuditModal: false, //转审完成 弹框 closeBack: false, valuepass: "1", valueSugg: null, + valueSuggInvitation: null, + valueTransferSuggInvitation: null, createId: null, chooseCreater: null, chooseOffId: null, @@ -214,21 +316,40 @@ export default { dataIndex: "status", key: "status", align: "center", - width: "10%", + width: "8%", + }, + { + title: "转审", + dataIndex: "transfer", + key: "transfer", + align: "center", + width: "10%", + customRender: (value) => { + return ( +
+ 已转审 + { + showTransferInvitationAudit( + value.record.createrId, + value.record.creater, + value.record.offId + ) + }} + style="cursor:pointer;" + color="green">转审完成 +
+ ); + }, }, - // { - // title: "转审", - // dataIndex: "change", - // key: "change", - // align: "center", - // }, { title: "创建人", dataIndex: "creater", key: "creater", align: "center", ellipsis: true, - width: "15%", + width: "10%", }, { title: "创建时间", @@ -236,7 +357,7 @@ export default { key: "time", align: "center", ellipsis: true, - width: "15%", + width: "10%", }, { @@ -261,6 +382,19 @@ export default { 审核   + { + showInvitationAudit( + value.record.createrId, + value.record.creater, + value.record.offId + ) + }} + > + 邀请审核 + +   { getFaceDetail(value.record.offId); @@ -563,6 +697,7 @@ export default { time: item.processTime, createrId: item.createId, offId: item.id, + transfer: item.id // 转审 }; array.push(obj); }); @@ -587,6 +722,32 @@ export default { state.chooseOffId = offId; getFaceList(); }; + + // 显示邀请审核弹框 + const showInvitationAudit = (createId, creater, offId) => { + console.log("参数",createId, creater, offId) + state.courInvitationAuditModal = true; + }; + // 关闭邀请审核弹框 + const closeInvitationCourAuditModal = () => { + state.courInvitationAuditModal = false; + } + // 邀请审核确定 + const sureInvitationCourAuditModal = () => { + state.courInvitationAuditModal = false; + } + + // 转审完成弹框 + const showTransferInvitationAudit = (createId, creater, offId) => { + console.log("参数",createId, creater, offId) + state.transferInvitationAuditModal = true; + } + + // 关闭转审完成弹框 + const closeTransferInvitationCourAuditModal = () => { + state.transferInvitationAuditModal = false; + } + const closeCourAuditModal = () => { state.courAuditModal = false; state.valueSugg = null; @@ -646,6 +807,11 @@ export default { reset, changePagination, showAudit, + showInvitationAudit, + closeInvitationCourAuditModal, + sureInvitationCourAuditModal, + showTransferInvitationAudit, + closeTransferInvitationCourAuditModal, closeCourAuditModal, sureCourAuditModal, ft_exit, diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 1650a1d6..2e4f9299 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -715,7 +715,6 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower"; import * as api from "../../api/index1"; import * as apiStu from "../../api/index"; import { message } from "ant-design-vue"; -// import { storage } from "@/api/storage"; import { useStore } from "vuex"; import OrgClass from "@/components/project/OrgClass"; import NameInput from "@/components/project/NameInput"; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index b826be2c..d12db6b0 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -854,12 +854,10 @@ import AddFaceteach from "../../components/drawers/AddFaceteach.vue"; import * as api from "../../api/indexLevel"; import { GetRouterDetail, changeChapterSort, changeTasklistSort, releaseRouter, cancelRouterTask } from "../../api/indexTask"; import { message, Modal } from "ant-design-vue"; -// import { storage } from "../../api/storage"; import { deleteStudyTask } from "../../api/indexStudy"; import draggable from "vuedraggable"; import { editTask } from "../../api/indexTaskadd"; import { editRoutered } from '@/api/indexLearningPath' -// import { RouterEditTask } from "@/api/indexTask"; import { useRouter, useRoute } from "vue-router"; import UnlockMode from "../../components/drawers/UnlockMode.vue"; export default { @@ -890,39 +888,10 @@ export default { const state = reactive({ routerId: route.query.routerId, routerDetail: null, - level: [ - // { - // chapterId: "1", - // remark: "关卡说明", - // name: "默认关卡", - // }, - ], + level: [], unlockMode: 1, // 学习模式 - tableData: [ - // { - // key: 1, - // lei: "在线", - // routerTaskId: 0, - // // state: "已发布", - // creater: "管理者课程", - // // pubtime: "2022-07-20 14:00:03", - // cretime: "60分钟", - // haspub: false, - // checked1: false, - // checkedd: false, - // }, - ], - tableData2: [ - // { - // key: 1, - // name: "张三", - // com: "产研部", - // gang: "产品经理", - // cur: "关卡2", - // jin: "2/10", - // time: "2022-07-15 14:00", - // }, - ], + tableData: [], + tableData2: [], //项目抽屉、列表参数 currentPage: 1, tableDataTotal: 0,