学员、教师查询条件完善

RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTeacherMapper.xml

@@ -43,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tPhone != null  and tPhone != ''"> and t_phone like concat('%', #{tPhone}, '%')</if>
             <if test="tEmail != null  and tEmail != ''"> and t_email = #{tEmail}</if>
             <if test="status != null"> and status = #{status}</if>
+            <if test="major != null and major != ''"> and major like concat('%', #{major}, '%')</if>
+            <if test="courses != null and courses != ''"> and courses like concat('%', #{courses}, '%')</if>
         </where>
         order by create_time desc
     </select>

build_ui/src/views/train/student/index.vue

@@ -16,13 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="所属单位" prop="orgName">
-        <el-input
+      <el-form-item label="所属部门" prop="orgName">
+<!--        <el-input
           v-model="queryParams.orgName"
           placeholder="请输入所属单位"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        />-->
+        <treeselect style="width: 210px;" v-model="queryParams.orgName" :options="deptOptions" :normalizer="normalizer" :show-count="true" placeholder="请选择归属部门" />
       </el-form-item>
       <el-form-item label="联系电话" prop="sPhone">
         <el-input

build_ui/src/views/train/teacher/index.vue

@@ -10,12 +10,13 @@
         />
       </el-form-item>
       <el-form-item label="所属单位" prop="orgName">
-        <el-input
+<!--        <el-input
           v-model="queryParams.orgName"
           placeholder="请输入所属单位"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        />-->
+        <treeselect style="width: 210px;" v-model="queryParams.orgName" :options="deptOptions" :normalizer="normalizer" :show-count="true" placeholder="请选择归属部门" />
       </el-form-item>
       <el-form-item label="职务职称" prop="jobTitle">
         <el-input
@@ -25,14 +26,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系电话" prop="tPhone">
+      <el-form-item label="专业方向" prop="major">
+        <el-input
+          v-model="queryParams.major"
+          placeholder="请输入专业方向"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主讲课程" prop="courses">
+        <el-input
+          v-model="queryParams.courses"
+          placeholder="请输入主讲课程"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="联系电话" prop="tPhone">
         <el-input
           v-model="queryParams.tPhone"
           placeholder="请输入联系电话"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="教师状态" clearable>
           <el-option label="正常" :value="1" />
@@ -92,14 +109,15 @@
           <span>{{ formatGender(scope.row.tGender) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="出生日期" align="center" prop="tBirth" width="120">
+<!--      <el-table-column label="出生日期" align="center" prop="tBirth" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.tBirth, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="所属单位" align="center" prop="orgName" :show-overflow-tooltip="true" />
       <el-table-column label="职务/职称" align="center" prop="jobTitle" :show-overflow-tooltip="true" />
       <el-table-column label="专业方向" align="center" prop="major" :show-overflow-tooltip="true" />
+      <el-table-column label="主讲课程" align="center" prop="courses" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="联系电话" align="center" prop="tPhone" width="130" />
       <el-table-column label="邮箱" align="center" prop="tEmail" :show-overflow-tooltip="true" />-->
       <el-table-column label="状态" align="center" prop="status" width="90">