mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-09 19:06:45 +08:00
feat:合并
This commit is contained in:
@@ -214,7 +214,7 @@ export default {
|
||||
await addTempTask({
|
||||
courseId: Number(value.evaluationId),
|
||||
name: value.evaluationName,
|
||||
projectTemplateId: props.projectTemplateId,
|
||||
projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
|
||||
projectTaskId: props.projectTaskId || 0,
|
||||
stageId: props.chooseStageId || 0,
|
||||
type: 10,
|
||||
|
||||
@@ -2639,7 +2639,7 @@ import {
|
||||
watch,
|
||||
} from "vue";
|
||||
import * as api from "../../api/indexInvist.js";
|
||||
import * as api2 from "../../api/indexAudit.js";
|
||||
|
||||
import { message } from "ant-design-vue";
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
// import StuAdd from "../../components/drawers/StuAdd";
|
||||
@@ -4841,16 +4841,7 @@ export default defineComponent({
|
||||
};
|
||||
//编辑面授课
|
||||
const handleEdit = async (itm, type) => {
|
||||
// auditDescription
|
||||
let obj = {
|
||||
offcourseId: itm.offcourseId,
|
||||
pageNo: 1,
|
||||
pageSize: 1,
|
||||
type: 2,
|
||||
};
|
||||
api2.auditList(obj).then((res) => {
|
||||
state.auditDescription = res.data.data.rows[0].description;
|
||||
});
|
||||
|
||||
|
||||
console.log(45555);
|
||||
console.log(itm);
|
||||
|
||||
@@ -641,7 +641,7 @@ export default defineComponent({
|
||||
if (Number(item.auditStatus) === 2 && Number(item.status) === 0) {
|
||||
state.statusTingQi = 0;
|
||||
}
|
||||
if(Number(item.auditStatus) === -1 ){
|
||||
if(Number(item.auditStatus) === -1){
|
||||
let obj ={
|
||||
offcourseId:offcourseId,
|
||||
type:2,
|
||||
@@ -649,8 +649,12 @@ export default defineComponent({
|
||||
pageSize: 1,
|
||||
}
|
||||
api2.auditList(obj).then((res)=>{
|
||||
state.auditDescription = res.data.data.rows[0].description;
|
||||
console.log("state.auditDescription",state.auditDescription);
|
||||
|
||||
if(res.data.data.rows &&res.data.data.rows.length > 0){
|
||||
state.auditDescription = res.data.data.rows[0].description?res.data.data.rows[0].description :"-";
|
||||
console.log("state.auditDescription",state.auditDescription);
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@@ -964,7 +964,10 @@ export default defineComponent({
|
||||
console.log("data=====", data);
|
||||
for (let i in data) {
|
||||
console.log("what ------ > ", i, data);
|
||||
state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
|
||||
if(data[i].taskList.length!==0){
|
||||
state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
|
||||
}
|
||||
|
||||
for (let j in data[i].taskList) {
|
||||
state.taskSyllabus[i].children.push({
|
||||
course: checkType(data[i].taskList[j].type),
|
||||
|
||||
@@ -1407,9 +1407,18 @@ export default {
|
||||
state.level = [];
|
||||
// state.tableData = array[0]
|
||||
// 当无阶段任务出现时 显示当前数据
|
||||
getTableData(array[0].taskList)
|
||||
if(array[0].taskList.length!==0){
|
||||
getTableData(array[0].taskList)
|
||||
}
|
||||
|
||||
}else{
|
||||
state.level = array;
|
||||
let datearr = []
|
||||
for(let i=0;i<array.length;i++){
|
||||
if(array[i].id!==0&&array[i].taskList.length!==0){
|
||||
datearr.push(array[i])
|
||||
}
|
||||
}
|
||||
state.level = datearr;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user