diff --git a/src/views/gratefulteacher/CommonTeacher.vue b/src/views/gratefulteacher/CommonTeacher.vue index ef9809dc..083e4d3f 100644 --- a/src/views/gratefulteacher/CommonTeacher.vue +++ b/src/views/gratefulteacher/CommonTeacher.vue @@ -82,7 +82,7 @@ - +
@@ -112,7 +112,7 @@
- +
@@ -140,7 +140,7 @@
-
+
已选
@@ -367,6 +367,10 @@ examineId:{ type: String, default: null + }, + typeLists:{ + type: Boolean, + default: true } }); const projectSelectKeys = ref([]); @@ -634,7 +638,6 @@ if(val.length!=0){ console.log(val,'val') dataLists.value = val.map(item=>{ - console.log(item,'item') return{ examineId:props.examineId, name:item.realName, @@ -648,6 +651,18 @@ if (props.type === 1 && props.groupId && (props.groupMemberCount < (props.groupMemberNumber * 1 + projectSelectRows.value.length + stuSelectRows.value.length))) { return message.warning("添加小组学员超过最大值"); } + if(!props.typeLists){ + if(stuSelectRows.value.length==0){ + message.error("请选择人员") + return + } + if(stuSelectRows.value.length>1){ + message.error("归属权仅可选择一人,请重新选择") + stuTableRef.value.clear() + } + + return + } stageVisible.value = false; visiable.value = false; emit("finash", false); @@ -672,7 +687,6 @@ stuTreeExpandedKeys.value = []; stuTreeSelectKeys.value = []; activeKey.value = props.isGroup ? 4 : 1; - projectParams.value.studentName = ""; nameSearch.value.keyword = ""; searchOrgName.value.keyword = ""; diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue index 5cf63269..f03891be 100644 --- a/src/views/gratefulteacher/LecturerManagement.vue +++ b/src/views/gratefulteacher/LecturerManagement.vue @@ -788,7 +788,7 @@ const returnPage = (record) => { content: "确定退回初稿吗?", ok:()=>{ backDraft({ - teacherId:record.id, + teacherId:record.teacherId, version:0 }).then(res=>{ console.log(res,'res') @@ -801,7 +801,7 @@ const returnPageTwo = (record) => { content: "确定退回初稿吗?", ok:()=>{ backDraft({ - teacherId:record.id, + teacherId:record.teacherId, version:1 }).then(res=>{ console.log(res,'res') @@ -897,7 +897,7 @@ const vwtext = ref(null)
- +
添加讲师
diff --git a/src/views/gratefulteacher/tablemodel.vue b/src/views/gratefulteacher/tablemodel.vue index fdbf36de..9a7a59e9 100644 --- a/src/views/gratefulteacher/tablemodel.vue +++ b/src/views/gratefulteacher/tablemodel.vue @@ -73,16 +73,16 @@ @@ -138,6 +138,7 @@ watch, onMounted, } from "vue"; + import CommonStudent from "./CommonTeacher"; import { usePage } from "@/api/request"; import { STUDENT_LIST } from "@/api/apis"; import { delStudentList } from "@/api/index1"; @@ -195,8 +196,8 @@ import { message } from "ant-design-vue"; const columns = ref([ { title: "姓名", - dataIndex: "createName", - key: "createName", + dataIndex: "name", + key: "name", width: 30, align: "center", ellipsis: true, @@ -227,7 +228,7 @@ import { message } from "ant-design-vue"; ({ 0: "查看权", 1: "管理权", - 2: "管理权", + 2: "归属权", 7: "查看权", 8: "管理权", 9: "归属权", diff --git a/src/views/gratefulteacher/teaAdd.vue b/src/views/gratefulteacher/teaAdd.vue index d07d9044..0715b0a5 100644 --- a/src/views/gratefulteacher/teaAdd.vue +++ b/src/views/gratefulteacher/teaAdd.vue @@ -383,6 +383,10 @@ const teaunm = ref([]) watch(stuSelectRows,(val)=>{ console.log(val,'val') + if(val.length == 0){ + teaunm.value = [] + return + } teaunm.value = val.map((res,index)=>{ return { teacherName:res.realName, @@ -390,7 +394,7 @@ } }) console.log(teaunm.value); - }) + },{deep:true}) const person = ref(false); const group = ref(false); const visiable = ref(false); @@ -649,27 +653,27 @@ const route = useRoute() teachers: teaunm.value, deptIds: deptList.value?.map((e) => e.id), groupIds: auditSelectRows.value?.map((e) => e.id), - }).then(() => { + }).then(() => { deleteDepSelect(); emit("finash", true); message.info('添加成功'); }); - // saveStu({ - // targetId: props.id, - // type: props.type, - // clear: props.clear, - // deptIds: deptList.value?.map((e) => e.id), - // stageId: stageId.value, - // groupIds: auditSelectRows.value?.map((e) => e.id), - // studentList: stuSelectRows.value, - // projectList: projectSelectRows.value, - // groupName: props.groupName, - // groupId: props.groupId, - // }).then(() => { - // deleteDepSelect(); - // emit("finash", true); - // }); + saveStu({ + targetId: props.id, + type: props.type, + clear: props.clear, + deptIds: deptList.value?.map((e) => e.id), + stageId: stageId.value, + groupIds: auditSelectRows.value?.map((e) => e.id), + studentList: stuSelectRows.value, + projectList: projectSelectRows.value, + groupName: props.groupName, + groupId: props.groupId, + }).then(() => { + deleteDepSelect(); + emit("finash", true); + }); } // 搜索受众值发生变化 function orgValue(value) {