zpy 10.26

86ef3e1c · zhaopanyu · 604e1338 · 86ef3e1c · 86ef3e1c · 86ef3e1c
Commit 86ef3e1c authored Oct 26, 2023 by zhaopanyu
8 changed files
--- a/ruoyi-ui/src/api/smartSchool/personWork/leaveApply/index.js
+++ b/ruoyi-ui/src/api/smartSchool/personWork/leaveApply/index.js
-import request from '@/utils/request'
+import request from "@/utils/request";
 // 查询老师请假信息列表
 export function listTeacherLeave(query) {
  return request({
-    url: '/school/teacherLeave/list',
+    url: "/school/teacherLeave/list",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 // 查询老师请假信息详细
 export function getTeacherLeave(id) {
  return request({
-    url: '/school/teacherLeave/queryOne/' + id,
+    url: "/school/teacherLeave/queryOne/" + id,
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 // 新增老师请假信息
 export function addTeacherLeave(data) {
  return request({
-    url: '/school/teacherLeave/add',
+    url: "/school/teacherLeave/add",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 // 修改老师请假信息
 export function updateTeacherLeave(data) {
  return request({
-    url: '/school/teacherLeave/edit',
+    url: "/school/teacherLeave/edit",
-    method: 'put',
+    method: "put",
-    data: data
+    data: data,
-  })
+  });
 }
 // 删除老师请假信息
 export function delTeacherLeave(ids) {
  return request({
-    url: '/school/teacherLeave/delete/' + ids,
+    url: "/school/teacherLeave/delete/" + ids,
-    method: 'delete'
+    method: "delete",
-  })
+  });
 }
 //提交申请
 export function submitApply(id) {
  return request({
-    url: '/school/teacherLeave/submitApply/' + id,
+    url: "/school/teacherLeave/submitApply/" + id,
-    method: 'post',
+    method: "post",
-  })
+  });
 }
 /**
 * 待办事项列表
 */
 export function taskList(query) {
  return request({
-    url: '/school/teacherLeave/taskList',
+    url: "/school/teacherLeave/taskList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 /**
@@ -68,58 +67,58 @@ export function taskList(query) {
 */
 export function taskDoneList(query) {
  return request({
-    url: '/school/teacherLeave/taskDoneList',
+    url: "/school/teacherLeave/taskDoneList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 //审批历史列表
 export function listHistory(data) {
  return request({
-    url: '/activiti/process/listHistory',
+    url: "/activiti/process/listHistory",
-    method: 'get',
+    method: "get",
-    params: data
+    params: data,
-  })
+  });
 }
 /** 销假列表（同历史任务接口，目前分两个接口来做） */
 export function revokeList(data) {
  return request({
-    url: '/activiti/process/listHistory',
+    url: "/activiti/process/listHistory",
-    method: 'get',
+    method: "get",
-    params: data
+    params: data,
-  })
+  });
 }
 // 进度查看
 export function viewSchedule(data) {
  return request({
-    url: '/activiti/process/read-resource',
+    url: "/activiti/process/read-resource",
-    method: 'get',
+    method: "get",
-    params: data
+    params: data,
-  })
+  });
 }
 /** 审批任务 */
-export function complete({taskId, instanceId, comment, pass}) {
+export function complete({ taskId, instanceId, comment, pass }) {
  return request({
    url: `/school/teacherLeave/complete/${taskId}/${instanceId}`,
-    method: 'post',
+    method: "post",
    data: {
      comment,
-      pass
+      pass,
-    }
+    },
-  })
+  });
 }
 /** 销假 */
 export function cancelLeave(taskId, postForm) {
  return request({
-    url: '/school/teacherLeave/cancelLeave/' + taskId,
+    url: "/school/teacherLeave/cancelLeave/" + taskId,
-    method: 'post',
+    method: "post",
-    data: postForm
+    data: postForm,
-  })
+  });
 }
 /*新增修改dialog*/
