清理校区相关内容

src/components/base/CampusSelect.vue

@@ -1,63 +0,0 @@
-<template>
-  <el-select
-    v-model="selected"
-    class="campus-select"
-    :placeholder="placeholder"
-    filterable
-    :clearable="clearable"
-    :disabled="disabled"
-    @change="select"
-  >
-    <el-option
-      v-for="item in optionList"
-      :key="item.id"
-      :value="item.id"
-      :label="item.campusName"
-    >
-    </el-option>
-  </el-select>
-</template>
-
-<script>
-import { campusQuery } from "../../modules/base/api";
-
-export default {
-  name: "campus-select",
-  props: {
-    disabled: { type: Boolean, default: false },
-    placeholder: { type: String, default: "请选择" },
-    value: { type: [Number, String], default: "" },
-    clearable: { type: Boolean, default: true }
-  },
-  data() {
-    return {
-      optionList: [],
-      selected: ""
-    };
-  },
-  watch: {
-    value: {
-      immediate: true,
-      handler(val) {
-        this.selected = val;
-      }
-    }
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    async search() {
-      const res = await campusQuery();
-      this.optionList = res;
-    },
-    select() {
-      this.$emit("input", this.selected);
-      this.$emit(
-        "change",
-        this.optionList.find(item => item.id === this.selected)
-      );
-    }
-  }
-};
-</script>

src/components/base/ClazzSelect.vue

@@ -38,7 +38,6 @@ export default {
     value: { type: [Number, String, Array], default: "" },
     clearable: { type: Boolean, default: true },
     multiple: { type: Boolean, default: false },
-    campusId: { type: String, default: "" },
     datas: {
       type: Array
     }
@@ -67,13 +66,6 @@ export default {
         });
         this.labelChange();
       }
-    },
-    campusId(val, oldval) {
-      if (val !== oldval) {
-        this.search();
-        this.$emit("input", "");
-        this.$emit("change", null);
-      }
     }
   },
   created() {
@@ -81,9 +73,7 @@ export default {
   },
   methods: {
     async search() {
-      const res = await clazzQuery({
-        campusId: this.campusId
-      });
+      const res = await clazzQuery({});
       this.optionList = res || [];
       this.labelChange();
     },

src/constants/menus-data.js

@@ -2712,95 +2712,6 @@ export default [
       }
     ]
   },
