龚焕茏
2024-07-08 1406d5efe7b47d45e988fcb0a6092b3bb9dc0443
feat:部门树形结构
9个文件已修改
135 ■■■■ 已修改文件
src/views/answer/sheetStatistics.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/education/subject/edit.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/paper/edit.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/paper/list.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/personalRandomTemplate/edit.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/multiple-choice.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/single-choice.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/exam/question/edit/true-false.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/student/edit.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/answer/sheetStatistics.vue
@@ -7,9 +7,16 @@
        </el-select>
      </el-form-item>
      <el-form-item label="部门:" v-if="admin">
        <el-select v-model="queryParam.departmentId" collapse-tags multiple filterable placeholder="部门" clearable>
        <!-- <el-select v-model="queryParam.departmentId" collapse-tags multiple filterable placeholder="部门" clearable>
          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value" />
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          filterable
          v-model="queryParam.departmentId"
          :options="levelEnum"
          :props="{ multiple: true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="submitForm">查询</el-button>
src/views/education/subject/edit.vue
@@ -3,9 +3,15 @@
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
      <el-form-item label="所属部门:" prop="deptIds">
        <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
        <!-- <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          v-model="form.deptIds"
          :options="depart"
          :props="{ multiple: true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目名称:" required>
        <el-input v-model="form.name"></el-input>
@@ -59,7 +65,7 @@
      let that = this
      departmentApi.pageList(this.queryParam).then(res=>{
        if (res.code == 1){
          that.depart = res.response.list
          that.depart = res.response;
        }
      })
    },
src/views/exam/paper/edit.vue
@@ -9,9 +9,16 @@
        </el-select>
      </el-form-item>
      <el-form-item label="部门:" prop="deptId" required>
        <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="部门">
        <!-- <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="部门">
          <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          @change="getSubject"
          v-model="form.deptId"
          :options="depts"
          :props="{ emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" prop="subjectId" required>
        <el-select ref="subjectIdRef" v-model="form.subjectId" :disabled="! form.deptId" placeholder="课目" multiple collapse-tags>
@@ -143,9 +150,15 @@
          </el-select>
        </el-form-item>
        <el-form-item label="部门:">
          <el-select v-model="student.deptIds" clearable multiple>
          <!-- <el-select v-model="student.deptIds" clearable multiple>
            <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
          </el-select>
          </el-select> -->
          <el-cascader
          clearable
          v-model="student.deptIds"
          :options="depts"
          :props="{ emitPath: false, multiple: true, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="selectStudent">查询</el-button>
src/views/exam/paper/list.vue
@@ -3,9 +3,15 @@
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="部门:">
        <el-select v-model="queryParam.level" clearable placeholder="部门">
        <!-- <el-select v-model="queryParam.level" clearable placeholder="部门">
          <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          v-model="queryParam.level"
          :options="depts"
          :props="{ emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" >
        <el-select v-model="queryParam.subjectId"  clearable>
src/views/exam/personalRandomTemplate/edit.vue
@@ -9,9 +9,15 @@
        </el-select>
      </el-form-item>
      <el-form-item label="部门:" prop="deptId" required>
        <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="部门">
        <!-- <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="部门">
          <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          v-model="form.deptId"
          :options="depts"
          :props="{ emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" prop="subjectId" required>
        <el-select ref="subjectIdRef" v-model="form.subjectId" :disabled="! form.deptId" placeholder="课目" multiple collapse-tags
@@ -147,16 +153,22 @@
          </el-select>
        </el-form-item>
        <el-form-item label="部门:">
          <el-select v-model="student.deptIds" clearable multiple>
          <!-- <el-select v-model="student.deptIds" clearable multiple>
            <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
          </el-select>
          </el-select> -->
          <el-cascader
          clearable
          v-model="student.deptIds"
          :options="depts"
          :props="{ multiple: true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="selectStudent">查询</el-button>
        </el-form-item>
      </el-form>
      <el-table ref="multipleTable" v-loading="student.listLoading" :data="tableData" border fit highlight-current-row
        style="width: 100%" @selection-change="handleSelection" row-key="id">
        style="width: 100%" @selection-change="handleSelection" row-key="id" @select-all="selectAll">
        <el-table-column type="selection" :reserve-selection="true"></el-table-column>
        <el-table-column prop="realName" label="学员" />
      </el-table>
@@ -271,7 +283,7 @@
          questionType: null,
          subjectId: 1,
          pageIndex: 1,
          pageSize: 5
          pageSize: 500000000
        },
        listLoading: true,
        tableData: [],
@@ -337,8 +349,16 @@
      })
    },
    handleSelection(val) {
      console.log('val', val);
      this.student.multipleSelection = val;
    },
    selectAll() {
      let param = { ...this.student };
      param.pageSize = 999999;
      examPaperApi.selectStudent(param).then(res => {
        this.handleSelection(res.response.list);
      });
    },
    confirmStudentSelect() {
      this.form.userIds = this.student.multipleSelection.map((item) => item.id);
      this.form.examineeList = this.student.multipleSelection.map((item) => {
src/views/exam/question/edit/multiple-choice.vue
@@ -2,9 +2,16 @@
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading"  :rules="rules">
      <el-form-item label="所属部门:" prop="deptIds">
        <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
        <!-- <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          multiple
          v-model="form.deptIds"
          :options="depart"
          :props="{ multiple : true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
@@ -154,7 +161,7 @@
      departmentApi.pageList(this.queryParam).then(res=>{
        console.log(res)
        if (res.code == 1){
          that.depart = res.response.list
          that.depart = res.response
        }
      })
    },
src/views/exam/question/edit/single-choice.vue
@@ -2,9 +2,16 @@
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
      <el-form-item label="所属部门:" prop="deptIds">
        <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
        <!-- <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          multiple
          v-model="form.deptIds"
          :options="depart"
          :props="{ multiple : true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple
@@ -154,7 +161,7 @@
      departmentApi.pageList(this.queryParam).then(res=>{
        console.log(res)
        if (res.code == 1){
          that.depart = res.response.list
          that.depart = res.response
        }
      })
    },
src/views/exam/question/edit/true-false.vue
@@ -2,9 +2,15 @@
  <div class="app-container">
    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading"  :rules="rules">
      <el-form-item label="所属部门:" prop="deptIds">
        <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
        <!-- <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          v-model="form.deptIds"
          :options="depart"
          :props="{ multiple : true, emitPath: false, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="课目:" prop="subjectIds" required>
        <el-select v-model="form.subjectIds" placeholder="课目"  multiple collapse-tags>
@@ -148,7 +154,7 @@
      departmentApi.pageList(this.queryParam).then(res=>{
        console.log(res)
        if (res.code == 1){
          that.depart = res.response.list
          that.depart = res.response
        }
      })
    },
src/views/user/student/edit.vue
@@ -26,9 +26,16 @@
        <el-input v-model="form.phone"></el-input>
      </el-form-item>
      <el-form-item label="部门:" prop="deptIds" required>
        <el-select v-model="form.deptIds" multiple collapse-tags placeholder="部门" :disabled="this.$route.query.id">
        <!-- <el-select v-model="form.deptIds" multiple collapse-tags placeholder="部门" :disabled="this.$route.query.id">
          <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
        </el-select> -->
        <el-cascader
          clearable
          :disabled="this.$route.query.id"
          v-model="form.deptIds"
          :options="depts"
          :props="{ emitPath: false, multiple: true, value: 'id', label: 'name',  checkStrictly: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item label="标签:" prop="tagIds">
        <el-select v-model="form.tagIds" multiple  collapse-tags placeholder="标签">