机构选择框调整

src/components/base/OrgSelect.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="org-select el-select major-select el-select--small"
-    @click="handleOpen"
+    @click="switchOpen"
   >
     <div v-if="multiple" class="el-select__tags">
       <el-tag v-for="item in selectedList" :key="item.id">{{

src/modules/base/components/ModifyCourse.vue

@@ -32,11 +32,11 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="teachingRoomId" label="所属机构：">
-        <teaching-room-select
-          v-model.trim="modalForm.teachingRoomId"
+        <org-select
+          v-model="modalForm.teachingRoomId"
           style="width:100%;"
-          clearable
-        ></teaching-room-select>
+          placeholder="所属机构"
+        ></org-select>
       </el-form-item>
       <el-form-item label="授课班级：">
         <clazz-select

src/modules/base/components/ModifyMajor.vue

@@ -25,12 +25,11 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="collegeId" label="所属机构：">
-        <college-select
+        <org-select
           v-model="modalForm.collegeId"
-          placeholder="请选择所属机构"
-          clearable
-          style="width: 100%"
-        ></college-select>
+          style="width:100%;"
+          placeholder="所属机构"
+        ></org-select>
       </el-form-item>
     </el-form>
     <div slot="footer">

src/modules/base/components/ModifyStudent.vue

@@ -40,11 +40,11 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="collegeId" label="机构：">
-        <college-select
+        <org-select
           v-model="modalForm.collegeId"
-          placeholder="请选择机构"
-          style="width: 100%;"
-        ></college-select>
+          style="width:100%;"
+          placeholder="机构"
+        ></org-select>
       </el-form-item>
       <el-form-item prop="majorId" label="专业：">
         <major-select

src/modules/base/components/SelectClassStudent.vue

@@ -2,12 +2,12 @@
   <div class="select-class-student">
     <el-form ref="FilterForm" label-position="left" inline label-width="0px">
       <el-form-item>
-        <college-select
+        <org-select
           v-model="filter.collegeId"
           class="width-200"
           placeholder="机构"
           @change="collegeChange"
-        ></college-select>
+        ></org-select>
       </el-form-item>
       <el-form-item>
         <major-select

src/modules/base/views/ApproveRecordManage.vue

@@ -19,11 +19,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="机构：">
-            <teaching-room-select
-              v-model="filter.teachingRoomId"
+            <org-select
+              v-model="modalForm.teachingRoomId"
+              style="width:100%;"
               placeholder="所属机构"
-              clearable
-            ></teaching-room-select>
+            ></org-select>
           </el-form-item>
           <el-form-item label="提交人：">
             <el-input

src/modules/base/views/CourseManage.vue

@@ -4,11 +4,10 @@
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="机构：">
-            <teaching-room-select
+            <org-select
               v-model="filter.belongOrgId"
               placeholder="机构"
-              clearable
-            ></teaching-room-select>
+            ></org-select>
           </el-form-item>
           <el-form-item label="课程名称：">
             <el-input

src/modules/base/views/StudentManage.vue

@@ -11,10 +11,6 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="机构：">
-          <!-- <college-select
-            v-model="filter.collegeId"
-            placeholder="机构"
-          ></college-select> -->
           <org-select v-model="filter.collegeId"></org-select>
         </el-form-item>
         <el-form-item label="专业：">

src/modules/base/views/UserManage.vue

@@ -3,10 +3,15 @@
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <!-- TODO:新增机构查询 -->
+          <el-form-item label="所在机构：">
+            <org-select
+              v-model="filter.orgId"
+              placeholder="所在机构"
+            ></org-select>
+          </el-form-item>
           <el-form-item label="关键词：" label-width="75px">
             <el-input
-              style="width: 142px;"
+              style="width: 180px;"
               v-model.trim="filter.userInfo"
               placeholder="用户名/姓名/手机号"
               clearable

src/modules/exam/api.js

@@ -242,7 +242,7 @@ export const taskResetPdf = id => {
   return $postParam("/api/admin/data/task/reset_create_pdf", { id });
 };
 export const removeDataTask = ({ ids, type }) => {
-  // TODO:
+  // TODO:可能不会用了，保留到下一个版本
   return $post("/api/admin/data/task/query11", { ids, type });
 };
 

src/modules/exam/components/CreateTaskApply.vue

@@ -38,11 +38,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="teachingRoomId" label="机构：">
-              <teaching-room-select
+              <org-select
                 v-model="examTask.teachingRoomId"
                 class="width-full"
+                placeholder="机构"
                 @change="teachingRoomChange"
-              ></teaching-room-select>
+              ></org-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -30,11 +30,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="teachingRoomId" label="部门：">
-              <teaching-room-select
+              <org-select
                 v-model="examTask.teachingRoomId"
                 class="width-full"
                 @change="teachingRoomChange"
-              ></teaching-room-select>
+              ></org-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/modules/exam/views/DownloadManage.vue

@@ -12,13 +12,8 @@
               :semester-id="filter.semesterId"
             ></exam-select>
           </el-form-item>
-          <el-form-item label="学院：">
-            <college-select
-              v-model="filter.orgId"
-              :semester-id="filter.semesterId"
-              cascader
-              placeholder="机构"
-            ></college-select>
+          <el-form-item label="机构：">
+            <org-select v-model="filter.orgId" placeholder="机构"></org-select>
           </el-form-item>
           <el-form-item label="课程名称：">
             <el-input

src/modules/print/views/BusinessDataExport.vue

@@ -264,7 +264,6 @@ export default {
       createTime: [],
       pickerOptions,
       // import
-      // TODO:
       uploadUrl: "/api/admin/exam/print/data_import",
       uploadData: {
         type: "FILE",