-  {
-    id: "357",
-    name: "校区管理",
-    url: "CampusManage",
-    type: "MENU",
-    parentId: "356",
-    sequence: 3,
-    enable: true,
-    urls: [
-      {
-        id: "359",
-        name: "校区管理-查询",
-        url: "/api/admin/basic/campus/query",
-        type: "URL",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      },
-      {
-        id: "360",
-        name: "校区管理-新增/编辑",
-        url: "/api/admin/basic/campus/save",
-        type: "URL",
-        parentId: "357",
-        sequence: 2,
-        enable: true
-      },
-      {
-        id: "361",
-        name: "校区管理-删除（逻辑）",
-        url: "/api/admin/basic/campus/delete",
-        type: "URL",
-        parentId: "357",
-        sequence: 3,
-        enable: true
-      }
-    ],
-    buttons: [
-      {
-        id: "372",
-        name: "校区管理-查询",
-        url: "Select",
-        type: "BUTTON",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      },
-      {
-        id: "374",
-        name: "校区管理-新增",
-        url: "Add",
-        type: "BUTTON",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      }
-    ],
-    links: [
-      {
-        id: "375",
-        name: "校区管理-编辑",
-        url: "Edit",
-        type: "LINK",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      },
-      {
-        id: "376",
-        name: "校区管理-删除",
-        url: "Delete",
-        type: "LINK",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      }
-    ],
-    lists: [
-      {
-        id: "373",
-        name: "校区管理-列表",
-        url: "List",
-        type: "LIST",
-        parentId: "357",
-        sequence: 1,
-        enable: true
-      }
-    ]
-  },
   {
     id: "390",
     name: "流程管理",

src/modules/admin/views/SchoolMenuManage.vue

@@ -28,7 +28,6 @@
         <el-form-item label="PDF格式">
           <el-select
             v-model="modalForm.pdfSize"
-            class="campus-select"
             placeholder="请选择"
             multiple
             style="width:100%"

src/modules/base/api.js

@@ -237,17 +237,6 @@ export const deleteApproveRecord = datas => {
 };
 
 // dict --------------------------------->
-// campus-manage
-export const campusQuery = () => {
-  return $postParam("/api/admin/basic/campus/query", {});
-};
-export const deleteCampus = id => {
-  return $postParam("/api/admin/basic/campus/delete", { id });
-};
-export const updateCampus = datas => {
-  return $post("/api/admin/basic/campus/save", datas);
-};
-
 // student-manage
 export const studentListQuery = datas => {
   return $postParam("/api/admin/basic/student/query", datas);

src/modules/base/components/ModifyCampus.vue

@@ -1,155 +0,0 @@
-<template>
-  <el-dialog
-    class="modify-campus"
-    :visible.sync="modalIsShow"
-    :title="title"
-    top="10vh"
-    width="448px"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    append-to-body
-    @open="visibleChange"
-  >
-    <el-form
-      ref="modalFormComp"
-      :model="modalForm"
-      :rules="rules"
-      :key="modalForm.id"
-      label-position="top"
-    >
-      <el-form-item prop="campusName" label="校区名称：">
-        <el-input
-          v-model.trim="modalForm.campusName"
-          placeholder="请输入校区名称"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <!-- <el-form-item prop="campusCode" label="校区编码：">
-        <el-input
-          v-model.trim="modalForm.campusCode"
-          placeholder="请输入校区编码"
-          disabled
-        ></el-input>
-      </el-form-item> -->
-      <el-form-item prop="printHouseId" label="印刷室">
-        <print-room-select
-          v-model.trim="modalForm.printHouseId"
-          style="width:100%;"
-          clearable
-        ></print-room-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer">
-      <el-button type="primary" :disabled="isSubmit" @click="submit"
-        >确认</el-button
-      >
-      <el-button @click="cancel">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateCampus, getCode } from "../api";
-
-const initModalForm = {
-  id: null,
-  campusName: "",
-  campusCode: "",
-  printHouseId: ""
-};
-
-export default {
-  name: "modify-campus",
-  props: {
-    instance: {
-      type: Object,
-      default() {
-        return {};
-      }
-    }
-  },
-  computed: {
-    isEdit() {
-      return !!this.instance.id;
-    },
-    title() {
-      return (this.isEdit ? "编辑" : "新增") + "校区";
-    }
-  },
-  data() {
-    return {
-      modalIsShow: false,
-      isSubmit: false,
-      modalForm: { ...initModalForm },
-      rules: {
-        campusName: [
-          {
-            required: true,
-            // pattern: /^[0-9a-zA-Z\u4E00-\u9FA5]{1,20}$/,
-            // message: "校区名称只能输入汉字、数字和字母，长度不能超过20",
-            message: "校区名称不能超过30个字",
-            max: 30,
-            trigger: "change"
-          }
-        ],
-        campusCode: [
-          {
-            required: true,
-            // pattern: /^[0-9a-zA-Z_-]{3,30}$/,
-            // message: "校区编码只能由数字字母短横线组成，长度在3-30之间",
-            message: "校区名称不能超过30个字",
-            max: 30,
-            trigger: "change"
-          }
-        ],
-        printHouseId: [
-          {
-            required: true,
-            message: "请选择要关联的印刷室",
-            trigger: "change"
-          }
-        ]
-      }
-    };
-  },
-  methods: {
-    initData(val) {
-      if (val.id) {
-        this.modalForm = this.$objAssign(initModalForm, val);
-      } else {
-        this.modalForm = { ...initModalForm };
-        this.createCode();
-      }
-    },
-    async createCode() {
-      this.modalForm.campusCode = await getCode("CAMPUS_CODE");
-    },
-    visibleChange() {
-      this.initData(this.instance);
-    },
-    cancel() {
-      this.modalIsShow = false;
-    },
-    open() {
-      this.modalIsShow = true;
-    },
-    async submit() {
-      const valid = await this.$refs.modalFormComp.validate().catch(() => {});
-      if (!valid) return;
-
-      if (this.isSubmit) return;
-      this.isSubmit = true;
-      const data = await updateCampus(this.modalForm).catch(() => {
-        this.isSubmit = false;
-      });
-
-      if (!data) return;
-
-      this.isSubmit = false;
-      this.$message.success(this.title + "成功！");
-      this.$emit("modified");
-      this.cancel();
-    }
-  }
-};
-</script>

src/modules/base/components/ModifyClazz.vue

@@ -24,13 +24,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="campusId" label="所属校区：">
-        <campus-select
-          v-model.trim="modalForm.campusId"
-          style="width:100%;"
-          clearable
-        ></campus-select>
-      </el-form-item>
       <el-form-item prop="majorId" label="所属专业：">
         <major-select
           v-model.trim="modalForm.majorId"
@@ -54,7 +47,6 @@ import { updateClazz } from "../api";
 const initModalForm = {
   id: null,
   clazzName: "",
-  campusId: "",
   majorId: ""
 };
 
@@ -94,13 +86,6 @@ export default {
             trigger: "change"
           }
         ],
