11.15

src/views/system/selfAchievement/UserAchievementForm.vue

@@ -45,12 +45,12 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="是否达到要求" porp="isGraduate">
-        <el-switch v-model="formData.isGraduate" />
+      <el-form-item label="是否达到要求" prop="isGraduate">
+        <el-switch v-model="formData.isGraduate" :active-value="0" :inactive-value="1" />
       </el-form-item>
 
       <el-form-item label="图片材料" prop="detail">
-        <UploadImg v-model="formData.detail" @change="handleIsGraduateChange" />
+        <UploadImg v-model="formData.detail" />
       </el-form-item>
 
     </el-form>
@@ -112,11 +112,6 @@ const sorts = ref([
   { label: '第二作者', value: "2" },
 ]);
 
-// 控制提交的开关
-// const canSubmit = ref(true)
-const handleIsGraduateChange = (value) => {
-  formData.isGraduate = value ? 0 : 1;
-}
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {

src/views/system/selfAchievement/index.vue

@@ -119,13 +119,20 @@
             }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+
+          <el-table-column label="是否达成毕业条件" align="center" prop="isGraduate">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isGraduate" />  
+            </template>
+          </el-table-column>
+
+      <!-- <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
         width="180px"
-      />
+      /> -->
       <el-table-column label="图片材料" align="center">
         <!-- #default获取当前·行数据 -->
         <template #default="{ row }">
@@ -167,6 +174,7 @@
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievement'

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

@@ -69,8 +69,8 @@
               @keyup.enter="handleQuery"
               class="!w-240px"
               >
-              <el-option label="未达成" :value="0" />
-              <el-option label="已达成" :value="1" />
+              <el-option label="已达成" :value="0" />
+              <el-option label="未达成" :value="1" />
               </el-select>
           </el-form-item>
           <!-- <el-form-item label="邮箱" prop="email">
@@ -177,6 +177,10 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+
+          <el-table-column label="邮箱" align="center" prop="email" width="120" />
+
+          <el-table-column label="导师姓名" align="center" prop="supervisor" width="120" />
           <!-- <el-table-column label="状态" key="status">
             <template #default="scope">
               <el-switch
@@ -318,6 +322,7 @@ const queryParams = reactive({
   deptName: undefined,
   createTime: [],
   isGraduate: undefined,
+  supervisor: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 

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

@@ -45,7 +45,7 @@
 <script setup lang="ts">
 import { UserAchievementApi, UserAchievementVO } from '@/api/system/userAchievement'
 import * as UserApi from '@/api/system/user'
-
+import { DICT_TYPE } from '@/utils/dict'
 
 /** 成果 表单 */
 defineOptions({ name: 'UserAchievementForm' })

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

@@ -136,6 +136,11 @@
             }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否达成毕业条件" align="center" prop="isGraduate">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isGraduate" />  
+            </template>
+          </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"

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

@@ -58,8 +58,8 @@
               @keyup.enter="handleQuery"
               class="!w-240px"
               >
-              <el-option label="未达成" :value="0" />
-              <el-option label="已达成" :value="1" />
+              <el-option label="已达成" :value="0" />
+              <el-option label="未达成" :value="1" />
               </el-select>
           </el-form-item>
           <!-- <el-form-item label="状态" prop="status">

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

@@ -136,6 +136,11 @@
             }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否达成毕业条件" align="center" prop="isGraduate">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isGraduate" />  
+            </template>
+          </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -190,6 +195,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' })