555

src/views/system/graduateStudent/index.vue

@@ -408,8 +408,10 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
 
 

src/views/system/selfAchievement/index.vue

@@ -44,6 +44,17 @@
           <el-option :label="'第二作者'" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="毕业条件" prop='isGraduate'>
+            <el-select 
+              v-model="queryParams.isGraduate" 
+              placeholder="是否达成毕业条件"  
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+              >
+              <el-option label="已达成" :value="0" />
+              <el-option label="未达成" :value="1" />
+              </el-select>
+          </el-form-item>
       <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -199,6 +210,8 @@ const queryParams = reactive({
   userName: undefined,
   createTime: [],
   detail: undefined,
+  isGraduate: undefined,
+  
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中

src/views/system/studentAttendanceManage/studentAttendance/index.vue

@@ -26,7 +26,7 @@
           class="!w-240px"
         />
       </el-form-item> 
-      <el-form-item label="导师姓名" prop="supervisor">
+      <el-form-item label="导师姓名" prop="supervisor" v-if="userInfo.userType !== '3'">
         <el-select
               v-model="queryParams.supervisor"
               @change="handleSupervisorChange"
@@ -98,7 +98,7 @@
       <!-- <el-table-column label="工作间id" align="center" prop="deptId" /> -->
       <!-- <el-table-column label="日期" align="center" prop="date" /> -->
       <el-table-column label="学号" align="center" prop="userNumber"  />
-      <el-table-column label="导师姓名" align="center" prop="supervisor" />
+      <el-table-column label="导师姓名" align="center" prop="supervisor" v-if="userInfo.userType !== '3'"/>
       <el-table-column
         v-if="userInfo.userType === '4'"
         label="工作间名称"
@@ -280,8 +280,10 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
 
 /** 添加/修改操作 */

src/views/system/studentAttendanceManage/studentAttendanceError/index.vue

@@ -35,7 +35,7 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="导师姓名" prop="supervisor">
+        <el-form-item label="导师姓名" prop="supervisor" v-if="userInfo.userType !== '3'">
           <el-select
               v-model="queryParams.supervisor"
               @change="handleSupervisorChange"
@@ -121,7 +121,7 @@
       </el-table-column>
       <el-table-column label="姓名" align="center" prop="studentName" />
       <el-table-column label="学号" align="center" prop="userNumber"  />
-      <el-table-column label="导师姓名" align="center" prop="supervisor" />
+      <el-table-column label="导师姓名" align="center" prop="supervisor" v-if="userInfo.userType !== '3'"/>
       <el-table-column
         v-if="userInfo.userType === '4'"
         label="工作间名称"
@@ -275,8 +275,10 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
 
 /** 添加/修改操作 */

src/views/system/studentAttendanceManage/studentAttendanceExcused/index.vue

@@ -35,7 +35,7 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="导师姓名" prop="supervisor">
+        <el-form-item label="导师姓名" prop="supervisor" v-if="userInfo.userType !== '3'">
           <el-select
               v-model="queryParams.supervisor"
               @change="handleSupervisorChange"
@@ -121,7 +121,7 @@
       </el-table-column>
       <el-table-column label="姓名" align="center" prop="studentName" />
       <el-table-column label="学号" align="center" prop="userNumber"  />
-      <el-table-column label="导师姓名" align="center" prop="supervisor" />
+      <el-table-column label="导师姓名" align="center" prop="supervisor" v-if="userInfo.userType !== '3'"/>
       <el-table-column
         v-if="userInfo.userType === '4'"
         label="工作间名称"
@@ -275,8 +275,10 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
 
 /** 添加/修改操作 */

src/views/system/studentAttendanceManage/studentFaceManage/index.vue

@@ -26,7 +26,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="导师姓名" prop="supervisor">
+      <el-form-item label="导师姓名" prop="supervisor" v-if="userInfo.userType !== '3'">
         <el-select
               v-model="queryParams.supervisor"
               @change="handleSupervisorChange"
@@ -112,7 +112,7 @@
       <el-table-column label="Id" align="center" prop="id" />
       <el-table-column label="姓名" align="center" prop="nickname" />
       <el-table-column label="学号" align="center" prop="userNumber" width="150" />
-      <el-table-column label="导师姓名" align="center" prop="supervisor" />
+      <el-table-column label="导师姓名" align="center" prop="supervisor" v-if="userInfo.userType !== '3'"/>
       <el-table-column 
         v-if="userInfo.userType === '4'" 
         label="工作间名称" 
@@ -121,7 +121,7 @@
         width="100"
       />
       <el-table-column
-        label="导入时间"
+        label="更新时间"
         align="center"
         prop="photoUpdateTime"
         :formatter="dateFormatter"
@@ -292,10 +292,11 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
-
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {

src/views/system/workroomCollege/user/student.vue

@@ -44,24 +44,41 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptName" v-if="userInfo.userType === '4'">
+          <el-form-item label="手机号码" prop="mobile">
             <el-input
-              v-model="queryParams.deptName"
-              placeholder="请输入工作间"
+              v-model="queryParams.mobile"
+              placeholder="请输入手机号码"
               clearable
               @keyup.enter="handleQuery"
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="手机号码" prop="mobile">
+           <el-form-item label="邮箱" prop="email">
             <el-input
-              v-model="queryParams.mobile"
-              placeholder="请输入手机号码"
+              v-model="queryParams.email"
+              placeholder="请输入邮箱"
               clearable
               @keyup.enter="handleQuery"
               class="!w-240px"
             />
           </el-form-item>
+          <el-form-item label="导师姓名" prop="supervisor">
+          <el-select
+              v-model="queryParams.supervisor"
+              @change="handleSupervisorChange"
+              placeholder="请选择导师"
+              clearable
+              filterable
+              class="!w-240px"
+            >
+              <el-option
+                v-for="user in users"
+                :key="user.id"
+                :label="user.nickname"
+                :value="user.id"
+              />
+            </el-select>
+      </el-form-item>
           <el-form-item label="毕业条件" prop='isGraduate'>
             <el-select 
               v-model="queryParams.isGraduate" 
@@ -73,15 +90,7 @@
               <el-option label="未达成" :value="1" />
               </el-select>
           </el-form-item>
-          <!-- <el-form-item label="邮箱" prop="email">
-            <el-input
-              v-model="queryParams.email"
-              placeholder="请输入邮箱"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-240px"
-            />
-          </el-form-item> -->
+         
           <!-- <el-form-item label="状态" prop="status">
             <el-select
               v-model="queryParams.status"
@@ -323,6 +332,7 @@ const queryParams = reactive({
   createTime: [],
   isGraduate: undefined,
   supervisor: undefined,
+  supervisorId: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -343,6 +353,27 @@ const openUserAchievement = (id) => {
   router.push({ name: 'UserAchievementcopy', query: { id: id} });
 }
 
+//获取所有导师
+const users = ref()
+const getSupervisor= async () => {
+  try {
+    const response = await UserApi.getSupervisor()
+    console.log(response, '所有导师');
+    users.value = response
+  } catch (error) {
+    console.error('Error fetching user data:', error)
+  }
+}
+//传supervisorId给queryParams
+const handleSupervisorChange = (value: number) => {
+  const selectedUser = users.value.find(user => user.id === value);
+  if (selectedUser) {
+    queryParams.supervisorId = selectedUser.id;
+    handleQuery();
+    // queryParams.supervisor = selectedUser.nickname;
+  }
+}
+
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -352,8 +383,10 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields()
-  handleQuery()
+  queryFormRef.value.resetFields();
+  queryParams.supervisor = undefined; // 手动重置导师
+  queryParams.supervisorId = undefined; // 手动重置导师ID
+  handleQuery();
 }
 
 /** 处理部门被点击 */
@@ -468,5 +501,6 @@ const handleRole = (row: UserApi.UserVO) => {
 onMounted(() => {
   getUserInfo()
   getList()
+  getSupervisor()
 })
 </script>

src/views/system/workroomCollege/user/teacher.vue

@@ -44,7 +44,7 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptName" v-if="userInfo.userType === '4'">
+          <!-- <el-form-item label="工作间" prop="deptName" v-if="userInfo.userType === '4'">
             <el-input
               v-model="queryParams.deptName"
               placeholder="请输入工作间"
@@ -52,7 +52,7 @@
               @keyup.enter="handleQuery"
               class="!w-240px"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"

src/views/system/workroomCollege/userAchievement/index.vue

@@ -60,6 +60,17 @@
           <el-option :label="'第二作者'" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="毕业条件" prop='isGraduate'>
+            <el-select 
+              v-model="queryParams.isGraduate" 
+              placeholder="是否达成毕业条件"  
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+              >
+              <el-option label="已达成" :value="0" />
+              <el-option label="未达成" :value="1" />
+              </el-select>
+          </el-form-item>
       <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -195,6 +206,7 @@ import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievem
 import UserAchievementForm from './UserAchievementForm.vue'
 import * as UserApi from '@/api/system/user'
 import { useRoute } from 'vue-router'
+import { DICT_TYPE } from '@/utils/dict'
 
 /** 成果 列表 */
 defineOptions({ name: 'UserAchievement' })
@@ -218,6 +230,7 @@ const queryParams = reactive({
   createTime: [],
   detail: undefined,
   sort: undefined,
+  isGraduate: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中

src/views/system/workroomTeacher/user/student.vue

@@ -39,9 +39,9 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptName">
+          <!-- <el-form-item label="工作间" prop="deptName">
             <el-input v-model="queryParams.deptName" placeholder="请输入工作间" clearable @keyup.enter="handleQuery" class="!w-240px" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
@@ -141,13 +141,13 @@
             prop="userNumber"
             :show-overflow-tooltip="true"
           />
-          <el-table-column
+          <!-- <el-table-column
             label="工作间"
             align="center"
             key="deptName"
             prop="deptName"
             :show-overflow-tooltip="true"
-          />
+          /> -->
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
           <!-- <el-table-column label="状态" key="status"  align="center" width="90">
             <template #default="scope">

src/views/system/workroomTeacher/userAchievement/index.vue

@@ -60,6 +60,17 @@
           <el-option :label="'第二作者'" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="毕业条件" prop='isGraduate'>
+            <el-select 
+              v-model="queryParams.isGraduate" 
+              placeholder="是否达成毕业条件"  
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+              >
+              <el-option label="已达成" :value="0" />
+              <el-option label="未达成" :value="1" />
+              </el-select>
+          </el-form-item>
       <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -219,6 +230,7 @@ const queryParams = reactive({
   createTime: [],
   detail: undefined,
   sort: undefined,
+  isGraduate: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中