-        campusId: [
-          {
-            required: true,
-            message: "请选择所属校区",
-            trigger: "change"
-          }
-        ],
         majorId: [
           {
             required: true,

src/modules/base/components/ModifyStudent.vue

@@ -39,14 +39,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="campusId" label="所属校区：">
-        <campus-select
-          v-model="modalForm.campusId"
-          placeholder="请选择所属校区"
-          style="width: 100%;"
-          @change="updateClazz"
-        ></campus-select>
-      </el-form-item>
       <el-form-item prop="collegeId" label="机构：">
         <college-select
           v-model="modalForm.collegeId"
@@ -98,7 +90,6 @@ const initModalForm = {
   studentName: "",
   studentCode: "",
   phoneNumber: "",
-  campusId: "",
   collegeId: "",
   majorId: "",
   clazzId: ""
@@ -160,13 +151,6 @@ export default {
             trigger: "change"
           }
         ],
-        campusId: [
-          {
-            required: false,
-            message: "请选择校区",
-            trigger: "change"
-          }
-        ],
         collegeId: [
           {
             required: false,
@@ -216,10 +200,9 @@ export default {
     },
     async getClazz() {
       this.clazzList = [];
-      if (!this.modalForm.campusId || !this.modalForm.majorId) return;
+      if (!this.modalForm.majorId) return;
       const res = await unitQueryByType(
         {
-          campusId: this.modalForm.campusId,
           majorId: this.modalForm.majorId
         },
         "CLAZZ"

src/modules/base/components/privilege/navs.json

@@ -832,71 +832,6 @@
         "parentId": "1",
         "sequence": 1,
         "children": [
-          {
-            "id": "357",
-            "name": "校区管理",
-            "url": "CampusManage",
-            "type": "MENU",
-            "parentId": "356",
-            "sequence": 1,
-            "children": [],
-            "buttons": [
-              {
-                "id": "372",
-                "name": "校区管理-查询",
-                "url": "Select",
-                "type": "BUTTON",
-                "parentId": "357",
-                "schoolId": "2",
-                "sequence": 1,
-                "enable": true
-              },
-              {
-                "id": "374",
-                "name": "校区管理-新增",
-                "url": "Add",
-                "type": "BUTTON",
-                "parentId": "357",
-                "schoolId": "2",
-                "sequence": 1,
-                "enable": true
-              }
-            ],
-            "links": [
-              {
-                "id": "375",
-                "name": "校区管理-编辑",
-                "url": "Edit",
-                "type": "LINK",
-                "parentId": "357",
-                "schoolId": "2",
-                "sequence": 1,
-                "enable": true
-              },
-              {
-                "id": "376",
-                "name": "校区管理-删除",
-                "url": "Delete",
-                "type": "LINK",
-                "parentId": "357",
-                "schoolId": "2",
-                "sequence": 1,
-                "enable": true
-              }
-            ],
-            "lists": [
-              {
-                "id": "373",
-                "name": "校区管理-列表",
-                "url": "List",
-                "type": "LIST",
-                "parentId": "357",
-                "schoolId": "2",
-                "sequence": 1,
-                "enable": true
-              }
-            ]
-          },
           {
             "id": "358",
             "name": "学生管理",

src/modules/base/router.js

@@ -12,7 +12,6 @@ import ApproveRecordManage from "./views/ApproveRecordManage.vue";
 import SmsManage from "./views/SmsManage.vue";
 import CardManage from "./views/CardManage.vue";
 // dict
-import CampusManage from "./views/CampusManage.vue";
 import StudentManage from "./views/StudentManage.vue";
 import CourseManage from "./views/CourseManage.vue";
 import ClazzManage from "./views/ClazzManage.vue";
@@ -84,11 +83,6 @@ export default [
     name: "CourseManage",
     component: CourseManage
   },
-  {
-    path: "/base/campus-manage",
-    name: "CampusManage",
-    component: CampusManage
-  },
   {
     path: "/base/student-manage",
     name: "StudentManage",

src/modules/base/views/CampusManage.vue

@@ -1,103 +0,0 @@
-<template>
-  <div class="campus-manage">
-    <div class="part-box part-box-filter part-box-flex">
-      <div></div>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增校区</el-button
-        >
-      </div>
-    </div>
-    <div class="part-box part-box-pad">
-      <el-table ref="TableList" :data="dataList">
-        <el-table-column
-          type="index"
-          label="序号"
-          width="70"
-          :index="indexMethod"
-        ></el-table-column>
-        <el-table-column prop="campusName" label="校区名称"></el-table-column>
-        <!-- <el-table-column prop="campusCode" label="校区编码"></el-table-column> -->
-        <el-table-column prop="printHouseName" label="印刷室"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间" width="170">
-          <span slot-scope="scope">{{
-            scope.row.createTime | timestampFilter
-          }}</span>
-        </el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="120px">
-          <template slot-scope="scope">
-            <el-button
-              v-if="checkPrivilege('link', 'edit')"
-              class="btn-primary"
-              type="text"
-              @click="toEdit(scope.row)"
-              >编辑</el-button
-            >
-            <el-button
-              v-if="checkPrivilege('link', 'delete')"
-              class="btn-danger"
-              type="text"
-              @click="toDelete(scope.row)"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <modify-campus
-      :instance="curRow"
-      @modified="getList"
-      ref="ModifyCampus"
-    ></modify-campus>
-  </div>
-</template>
-
-<script>
-import { campusQuery, deleteCampus } from "../api";
-import ModifyCampus from "../components/ModifyCampus";
-
-export default {
-  name: "campus-manage",
-  components: { ModifyCampus },
-  data() {
-    return {
-      dataList: [],
-      curRow: {}
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    async getList() {
-      if (!this.checkPrivilege("list", "list")) return;
-
-      this.dataList = await campusQuery();
-    },
-    toAdd() {
-      this.curRow = {};
-      this.$refs.ModifyCampus.open();
-    },
-    toEdit(row) {
-      this.curRow = row;
-      this.$refs.ModifyCampus.open();
-    },
-    toDelete(row) {
-      this.$confirm(`确定要删除校区【${row.campusName}】吗?`, "提示", {
-        type: "warning"
-      })
-        .then(async () => {
-          await deleteCampus(row.id);
-          this.$message.success("删除成功！");
-          this.getList();
-        })
-        .catch(() => {});
-    }
-  }
-};
-</script>

src/modules/base/views/ClazzManage.vue

@@ -56,7 +56,6 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="clazzName" label="班级名称"></el-table-column>
-        <el-table-column prop="campusName" label="所属校区"></el-table-column>
         <el-table-column prop="majorName" label="所属专业"></el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="170">
           <span slot-scope="scope">{{

src/modules/base/views/StudentManage.vue

@@ -158,7 +158,6 @@ export default {
     return {
       filter: {
         queryParams: "",
-        campusId: "",
         collegeId: "",
         majorId: "",
         clazzId: ""
@@ -203,9 +202,6 @@ export default {
       this.current = page;
       this.getList();
     },
-    campusChange() {
-      this.filter.clazzId = "";
-    },
     toAdd() {
       this.curRow = {};
       this.$refs.ModifyStudent.open();

src/modules/exam/components/CreatePrintTask.vue

@@ -58,12 +58,6 @@
           :controls="false"
         ></el-input-number>
       </el-form-item>
-      <el-form-item prop="campusId" label="校区：">
-        <campus-select
-          v-model="modalForm.campusId"
-          @change="campusChange"
-        ></campus-select>
-      </el-form-item>
       <el-form-item prop="printHouseId" label="印刷室：">
         <el-select
           v-model="modalForm.printHouseId"
@@ -197,13 +191,6 @@ export default {
             trigger: "change"
           }
         ],
-        campusId: [
-          {
-            required: true,
-            message: "请选择校区",
-            trigger: "change"
-          }
-        ],
         printHouseId: [
           {
             required: true,
@@ -287,10 +274,6 @@ export default {
       );
       this.$refs.modalFormComp.validateField("classId", () => {});
     },
-    campusChange(val) {
-      this.modalForm.printHouseId = val.printHouseId;
-      this.modalForm.printHouseName = val.printHouseName;
-    },
     printHouseChange(val) {
       const curHouse = this.printRooms.find(item => item.printHouseId === val);
       if (curHouse) {

src/plugins/globalVuePlugins.js

@@ -14,7 +14,6 @@ import PaperNumberSelect from "../components/base/PaperNumberSelect.vue";
 import QuestionTeacherSelect from "../components/base/QuestionTeacherSelect.vue";
 import QuestionTeacherUserSelect from "../components/base/QuestionTeacherUserSelect.vue";
 import SchoolSelect from "../components/base/SchoolSelect.vue";
-import CampusSelect from "../components/base/CampusSelect.vue";
 import PrintRoomSelect from "../components/base/PrintRoomSelect.vue";
 import TeachingRoomSelect from "../components/base/TeachingRoomSelect.vue";
 import FacultySelect from "../components/base/FacultySelect.vue";
@@ -38,7 +37,6 @@ const components = {
   QuestionTeacherSelect,
   QuestionTeacherUserSelect,
   SchoolSelect,
-  CampusSelect,
   PrintRoomSelect,
   TeachingRoomSelect,
   FacultySelect,