@@ -127,44 +126,49 @@ export function cancelLeave(taskId, postForm) {
 //获取级部/处室下拉框
 export function getGradeOfficeList(query) {
  return request({
-    url: '/schoolGrade/getList',
+    url: "/schoolGrade/getList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 //获取级部/处室  主任  下拉框
 export function getGradeOfficeDirectorList(form) {
  return request({
-    url: '/school/teacherLeave/getDeptLeader/' + form.applyOrgid,
+    url: "/school/teacherLeave/getDeptLeader/" + form.applyOrgid,
    params: form,
-    method: 'get',
+    method: "get",
-  })
+  });
 }
 //分管领导/主要领导下拉框
 export function getLeaderList(form) {
  return request({
-    url: '/school/teacherLeave/getSchoolLeader',
+    url: "/school/teacherLeave/getSchoolLeader",
    params: form,
-    method: 'get',
+    method: "get",
-  })
+  });
 }
 //根据请假开始时间和结束时间，获取请假时长
 export function getLeaveTime(data) {
  return request({
-    url: '/school/teacherLeave/getTotalTime',
+    url: "/school/teacherLeave/getTotalTime",
-    method: 'get',
+    method: "get",
    params: data,
-  })
+  });
 }
 export function getDepId() {
  return request({
-    url: '/schoolGrade/getDeptOrGrade',
+    url: "/schoolGrade/getDeptOrGrade",
-    method: 'get',
+    method: "get",
-  })
+  });
+}
+//判断用户所选部门是属于级部还是科室
+export function getDepids(deptId) {
+  return request({
+    url: "/schoolGrade/judgeDeptOrGrade/" + deptId,
+    method: "get",
+  });
 }
--- a/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/index.vue
@@ -284,7 +284,7 @@ import {
  getLeaderList
 } from "@/api/smartSchool/personWork/leaveApply";
 import { formatDate } from "../../../../utils";
-import { getDepId } from "../../../../api/smartSchool/personWork/leaveApply";
+import { getDepId, getDepids } from "../../../../api/smartSchool/personWork/leaveApply";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import SelectUser from "./components/SelectUser";
@@ -323,7 +323,7 @@ export default {
  created() {
    this.getList();
    this.schoolLeader();
-    this.employeeType = this.$store.state.user.employeeType;
+    // this.employeeType = this.$store.state.user.employeeType;
    this.form.teacherId = this.$store.state.user.userId;
  },
@@ -529,8 +529,14 @@ export default {
    },
    deptIdAndName(node) {
-      this.form.applyOrgname = node.label;
+      console.log(node);
-      this.form.handUserName1 = undefined;
+      getDepids(node.id).then(response => {
+        this.employeeType = response.employeeType;
+      });
+      // this.form.applyOrgname = node.label;
+      // this.form.handUserName1 = undefined;
      // this.gradeDirectorList()
    },
    /** 导出按钮操作 */
@@ -746,7 +752,6 @@ export default {
        if (res.code == 200) {
          this.schoolLeaderList = res.rows
        }
      }))
    },
