Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js

@@ -75,6 +75,14 @@ export function getteacherNotice(query) {
     params: query,
     params: query,
   });
   });
 }
 }
+// 级部列表
+export function getGradeTnfo(query) {
+  return request({
+    url: '/teacherFiles/files/gradeList',
+    method: 'get',
+    params: query
+  })
+}
 //老师查看详情
 //老师查看详情
 export function getNoticeInfo(query) {
 export function getNoticeInfo(query) {
   return request({
   return request({
@@ -85,14 +93,12 @@ export function getNoticeInfo(query) {
 }
 }
 
 
 //老师查看列表
 //老师查看列表
-export function getTeacherTnfo(userId) {
+export function getTeacherTnfo(query) {
   return request({
   return request({
-    url: `/teacherFiles/files/getTeachList/${userId}`,
-    method: "get",
-    params: {
-      noticeName: noticeName,
-    },
-  });
+    url: '/teacherFiles/files/getTeachList',
+      method: 'get',
+      params: query
+  })
 }
 }
 
 
 //级部查看档案详情
 //级部查看档案详情
@@ -144,14 +150,14 @@ export function fileSubReview(id) {
   });
   });
 }
 }
 
 
-// 教师档案提交通过
+// 教师档案驳回
 export function fileSubApproved(id) {
 export function fileSubApproved(id) {
   return request({
   return request({
     url: `/teacherFiles/files/reject/${id}`,
     url: `/teacherFiles/files/reject/${id}`,
     method: "put",
     method: "put",
   });
   });
 }
 }
-// 教师档案提交驳回
+// 教师档案提交
 export function fileSubRejected(id) {
 export function fileSubRejected(id) {
   return request({
   return request({
     url: `/teacherFiles/files/passThrough/${id}`,
     url: `/teacherFiles/files/passThrough/${id}`,

ruoyi-ui/src/views/smartSchool/massOrganization/clubRegistrationReview/index.vue

@@ -254,6 +254,7 @@ export default {
     },
     },
     // 同意
     // 同意
     handleAgree(row) {
     handleAgree(row) {
+      console.log(row, "同意row");
       this.$confirm("确定同意吗?", "提示", {
       this.$confirm("确定同意吗?", "提示", {
         confirmButtonText: "确定",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         cancelButtonText: "取消",