From d2002edd8d36c91da0ffd115f509d2f59f0e1820 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 17:21:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gratefulteacher/CommonTeacher.vue | 24 +++++++++--- .../gratefulteacher/LecturerManagement.vue | 6 +-- src/views/gratefulteacher/tablemodel.vue | 19 +++++----- src/views/gratefulteacher/teaAdd.vue | 38 ++++++++++--------- 4 files changed, 53 insertions(+), 34 deletions(-) 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) { From 6b88258d554134b0f8a821ca080e5b224dd3444f Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 17:40:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/examineApi.js | 5 ++++- src/views/gratefulteacher/AddLevelImportTec.vue | 2 +- src/views/gratefulteacher/LecturerManagement.vue | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/api/examineApi.js b/src/api/examineApi.js index 2534d042..05be018e 100644 --- a/src/api/examineApi.js +++ b/src/api/examineApi.js @@ -155,4 +155,7 @@ export const transferPermission =(data)=>{ // method: "post", // data:data // }) -// } \ No newline at end of file +// } + +//依旧id查找教师 +export const getTeacherId = (data) => http.get('/activityApi/teacher/getTeacherId',{params:data}) \ No newline at end of file diff --git a/src/views/gratefulteacher/AddLevelImportTec.vue b/src/views/gratefulteacher/AddLevelImportTec.vue index 53c53eab..8d2fb01b 100644 --- a/src/views/gratefulteacher/AddLevelImportTec.vue +++ b/src/views/gratefulteacher/AddLevelImportTec.vue @@ -186,7 +186,7 @@ import * as api from "../../api/index1"; import { BATCH_IMPORT_SCORE } from "@/api/config"; import { useStore } from "vuex"; import {getCookieForName} from "@/api/method"; -import { saveTeacher } from "@/api/examineApi"; +import { saveTeacher,getTeacherId } from "@/api/examineApi"; export default { name: "ImpStu", props: { diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue index f03891be..70cf9d22 100644 --- a/src/views/gratefulteacher/LecturerManagement.vue +++ b/src/views/gratefulteacher/LecturerManagement.vue @@ -757,7 +757,7 @@ const show= async (record)=>{ attestation.value =[ //0: 已上传 1: 未上传 2:已退回 {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'}}, - {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}}, + {name:{0:'线上学习已完成',1:'线上学习未完成',2:'进行中'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}}, {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:''}}, {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'}}, {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}},