zd 社团修改

ae0909b0 · Cat · c435fba3 · ae0909b0 · ae0909b0 · ae0909b0
Commit ae0909b0 authored Oct 26, 2023 by Cat
4 changed files
--- a/ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
+++ b/ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
 import request from '@/utils/request'
-// // 任务列表
-// export function listTeacherNotice(query) {
-//   return request({
-//     url: '/teacherFiles/notice/list',
-//     method: 'get',
-//     params: query
-//   })
-// }
-// // 添加任务
-// export function addTeacherNotice(data) {
-//   return request({
-//     url: '/teacherFiles/notice',
-//     method: 'post',
-//     data: data
-//   })
-// }
-// // 信息发布
-// export function infoTeacherNotice(id) {
-//   return request({
-//     url: `/teacherFiles/notice/release/${id}`,
-//     method: 'put'
-//   })
-// }
-// // 通知下档案查看|数据维护
-// export function getteacherNotice(query) {
-//   return request({
-//     url: '/teacherFiles/files/list',
-//     method: 'get',
-//     params: query
-//   })
-// }
-// //老师查看档案详情
-// export function getNoticeInfo(query) {
-//   return request({
-//     url: '/teacherFiles/files/list',
-//       method: 'get',
-//     params: query
-//   })
-// }
-// //级部查看档案详情
-// export function getDepInfo(query) {
-//   return request({
-//     url: '/teacherFiles/files/list',
-//       method: 'get',
-//     params: query
-//   })
-// }
-// //查看档案详情
-// export function getFileTnfo(id) {
-//   return request({
-//     url: '/teacherFiles/files/'+id,
-//       method: 'get',
-//   })
-// }
-// // 同步档案
-// export function syncNotice(id) {
-//   return request({
-//     url: '/teacherFiles/files/synchronous/' + id,
-//     method: 'put'
-//   })
-// }
 // 添加任务
 export function addTeacherNotice(data) {
  return request({

--- a/ruoyi-ui/src/views/smartSchool/massOrganization/clubRegistrationReview/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/massOrganization/clubRegistrationReview/index.vue
@@ -35,10 +35,11 @@
      <el-table-column align="center" type="index" label="序号" width="55" />
      <el-table-column align="center" prop="name" label="姓名" />
      <el-table-column align="center" prop="sex" label="性别" />
-      <el-table-column align="center" prop="grade" label="年级" />
+      <el-table-column align="center" prop="grade" label="级部" />
      <el-table-column align="center" prop="classes" label="班级" />
-      <el-table-column align="center" prop="hobby" label="兴趣爱好" />
      <el-table-column align="center" prop="phone" label="联系电话" />
+      <el-table-column align="center" prop="cardid" label="身份证号" />
+      <el-table-column align="center" prop="hobby" label="兴趣爱好" />
      <el-table-column align="center" prop="reason" label="申请理由" />
      <el-table-column align="center" prop="status" label="审核状态">
        <template slot-scope="{ row }">
@@ -107,25 +108,33 @@
        </el-row>
        <el-row>
          <el-col :span="10">
-            <el-form-item label="兴趣爱好">
+            <el-form-item label="联系电话">
-              <el-input v-model="form.hobby"></el-input>
+              <el-input v-model="form.phone"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="10">
-            <el-form-item label="联系电话">
+            <el-form-item label="身份证号">
-              <el-input v-model="form.phone"></el-input>
+              <el-input v-model="form.cardid"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="10">
+            <el-form-item label="兴趣爱好">
+              <el-input v-model="form.hobby"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
            <el-form-item label="申请理由">
              <el-input v-model="form.reason"></el-input>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row>
          <el-col :span="10">
            <el-form-item label="审核状态">
-              <el-input v-model="form.status"></el-input>
+              <el-input v-model="form.status"> </el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -153,6 +162,7 @@ export default {
  name: "clubRegistrationReview",
  data() {
    return {
+      cat: "",
      queryParams: {
        pageNum: 1,
        pageSize: 10,
@@ -222,16 +232,23 @@ export default {
    },
    // 查看
    handQuery(row) {
-      console.log(row, "查看row");
+      //   console.log(row, "查看row");
      this.reset();
      const ids = row.id;
      this.title = "社团报名审核";
      this.dialogTableVisible = true;
-      //   this.form = row;
      listsigninInfo(ids).then((response) => {
-        console.log(ids, "id");
        if (response.data && response.data.name) {
          this.form = response.data;
+          this.form.status = response.data.status;
+          this.cat = this.form.status;
+          if (this.cat === "1") {
+            this.form.status = "未审核";
+          } else if (this.cat === "2") {
+            this.form.status = "同意";
+          } else if (this.cat === "3") {
+            this.form.status = "不同意";
+          }
        }
      });
    },

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
@@ -385,11 +385,24 @@
 <script>
 import {
+  addTeacherNotice, //添加任务
+  listTeacherNotice, // 任务列表
+  infoTeaNotice, //任务详情
+  updateTask, //添加修改
+  infoTeacherNotice, //发布任务
+  taskRetracted, //任务撤回
+  taskCompleted, //任务完成
+  delTaskInfo, //任务删除
  getteacherNotice, // 通知下档案查看|数据维护
-  getNoticeInfo, //查看档案详情
+  getNoticeInfo, //老师查看档案详情
+  getDepInfo, //级部查看档案详情
  getFileTnfo, //查看档案详情
-  getDepInfo, //级部查询列表
+  syncNotice, //同步档案
-  syncNotice, // 同步档案
+  updateInfo, //教师档案修改
+  delInfo, //教师档案删除
+  fileSubReview, //教师档案提交审核
+  fileSubApproved, //教师档案提交通过
+  fileSubRejected, //教师档案提交驳回
 } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
 export default {
@@ -487,14 +500,32 @@ export default {
      });
    },
-    // 提取
+    // 提取 `
-    handleExtract(row) {
+    handleExtract() {
-      console.log(row, "row提取");
+      const id = this.form.id;
-      this.dialogVisible = true;
-      const id = row.detail;
      syncNotice(id).then((res) => {
-        console.log(res, "提取");
+        console.log("res提取", res);
+        this.tableFirstData = res;
+        this.tableSecondData = res;
+        this.tableThirdData = res;
+        this.tableForthData = res;
+        console.log("this.tableFirstData", this.tableFirstData);
+        console.log("this.tableSecondData", this.tableSecondData);
+        console.log("this.tableThirdData", this.tableThirdData);
+        console.log("this.tableForthData", this.tableForthData);
      });
+      //   this.$modal
+      //     .confirm("是否提取？")
+      //     .then(function () {
+      //       return syncNotice(id);
+      //     })
+      //     .then(() => {
+      //       this.getList();
+      //       this.$modal.msgSuccess("提取成功");
+      //     })
+      //     .catch((err) => {
+      //       console.error(err);
+      //     });
    },
    //修改按钮
    handleEdit(row) {

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
@@ -43,7 +43,7 @@
          icon="el-icon-delete"
          size="mini"
          type="danger"
-          @click="handleDeleteMuti"
+          @click="handleDelete"
          >删除</el-button
        >
      </el-form-item>
@@ -196,7 +196,7 @@
              v-if="scope.row.noticeState == '7'"
              size="mini"
              type="text"
-              @click="dataMaintenance(scope.row)"
+              @click="dataInspection(scope.row)"
              >数据查看
            </el-button>
            <el-button
@@ -305,6 +305,7 @@ export default {
  name: "teacherElectronicRecord",
  data() {
    return {
+      selectedIds: [],
      // 遮罩层
      loading: true,
      // 总条数
@@ -363,7 +364,7 @@ export default {
    // 表单重置
    reset() {
-      this.queryForm = {
+      (this.queryForm = {
        noticeYear: "",
        noticeSemester: "",
        noticeRange: "",
@@ -371,8 +372,15 @@ export default {
        noticeName: "",
        startTime: "",
        endTime: "",
-      };
+      }),
-      this.resetForm("queryForm");
+        (this.form = {
+          noticeYear: "",
+          noticeSemester: "",
+          noticeRange: "全体教师",
+          startTime: "",
+          endTime: "",
+        });
+      //   this.resetForm("queryForm");
    },
    //重置按钮
    resetQuery() {
@@ -381,9 +389,7 @@ export default {
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
-      console.log("selection", selection);
      this.ids = selection.map((item) => item.id);
-      console.log("this.ids", this.ids);
      this.single = selection.length !== 1;
      this.multiple = !selection.length;
    },
@@ -395,7 +401,6 @@ export default {
      this.dialogVisible = true;
    },
    //弹窗确定按钮
    confirmDialog() {
      this.$refs["form"].validate((valid) => {
        if (valid) {
@@ -421,11 +426,9 @@ export default {
        }
      });
    },
    //多选删除按钮
-    handleDeleteMuti() {
+    handleDeleteMuti() {},
-      console.log("delete ids", this.ids);
-      // 接口
-    },
    //修改按钮
    handleEdit(row) {
      console.log(row, "row1");
@@ -435,7 +438,7 @@ export default {
    },
    // 删除按钮
    handleDelete(row) {
-      const ids = row.id;
+      const ids = row.id || this.ids;
      this.$modal
        .confirm("是否确认删除？")
        .then(function () {
@@ -495,6 +498,10 @@ export default {
      console.log(pageNum, "数据维护按钮num");
      console.log(pageSize, "数据维护按钮size");
    },
+    // 数据查看
+    dataInspection() {
+      infoTeaNotice().then((res) => {});
+    },
    //  导出按钮
    handleExport(row) {
      //     this.download(`/artExam/exportAddress/${this.examId}`, {