555

src/router/modules/remaining.ts

@@ -1,5 +1,6 @@
 import { Layout } from '@/utils/routerHelper'
 import UserAchievement from '@/views/system/workroomTeacher/userAchievement/index.vue'
+import UserAchievementcopy from '@/views/system/workroomCollege/userAchievement/index.vue'
 import deptInfo from '@/views/system/workroomCollege/deptInfo/index.vue'
 
 const { t } = useI18n()
@@ -63,6 +64,20 @@ const remainingRouter: AppRouteRecordRaw[] = [
           hidden: true
         }
       },
+      {
+        path: 'user-achievementcopy',
+        component: UserAchievementcopy,
+        name: 'UserAchievementcopy',
+        meta: {
+          title: '成果信息',
+          icon: 'ep:user-filled',
+          noCache: false,
+          affix: false,
+          breadcrumb: false,
+          noTagsView: false,
+          hidden: true
+        }
+      },
       {
         path: 'dept-info',
         component: deptInfo,

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

@@ -10,30 +10,54 @@
       <el-form-item label="学生id" prop="studentId">
         <el-input v-model="formData.studentId" placeholder="请输入学生id" />
       </el-form-item>
+      <el-form-item label="学生名称" prop="studentName">
+        <el-input v-model="formData.studentName" placeholder="请输入学生名称" />
+      </el-form-item>
+      <el-form-item label="学号" prop="userNumber">
+        <el-input v-model="formData.userNumber" placeholder="请输入学号" />
+      </el-form-item>
       <el-form-item label="工作间id" prop="deptId">
         <el-input v-model="formData.deptId" placeholder="请输入工作间id" />
       </el-form-item>
-      <el-form-item label="日期" prop="date">
+      <el-form-item label="工作间名称" prop="deptName">
+        <el-input v-model="formData.deptName" placeholder="请输入工作间名称" />
+      </el-form-item>
+      <!-- <el-form-item label="日期" prop="date">
         <el-date-picker
           v-model="formData.date"
           type="date"
           value-format="x"
           placeholder="选择日期"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="打卡时间" prop="clockInTime">
         <el-date-picker
           v-model="formData.clockInTime"
-          type="date"
+          type="datetime"
           value-format="x"
           placeholder="选择打卡时间"
         />
       </el-form-item>
-      <el-form-item label="打卡状态 0正常，1迟到、2早退、3缺勤、4请假" prop="clockInStatus">
+      <!-- <el-form-item label="打卡状态 0正常，1迟到、2早退、3缺勤、4请假" prop="clockInStatus">
         <el-radio-group v-model="formData.clockInStatus">
           <el-radio label="1">请选择字典生成</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
+      <!-- <el-form-item label="打卡状态 " prop="clockInStatus">
+        <el-select
+          v-model="formData.clockInStatus"
+          placeholder="请选择打卡状态 "
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="option in clockInStatusOptions"
+          :key="option.value"
+          :label="option.label"
+          :value="option.value"
+        />
+        </el-select>
+      </el-form-item> -->
       <el-form-item label="备注原因" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注原因" />
       </el-form-item>
@@ -60,7 +84,10 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   studentId: undefined,
+  studentName: undefined,
+  userNumber: undefined,
   deptId: undefined,
+  deptName: undefined,
   date: undefined,
   clockInTime: undefined,
   clockInStatus: undefined,
@@ -73,6 +100,11 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+// const clockInStatusOptions = [
+//   { label: '正常', value: 0 }, 
+//   { label: '未打卡', value: 1 }, 
+// ];
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -83,7 +115,11 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await StudentAttendanceApi.getStudentAttendance(id)
+      const data = await StudentAttendanceApi.getStudentAttendance(id);
+      formData.value = {
+        ...data,
+        clockInStatus: data.clockInStatus
+      };
     } finally {
       formLoading.value = false
     }
@@ -120,7 +156,10 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     studentId: undefined,
+    studentName: undefined,
+    userNumber: undefined,
     deptId: undefined,
+    deptName: undefined,
     date: undefined,
     clockInTime: undefined,
     clockInStatus: undefined,

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

