zd 教师电子档案

c2ee14f3 · Cat · b17d2ea4 · c2ee14f3 · c2ee14f3 · c2ee14f3
Commit c2ee14f3 authored Oct 31, 2023 by Cat
5 changed files
--- a/ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
@@ -8,7 +8,19 @@
      class="demo-form-inline"
    >
      <el-form-item label="姓名">
-        <el-input v-model="form.name"></el-input>
+        <el-input v-model="queryForm.name"></el-input>
+      </el-form-item>
+      <el-form-item label="任务名称">
+        <el-select clearable v-model="queryForm.noticeName" style="width: 100%">
+          <el-option
+            v-for="item in listTeacherInfo"
+            :key="item.id"
+            :label="item.noticeName"
+            :value="item.id"
+          >
+            {{ item.noticeName }}
+          </el-option>
+        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button
@@ -58,6 +70,12 @@
        min-width="200"
      />
      <el-table-column
+        label="任务名称"
+        align="center"
+        prop="noticeName"
+        min-width="150"
+      />
+      <el-table-column
        label="学年学期"
        align="center"
        prop="level"
@@ -405,6 +423,7 @@ export default {
  name: "gradeElectronicRecord",
  data() {
    return {
+      listTeacherInfo: [],
      // 遮罩层
      loading: true,
      // 总条数
@@ -412,9 +431,8 @@ export default {
      queryForm: {
        pageSize: 10,
        pageNum: 1,
-        level: "",
+        noticeName: "",
        name: "",
-        region: "",
      },
      tableData: [],
      dialogVisible: false,
@@ -442,20 +460,34 @@ export default {
    // console.log("id", this.$route.query.id);
    // console.log("status", this.status);
    this.getList();
+    this.getListInfo();
  },
  methods: {
+    // 任务下拉框
+    getListInfo() {
+      const params = {
+        pageNum: this.queryForm.pageNum,
+        pageSize: this.queryForm.pageSize,
+        noticeId: 2,
+      };
+      listTeacherNotice(params).then((res) => {
+        console.log(res, "列表");
+        this.listTeacherInfo = res.rows;
+        console.log(this.listTeacherInfo, "this.listTeacherInfo");
+      });
+    },
    /** 查询信息列表 */
    getList() {
      this.loading = true;
      const params = {
        pageNum: this.queryForm.pageNum,
        pageSize: this.queryForm.pageSize,
-        // gradeId: this.$store.state.user,
+        gradeTeacherId: this.$store.state.user.userId,
-        // noticeId: this.$store.state.user.noticeId,
+        noticeId: 2,
+        noticeName: this.queryForm.noticeName,
+        name: this.queryForm.name,
      };
-      const gradeId = this.$store.state.user;
-      console.log(gradeId, "gradeId");
      getNoticeInfo(params).then((res) => {
        console.log(params, "params");
        console.log(res, "查询res");
@@ -463,7 +495,7 @@ export default {
    },
    //  搜索按钮
    handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryForm.pageNum = 1;
      this.getList();
    },
    //  重置按钮

--- a/ruoyi-ui/src/views/smartSchool/massOrganization/memberManagement/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/massOrganization/memberManagement/index.vue
@@ -405,6 +405,7 @@ export default {
              classes: this.form.classes,
              orgPosition: this.form.orgPosition,
              phone: this.form.phone,
+              orgName: this.form.orgName,
            };
            editMemberInfo(paramsedit)
              .then((response) => {

--- a/ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
@@ -595,12 +595,17 @@ export default {
      this.loading = true;
      //   const userName = this.$store.state.user;
      const userId = this.$store.state.user.userId;
+      //   queryForm.noticeName
+      const params = {
+        userId: this.$store.state.user.userId,
+        noticeName: this.queryForm.noticeName,
+      };
      //   const params = {
      //     pageNum: this.queryForm.pageNum,
      //     pageSize: this.queryForm.pageSize,
      //     teacherId: this.$store.state.user.userId,
      //   };
-      getTeacherTnfo(userId).then((res) => {
+      getTeacherTnfo(params).then((res) => {
        this.tableData = res.rows;
        // console.log(params, "params");
        console.log(res, "res");

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
@@ -568,6 +568,9 @@ export default {
        pageNum: this.queryForm.pageNum,
        pageSize: this.queryForm.pageSize,
        noticeId: this.$route.query.noticeId,
+        gradeName: this.queryForm.gradeName,
+        teacherName: this.queryForm.teacherName,
+        courseName: this.queryForm.courseName,
      };
      getteacherNotice(params).then((res) => {
        this.tableData = res.rows;

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
@@ -219,6 +219,7 @@
    />
    <!--弹窗-->
    <el-dialog
+      v-loading="loading"
      :title="title"
      :visible.sync="dialogVisible"
      width="650px
@@ -307,7 +308,7 @@ export default {
    return {
      selectedIds: [],
      // 遮罩层
-      loading: true,
+      loading: false,
      // 总条数
      total: 0,
      queryForm: {
@@ -402,6 +403,7 @@ export default {
    },
    //弹窗确定按钮
    confirmDialog() {
+      this.loading = true;
      this.$refs["form"].validate((valid) => {
        if (valid) {
          if (this.form.id != null) {