From 0541d465990ea9d40b6722a612bdc14d346e6e5f Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 30 May 2024 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E8=81=8C=E5=B7=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/teacher/index.ts          | 12 ++++-----
 src/views/basic/teacher/index.vue | 43 +++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/api/teacher/index.ts b/src/api/teacher/index.ts
index 81db9f9..f5a8648 100644
--- a/src/api/teacher/index.ts
+++ b/src/api/teacher/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { TeacherVO, TeacherForm, TeacherQuery } from '@/api/file/teacher/types';
+import { TeacherVO, TeacherForm, TeacherQuery } from '@/api/teacher/types';
 
 /**
  * 查询教职工信息列表
@@ -10,7 +10,7 @@ import { TeacherVO, TeacherForm, TeacherQuery } from '@/api/file/teacher/types';
 
 export const listTeacher = (query?: TeacherQuery): AxiosPromise<TeacherVO[]> => {
   return request({
-    url: '/file/teacher/list',
+    url: '/teacher/pageList',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listTeacher = (query?: TeacherQuery): AxiosPromise<TeacherVO[]> =>
  */
 export const getTeacher = (teacherId: string | number): AxiosPromise<TeacherVO> => {
   return request({
-    url: '/file/teacher/' + teacherId,
+    url: '/teacher/' + teacherId,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getTeacher = (teacherId: string | number): AxiosPromise<TeacherVO>
  */
 export const addTeacher = (data: TeacherForm) => {
   return request({
-    url: '/file/teacher',
+    url: '/teacher',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addTeacher = (data: TeacherForm) => {
  */
 export const updateTeacher = (data: TeacherForm) => {
   return request({
-    url: '/file/teacher',
+    url: '/teacher',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateTeacher = (data: TeacherForm) => {
  */
 export const delTeacher = (teacherId: string | number | Array<string | number>) => {
   return request({
-    url: '/file/teacher/' + teacherId,
+    url: '/teacher/' + teacherId,
     method: 'delete'
   });
 };
diff --git a/src/views/basic/teacher/index.vue b/src/views/basic/teacher/index.vue
index 5432c52..1dfe339 100644
--- a/src/views/basic/teacher/index.vue
+++ b/src/views/basic/teacher/index.vue
@@ -33,19 +33,19 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['system:user:add']">新增</el-button>
+              v-hasPermi="['school:teacher:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              v-hasPermi="['system:user:edit']">修改</el-button>
+              v-hasPermi="['school:teacher:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['system:user:remove']">删除</el-button>
+              v-hasPermi="['school:teacher:remove']">删除</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Upload" @click="handleExport"
-              v-hasPermi="['system:user:export']">导入人员</el-button>
+              v-hasPermi="['school:teacher:export']">导入人员</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -62,11 +62,11 @@
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']">修改</el-button>
+                v-hasPermi="['school:teacher:edit']">修改</el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']">删除</el-button>
+                v-hasPermi="['school:teacher:remove']">删除</el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -95,13 +95,16 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="性别" prop="sex">
-              <el-input v-model="form.sex" placeholder="请输入性别" />
+              <el-select v-model="form.sex" placeholder="请选择性别">
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="出生日期" prop="birthday">
-              <el-date-picker clearable v-model="form.birthday" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择出生日期" style="width: 100%;">
+              <el-date-picker clearable v-model="form.birthday" type="datetime" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" placeholder="请选择出生日期" style="width: 100%;">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -109,12 +112,18 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="学历" prop="educationCode">
-              <el-input v-model="form.educationCode" placeholder="请输入学历" />
+              <el-select v-model="form.educationCode" placeholder="请选择学历">
+                <el-option v-for="dict in sys_education" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="学位" prop="degreeCode">
-              <el-input v-model="form.degreeCode" placeholder="请输入学位" />
+              <el-select v-model="form.degreeCode" placeholder="请选择学位">
+                <el-option v-for="dict in sys_degree" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -133,12 +142,18 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="职务" prop="post">
-              <el-input v-model="form.post" placeholder="请输入职务" />
+              <el-select v-model="form.post" placeholder="请选择职务">
+                <el-option v-for="dict in sys_post" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="学科" prop="subjectCode">
-              <el-input v-model="form.subjectCode" placeholder="请输入学科" />
+              <el-select v-model="form.subjectCode" placeholder="请选择学科">
+                <el-option v-for="dict in sys_subject" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -169,6 +184,8 @@ import { DeptVO } from '@/api/system/dept/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const { sys_user_sex, sys_post, sys_subject, sys_education, sys_degree } = toRefs<any>(proxy?.useDict('sys_user_sex', 'sys_post', 'sys_subject', 'sys_education', 'sys_degree'));
+
 const teacherList = ref<TeacherVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);