@@ -199,7 +199,6 @@ const getList = async () => {
   try {
     const data = await StudentAttendanceApi.getStudentAttendancePage(queryParams)
     console.log(data, 'data');
-    
     list.value = data.list
     total.value = data.total
   } finally {

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

@@ -10,30 +10,54 @@
       <el-form-item label="学生id" prop="studentId">
         <el-input v-model="formData.studentId" placeholder="请输入学生id" />
       </el-form-item>
+      <el-form-item label="学生名称" prop="studentName">
+        <el-input v-model="formData.studentName" placeholder="请输入学生名称" />
+      </el-form-item>
+      <el-form-item label="学号" prop="userNumber">
+        <el-input v-model="formData.userNumber" placeholder="请输入学号" />
+      </el-form-item>
       <el-form-item label="工作间id" prop="deptId">
         <el-input v-model="formData.deptId" placeholder="请输入工作间id" />
       </el-form-item>
-      <el-form-item label="日期" prop="date">
+      <el-form-item label="工作间名称" prop="deptName">
+        <el-input v-model="formData.deptName" placeholder="请输入工作间名称" />
+      </el-form-item>
+      <!-- <el-form-item label="日期" prop="date">
         <el-date-picker
           v-model="formData.date"
           type="date"
           value-format="x"
           placeholder="选择日期"
         />
-      </el-form-item>
-      <el-form-item label="打卡时间" prop="clockInTime">
+      </el-form-item> -->
+      <!-- <el-form-item label="打卡时间" prop="clockInTime">
         <el-date-picker
           v-model="formData.clockInTime"
-          type="date"
+          type="datetime"
           value-format="x"
           placeholder="选择打卡时间"
         />
-      </el-form-item>
-      <el-form-item label="打卡状态 0正常，1迟到、2早退、3缺勤、4请假" prop="clockInStatus">
+      </el-form-item> -->
+      <!-- <el-form-item label="打卡状态 0正常，1迟到、2早退、3缺勤、4请假" prop="clockInStatus">
         <el-radio-group v-model="formData.clockInStatus">
           <el-radio label="1">请选择字典生成</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
+      <!-- <el-form-item label="打卡状态 " prop="clockInStatus">
+        <el-select
+          v-model="formData.clockInStatus"
+          placeholder="请选择打卡状态 "
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="option in clockInStatusOptions"
+          :key="option.value"
+          :label="option.label"
+          :value="option.value"
+        />
+        </el-select>
+      </el-form-item> -->
       <el-form-item label="备注原因" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注原因" />
       </el-form-item>
@@ -60,7 +84,10 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   studentId: undefined,
+  studentName: undefined,
+  userNumber: undefined,
   deptId: undefined,
+  deptName: undefined,
   date: undefined,
   clockInTime: undefined,
   clockInStatus: undefined,
@@ -73,6 +100,11 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+// const clockInStatusOptions = [
+//   { label: '正常', value: 0 }, 
+//   { label: '未打卡', value: 1 }, 
+// ];
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -120,7 +152,10 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     studentId: undefined,
+    studentName: undefined,
+    userNumber: undefined,
     deptId: undefined,
+    deptName: undefined,
     date: undefined,
     clockInTime: undefined,
     clockInStatus: undefined,

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

@@ -72,13 +72,13 @@
       <el-table-column label="Id" align="center" prop="id" />
 
       <el-table-column label="学生名称" align="center" prop="studentName" />
-      <el-table-column
+      <!-- <el-table-column
         label="打卡时间"
         align="center"
         prop="clockInTime"
         :formatter="dateFormatter"
         width="180px"
-      />
+      /> -->
       <el-table-column label="学号" align="center" prop="userNumber" width="150" />
       <el-table-column 
         v-if="userInfo.userType === '4'" 
@@ -192,6 +192,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await StudentAttendanceApi.getStudentAttendanceErrorPage(queryParams)
+    console.log(data, 'data');
     list.value = data.list
     total.value = data.total
   } finally {

src/views/system/workroomCollege/dept/DeptForm.vue

@@ -50,10 +50,10 @@
           />
         </el-select> -->
       </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
+      <el-form-item label="联系电话" prop="phone" v-if="formType === 'create'">
         <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
       </el-form-item>
-      <el-form-item label="邮箱" prop="email">
+      <el-form-item label="邮箱" prop="email" v-if="formType === 'create'">
         <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
       </el-form-item>
       <!-- <el-form-item label="状态" prop="status">
@@ -66,6 +66,14 @@
           />
         </el-select>
       </el-form-item> -->
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="formData.createTime"
+          type="datetime"
+          value-format="x"
+          placeholder="选择打卡时间"
+        />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -99,7 +107,8 @@ const formData = ref({
   leaderUserId: [],
   phone: undefined,
   email: undefined,
-  status: CommonStatusEnum.ENABLE
+  status: CommonStatusEnum.ENABLE,
+  createTime: undefined
 })
 const formRules = reactive<FormRules>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -192,7 +201,8 @@ const resetForm = () => {
     leaderUserId: [],
     phone: undefined,
     email: undefined,
-    status: CommonStatusEnum.ENABLE
+    status: CommonStatusEnum.ENABLE,
+    createTime: undefined
   }
   formRef.value?.resetFields()
 }

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

@@ -50,7 +50,7 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="状态" prop="status">
+      <!-- <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="请选择工作间状态"
@@ -64,7 +64,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -104,11 +104,11 @@
         </template>
       </el-table-column>
       <!-- <el-table-column prop="sort" label="排序" /> -->
-      <el-table-column prop="status" label="状态" align="center">
+      <!-- <el-table-column prop="status" label="状态" align="center">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="创建时间"
         align="center"

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

@@ -116,7 +116,7 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="是否毕业" >
+          <el-form-item label="毕业条件" >
             <el-select 
               v-model="formData.isGraduate" 
               prop="isGraduate" 

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

@@ -268,7 +268,7 @@ const getList = async () => {
 
 const router = useRouter()
 const openUserAchievement = (id) => {
-  router.push({ name: 'UserAchievement', query: { id: id} });
+  router.push({ name: 'UserAchievementcopy', query: { id: id} });
 }
 
 

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

@@ -256,7 +256,7 @@ const getList = async () => {
 
 const router = useRouter()
 const openUserAchievement = (id) => {
-  router.push({ name: 'UserAchievement', query: { id: id} });
+  router.push({ name: 'UserAchievementcopy', query: { id: id} });
 }
 
 /** 搜索按钮操作 */

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

@@ -7,7 +7,7 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="用户名称" prop="userName">
+      <!-- <el-form-item label="用户名称" prop="userName">
         <el-select v-model="formData.userName" placeholder="请输入用户名称" @change="handleUserChange" filterable>
           <el-option
             v-for="user in users"
@@ -15,10 +15,10 @@
             :label="user.nickname"
             :value="user.nickname"
           />
-           <!-- 隐藏的输入框用于存储 userId -->
+           隐藏的输入框用于存储 userId
           <el-input type="hidden" v-model="formData.userId" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="成果名称" prop="achievementName">
         <el-input v-model="formData.achievementName" placeholder="请输入成果名称" />
       </el-form-item>

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

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-          <el-form-item label="用户名称" prop="userName">
+          <!-- <el-form-item label="用户名称" prop="userName">
         <el-select
           v-model="queryParams.userName"
           placeholder="请选择用户名称"
@@ -23,7 +23,7 @@
             :value="user.nickname"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="成果名称" prop="achievementName">
         <el-input

src/views/system/workroomCollege/userAchievementcopy/UserAchievementForm.vue

@@ -0,0 +1,149 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <!-- <el-form-item label="用户名称" prop="userName">
+        <el-select v-model="formData.userName" placeholder="请输入用户名称" @change="handleUserChange" filterable>
+          <el-option
+            v-for="user in users"
+            :key="user.id"
+            :label="user.nickname"
+            :value="user.nickname"
+          />
+           隐藏的输入框用于存储 userId
+          <el-input type="hidden" v-model="formData.userId" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="成果名称" prop="achievementName">
+        <el-input v-model="formData.achievementName" placeholder="请输入成果名称" />
+      </el-form-item>
+      <el-form-item label="成果类型" prop="achievementType">
+        <el-select v-model="formData.achievementType" placeholder="请选择成果类型">
+          <el-option :label="'论文'" :value="1" />
+          <el-option :label="'专利'" :value="2" />
+          <el-option :label="'著作'" :value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="图片材料" prop="detail">
+        <UploadImg v-model="formData.detail" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievement'
+import * as UserApi from '@/api/system/user'
+
+
+/** 成果 表单 */
+defineOptions({ name: 'UserAchievementForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  achievementName: undefined,
+  achievementType: undefined,
+  userName: undefined,
+  detail: undefined,
+})
+const formRules = reactive({
+  userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
+  achievementName: [{ required: true, message: '成果名称不能为空', trigger: 'blur' }],
+  achievementType: [{ required: true, message: '成果类型不能为空', trigger: 'change' }],
+  userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 获取用户列表 */
+// const users = ref();
+// const getDeptUser = async () => {
+//     try {
+//         const response = await UserApi.getDeptUser();
+//         console.log(response);
+//         users.value = response;
+//     } catch (error) {
+//         console.error("Error fetching user data:", error);
+//     }
+// };
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await UserAchievementApi.getUserAchievement(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 用户id更新 */
+// const handleUserChange = (selectedNickname: string) => {
+//   const selectedUser = users.value.find((user: any) => user.nickname === selectedNickname);
+//   formData.value.userId = selectedUser? selectedUser.id : undefined;
+// };
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as UserAchievementVO
+    if (formType.value === 'create') {
+      await UserAchievementApi.createUserAchievement(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await UserAchievementApi.updateUserAchievement(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    userId: undefined,
+    achievementName: undefined,
+    achievementType: undefined,
+    userName: undefined,
+    detail: undefined,
+  }
+  formRef.value?.resetFields()
+}
+
+onMounted(() => {
+  // getDeptUser();
+})
+</script>

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

@@ -0,0 +1,260 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <!-- <el-form-item label="用户名称" prop="userName">
+        <el-select
+          v-model="queryParams.userName"
+          placeholder="请选择用户名称"
+          clearable
+          filterable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="user in users"
+            :key="user.id"
+            :label="user.nickname"
+            :value="user.nickname"
+          />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          clearable
+          disabled
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+
+      <el-form-item label="成果名称" prop="achievementName">
+        <el-input
+          v-model="queryParams.achievementName"
+          placeholder="请输入成果名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="成果类型" prop="achievementType">
+        <el-select
+          v-model="queryParams.achievementType"
+          placeholder="请选择成果类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option :label="'论文'" :value="1" />
+          <el-option :label="'专利'" :value="2" />
+          <el-option :label="'著作'" :value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['system:user-achievement:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:user-achievement:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="Id" align="center" prop="id" />
+      <el-table-column label="用户 Id" align="center" prop="userId" v-if="false" />
+      <el-table-column label="用户名称" align="center" prop="userName" />
+      <el-table-column label="成果名称" align="center" prop="achievementName" />
+      <el-table-column label="成果类型" align="center" prop="achievementType">
+        <template #default="rowData">
+          <span>
+            {{
+              rowData.row.achievementType == 1
+               ? '论文'
+                : rowData.row.achievementType ==2
+               ? '专利'
+                : rowData.row.achievementType == 3
+               ? '著作'
+                : '未知类型'
+            }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="照片详情 url" align="center">
+        <!-- #default获取当前·行数据 -->
+        <template #default="{ row }">
+          <a :href="row.detail" target="_blank" v-if="row.detail">{{ row.detail }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="rowData">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', rowData.row.id)"
+            v-hasPermi="['system:user-achievement:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(rowData.row.id)"
+            v-hasPermi="['system:user-achievement:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UserAchievementForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievement'
+import UserAchievementForm from './UserAchievementForm.vue'
+import * as UserApi from '@/api/system/user'
+import { useRoute } from 'vue-router'
+
+/** 成果 列表 */
+defineOptions({ name: 'UserAchievement' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute()
+const userId = ref(route.query.id);
+
+const loading = ref(true) // 列表的加载中
+const list = ref<UserAchievementVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: userId.value,
+  achievementName: undefined,
+  achievementType: undefined,
+  userName: undefined,
+  createTime: [],
+  detail: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+const users = ref()
+const getDeptUser = async () => {
+  try {
+    const response = await UserApi.getDeptUser()
+    console.log(response,'567');
+    users.value = response
+  } catch (error) {
+    console.error('Error fetching user data:', error)
+  }
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    queryParams.userId = userId.value;
+    const data = await UserAchievementApi.getUserAchievementPage(queryParams)
+    console.log(data,'890');
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await UserAchievementApi.deleteUserAchievement(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await UserAchievementApi.exportUserAchievement(queryParams)
+    download.excel(data, '成果.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+
+onMounted( () => {
+  getList()
+  getDeptUser()
+})
+</script>

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

@@ -116,7 +116,7 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="是否毕业" >
+          <el-form-item label="毕业条件" >
             <el-select 
               v-model="formData.isGraduate" 
               prop="isGraduate" 

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

@@ -7,7 +7,7 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="用户名称" prop="userName">
+      <!-- <el-form-item label="用户名称" prop="userName">
         <el-select v-model="formData.userName" placeholder="请输入用户名称" @change="handleUserChange" filterable>
           <el-option
             v-for="user in users"
@@ -15,10 +15,10 @@
             :label="user.nickname"
             :value="user.nickname"
           />
-           <!-- 隐藏的输入框用于存储 userId -->
+           隐藏的输入框用于存储 userId
           <el-input type="hidden" v-model="formData.userId" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="成果名称" prop="achievementName">
         <el-input v-model="formData.achievementName" placeholder="请输入成果名称" />
       </el-form-item>

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

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="用户名称" prop="userName">
+      <!-- <el-form-item label="用户名称" prop="userName">
         <el-select
           v-model="queryParams.userName"
           placeholder="请选择用户名称"
@@ -23,7 +23,16 @@
             :value="user.nickname"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
+      <!-- <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          clearable
+          disabled
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
 
       <el-form-item label="成果名称" prop="achievementName">
         <el-input
@@ -188,7 +197,6 @@ const getDeptUser = async () => {
   try {
     const response = await UserApi.getDeptUser()
     console.log(response,'567');
-    
     users.value = response
   } catch (error) {
     console.error('Error fetching user data:', error)