@@ -841,6 +846,8 @@ export default {
        getDepId().then(res => {
          this.$set(this.form, "applyOrgid", res.data);
          this.form.applyOrgid = res.data
+          this.employeeType = res.employeeType
+          console.log(this.employeeType, '22');
          let arr = this.readNodes(this.gradeOfficeList)
          const node = arr.find(item => {
            if (item.id == this.form.applyOrgid) {

--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolMoments/components/schoolMomentsDetail/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolMoments/components/schoolMomentsDetail/index.vue
--- a/ruoyi-ui/src/views/smartSchool/schoolManage/schoolMoments/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/schoolManage/schoolMoments/index.vue
@@ -2,12 +2,8 @@
  <section class="app-container">
    <el-form :model="queryParams" :inline="true" size="small" @submit.native.prevent>
      <el-form-item label="时刻名称" prop="timeName">
-        <el-input
+        <el-input clearable v-model="queryParams.timeName" @keyup.enter.native="handleQuery"
-          clearable
+          placeholder="选择时刻"></el-input>
-          v-model="queryParams.timeName"
-          @keyup.enter.native="handleQuery"
-          placeholder="选择时刻"
-        ></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -16,38 +12,18 @@
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['system:schoolTime:add']">新增
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:schoolTime:add']"
-        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['system:schoolTime:edit']">修改
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:schoolTime:edit']"
-        >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['system:schoolTime:remove']">删除
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:schoolTime:remove']"
-        >删除
        </el-button>
      </el-col>
      <!--      <el-col :span="1.5">-->
@@ -63,83 +39,48 @@
      <!--      </el-col>-->
      <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
    </el-row>
-    <el-table
+    <el-table v-loading="loading" :data="momentList" @selection-change="handleSelectionChange">
-      v-loading="loading"
+      <el-table-column type="selection" width="55" align="center" />
-      :data="momentList"
+      <el-table-column label="时刻名称" align="center" v-if="columns[0].visible" prop="timeName" show-overflow-tooltip />
-      @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="时刻名称" align="center" v-if="columns[0].visible" prop="timeName"
-                       show-overflow-tooltip/>
      <el-table-column label="是否使用" align="center" v-if="columns[1].visible" prop="isUsed">
        <template slot-scope="scope">
-          <el-switch
+          <el-switch v-model="scope.row.isUsed" active-value="1" inactive-value="0"
-            v-model="scope.row.isUsed"
+            @change="handleUsedChange(scope.row)" />
-            active-value="1"
-            inactive-value="0"
-            @change="handleUsedChange(scope.row)"
-          />
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" v-if="columns[2].visible" prop="remark">
      </el-table-column>
-      <el-table-column label="操作" align="center" v-if="columns[3].visible"
+      <el-table-column label="操作" align="center" v-if="columns[3].visible" class-name="small-padding fixed-width">
-                       class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            size="mini"
+            v-hasPermi="['system:schoolTime:edit']">编辑
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:schoolTime:edit']"
-          >编辑
          </el-button>
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-search" @click="handleViewDetail(scope.row)">明细
-            size="mini"
-            type="text"
-            icon="el-icon-search"
-            @click="handleViewDetail(scope.row)"
-          >明细
          </el-button>
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            size="mini"
+            v-hasPermi="['system:schoolTime:remove']">删除
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:schoolTime:remove']"
-          >删除
          </el-button>
        </template>
      </el-table-column>
    </el-table>
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total > 0"
+      @pagination="getList"></pagination>
-      :total="total"
+    <el-dialog width="500px" :visible.sync="open" :fullscreen="isFullScreen" :modal-append-to-body="false">
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    ></pagination>
-    <el-dialog
-      width="500px"
-      :visible.sync="open"
-      :fullscreen="isFullScreen"
-      :modal-append-to-body="false"
-    >
      <template slot="title">
        <div class="custom-dialog__header">
          <span class="el-dialog__title">{{ title }}</span>
          <div class="custom-dialog__right">
            <div class="custom__dialog__size" @click="isFullScreen = !isFullScreen">
              <svg-icon style="color: #909399; font-size: 13px"
-                        :icon-class="isFullScreen?'exit-fullscreen':'fullscreen'"/>
+                :icon-class="isFullScreen ? 'exit-fullscreen' : 'fullscreen'" />
            </div>
          </div>
        </div>
      </template>
      <el-form :model="form" ref="form" label-width="100px" :rules="rules">
        <el-form-item label="时刻名称：" prop="timeName">
-          <el-input clearable v-model="form.timeName"
+          <el-input clearable v-model="form.timeName"></el-input>
-          ></el-input>
        </el-form-item>
        <!-- <el-form-item label="是否使用：">
          <el-select v-model="form.isUsed" style="width: 100%;">
@@ -152,13 +93,8 @@
          </el-select>
        </el-form-item> -->
        <el-form-item label="备注：" prop="remark">
-          <el-input
+          <el-input type="textarea" maxlength="200" :autosize="{ minRows: 2, maxRows: 5 }" show-word-limit
-            type="textarea"
+            v-model="form.remark"></el-input>
-            maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 5}"
-            show-word-limit
-            v-model="form.remark"
-          ></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -179,7 +115,7 @@ import {
  deleteSelect,
  changeUserStatus
 } from '@/api/smartSchool/schoolManage/schoolMoments'
-import {UseStatus} from "@/enums/schedule/schoolMoments";
+import { UseStatus } from "@/enums/schedule/schoolMoments";
 export default {
  name: "SchoolMoments",
@@ -211,15 +147,15 @@ export default {
      // 校验
      rules: {
        timeName: [
-          {required: true, message: '请输入时刻名称', trigger: 'blur'}
+          { required: true, message: '请输入时刻名称', trigger: 'blur' }
        ],
      },
      // 列信息
      columns: [
-        {key: 0, label: `时刻名称`, visible: true},
+        { key: 0, label: `时刻名称`, visible: true },
-        {key: 1, label: `是否使用`, visible: true},
+        { key: 1, label: `是否使用`, visible: true },
-        {key: 2, label: `备注`, visible: true},
+        { key: 2, label: `备注`, visible: true },
-        {key: 3, label: `操作`, visible: true}
+        { key: 3, label: `操作`, visible: true }
      ],
      // 选中数据
      ids: [],
@@ -300,16 +236,15 @@ export default {
    /** 【学校时刻明细】按钮 */
    handleViewDetail(row) {
-      // 这里进行一次路由跳转
      this.$router.push({
-        // path: '/schoolManage/schoolMomentsDetail/' + row.id,
        path: '/schoolManage/schoolMomentsDetail',
        query: {
          schoolTimeId: row.id
        }
-      })
+      });
    },
    /** 【删除】按钮 */
    handleDelete(row) {
      this.throttle(() => {
@@ -415,5 +350,4 @@ export default {
 <style lang="scss" scoped>
 @import "~@/assets/styles/moduleStyle/custom-dialog.scss";
 </style>
--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/components/studentTable/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/components/studentTable/index.vue
@@ -9,9 +9,7 @@
        <el-button type="primary" plain size="mini" @click="printTable">打印
        </el-button>
      </div>
    </div>
    <el-card style="height: 100%;width: 900px;">
      <br/> <br/>
      <div style="width: 100%; margin: auto;" id="postFormContainer">

--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/index.vue
--- a/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/printLesson.vue
+++ b/ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/printLesson.vue
--- a/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
@@ -5,15 +5,13 @@
        <div class="head-container">
          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
            style="margin-bottom: 20px" />
        </div>
        <div class="head-container">
          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" default-expand-all highlight-current
+            :filter-node-method="filterNode" ref="tree" default-expand-all="false" highlight-current
            @node-click="handleNodeClick" />
        </div>
      </el-col>
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" label-width="90px" :inline="true" v-show="showSearch">
          <el-form-item label="姓名" clearable prop="teacherName">
@@ -562,7 +560,7 @@ export default {
        // If the selection exceeds the limit, remove the last item
        this.form.deptIds.pop();
      }
-    },
+    }
  },
  created() {
    this.getList();
@@ -571,6 +569,7 @@ export default {
    //   this.initPassword = response.msg
    // })
  },
  methods: {
    handleSelectionChange(selectedItems) {
      if (selectedItems.length > 8) {
@@ -587,6 +586,8 @@ export default {
    handleNodeClick(data) {
      this.queryParams.deptId = data.id;
      this.handleQuery();
    },
    /** 查询学校老师列表 */
@@ -1077,7 +1078,7 @@ export default {
    }
  },
-  };
+};
 </script>
 <style scoped>
 .avatar-uploader {