555

src/api/system/userAchievement/index.ts

@@ -7,7 +7,7 @@ export interface UserAchievementVO {
   achievementName: string // 成果名称
   achievementType: string // 1论文，2专利，3著作
   userName: string // 用户名称
-  detail: string // 照片详情url
+  detail: string // 图片材料
 }
 
 // 成果 API

src/views/system/selfAchievement/UserAchievementForm.vue

@@ -23,7 +23,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="照片详情url" prop="detail">
+      <el-form-item label="图片材料" prop="detail">
         <UploadImg v-model="formData.detail" />
       </el-form-item>
     </el-form>

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

@@ -6,7 +6,7 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="照片详情url" prop="photoUrl">
+      <el-form-item label="图片材料" prop="photoUrl">
         <UploadImg v-model="formData.photoUrl" />
       </el-form-item>
     </el-form>

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

@@ -21,9 +21,9 @@
       <el-form-item label="工作间名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入工作间名称" />
       </el-form-item>
-      <el-form-item label="显示排序" prop="sort">
+      <!-- <el-form-item label="显示排序" prop="sort">
         <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="负责人" prop="leaderUserId">
         <el-select
           v-model="formData.leaderUserId"
@@ -56,7 +56,7 @@
       <el-form-item label="邮箱" prop="email">
         <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -65,7 +65,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -95,7 +95,7 @@ const formData = ref({
   title: '',
   parentId: undefined,
   name: undefined,
-  sort: undefined,
+  // sort: undefined,
   leaderUserId: [],
   phone: undefined,
   email: undefined,
@@ -104,7 +104,7 @@ const formData = ref({
 const formRules = reactive<FormRules>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '工作间名称不能为空', trigger: 'blur' }],
-  sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  // sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
   leaderUserId: [{ required: true, message: '负责人不能为空', trigger: 'change' }],
   email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [
@@ -144,6 +144,7 @@ const getSupervisor= async () => {
   try {
     const response = await UserApi.getSupervisor()
     users.value = response
+    console.log(response)
   } catch (error) {
     console.error('Error fetching user data:', error)
   }
@@ -187,7 +188,7 @@ const resetForm = () => {
     title: '',
     parentId: undefined,
     name: undefined,
-    sort: undefined,
+    // sort: undefined,
     leaderUserId: [],
     phone: undefined,
     email: undefined,

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

@@ -68,17 +68,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <!-- <el-form-item label="岗位">
-            <el-select v-model="formData.postIds" multiple placeholder="请选择">
-              <el-option
-                v-for="item in postList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id!"
-              />
-            </el-select>
-          </el-form-item> -->
+        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
           <el-form-item label="用户类型" prop="userType">
             <el-select v-model="formData.userType" placeholder="请选择用户类型">
               <el-option
@@ -90,11 +80,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row v-if="formType === 'update'">
-        <el-col :span="12">
-          <el-form-item label="学生类型" prop="userType">
+        <el-col :span="12" v-if="formType === 'create-T' || formType === 'update-T'">
+          <el-form-item label="用户类型" prop="userType">
             <el-select v-model="formData.userType" placeholder="请选择用户类型">
               <el-option
                 v-for="option in userTypes"
@@ -105,7 +92,9 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row  v-if="formType === 'create-S' || formType === 'update-S'">
         <el-col :span="12">
           <el-form-item label="导师名称" prop="supervisorId">
             <el-select
@@ -126,9 +115,7 @@
           </el-form-item>
         </el-col>
 
-      </el-row>
-      <el-row>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="是否毕业" >
             <el-select 
               v-model="formData.isGraduate" 
@@ -148,6 +135,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+  
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注">
@@ -222,12 +210,17 @@ const deptList = ref<Tree[]>([]) // 树形结构
 const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 
 //用户类型
-const userTypes = ref([
-  { label: '在校生', value: "1" },
-  { label: '毕业生', value: "2" },
-  // { label: '导师', value: "3" },
-  // { label: '学院', value: "4" }
-]);
+const userTypes = computed(() => {
+  const types = [];
+  if (formType.value === 'create-S' || formType.value === 'update-S') {
+    types.push({ label: '在校生', value: "1" });
+    types.push({ label: '毕业生', value: "2" });
+  }
+  if (formType.value === 'create-T' || formType.value === 'update-T') {
+    types.push({ label: '导师', value: "3" });
+  }
+  return types;
+});
 
 
 //获取所有导师
@@ -253,7 +246,11 @@ const handleSupervisorChange = (value: number) => {
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  if (type === 'create-S' || type === 'create-T') {
+    dialogTitle.value = '新增'
+  } else if (type === 'update-T' || type === 'update-S') {
+    dialogTitle.value = '编辑'
+  }
   formType.value = type
   resetForm()
   // 修改时，设置数据
@@ -283,7 +280,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as UserApi.UserVO
-    if (formType.value === 'create') {
+    if (formType.value === 'create-S'|| formType.value === 'create-T') {
       await UserApi.createUser(data)
       message.success(t('common.createSuccess'))
     } else {

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

@@ -67,7 +67,7 @@
             <el-button
               type="primary"
               plain
-              @click="openForm('create')"
+              @click="openForm('create-S')"
               v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
@@ -151,7 +151,7 @@
                 <el-button
                   type="primary"
                   link
-                  @click="openForm('update', scope.row.id)"
+                  @click="openForm('update-S', scope.row.id)"
                   v-hasPermi="['system:user:update']"
                 >
                   <Icon icon="ep:edit" />修改

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

@@ -67,7 +67,7 @@
             <el-button
               type="primary"
               plain
-              @click="openForm('create')"
+              @click="openForm('create-T')"
               v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
@@ -138,7 +138,7 @@
                 <el-button
                   type="primary"
                   link
-                  @click="openForm('update', scope.row.id)"
+                  @click="openForm('update-T', scope.row.id)"
                   v-hasPermi="['system:user:update']"
                 >
                   <Icon icon="ep:edit" />修改

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

@@ -32,7 +32,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="照片详情url" prop="detail">
+      <el-form-item label="图片材料" prop="detail">
         <UploadImg v-model="formData.detail" />
       </el-form-item>
     </el-form>

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

@@ -68,17 +68,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <!-- <el-form-item label="岗位">
-            <el-select v-model="formData.postIds" multiple placeholder="请选择">
-              <el-option
-                v-for="item in postList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id!"
-              />
-            </el-select>
-          </el-form-item> -->
+        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
           <el-form-item label="用户类型" prop="userType">
             <el-select v-model="formData.userType" placeholder="请选择用户类型">
               <el-option
@@ -90,11 +80,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row v-if="formType === 'update'">
-        <el-col :span="12">
-          <el-form-item label="学生类型" prop="userType">
+        <el-col :span="12" v-if="formType === 'create-T' || formType === 'update-T'">
+          <el-form-item label="用户类型" prop="userType">
             <el-select v-model="formData.userType" placeholder="请选择用户类型">
               <el-option
                 v-for="option in userTypes"
@@ -105,29 +92,31 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row  v-if="formType === 'create-S' || formType === 'update-S'">
         <el-col :span="12">
           <el-form-item label="导师名称" prop="supervisorId">
-              <el-select
-                v-model="formData.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-select
+               v-model="formData.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-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="是否毕业">
+
+        <el-col :span="12">
+          <el-form-item label="是否毕业" >
             <el-select 
               v-model="formData.isGraduate" 
               prop="isGraduate" 
@@ -146,8 +135,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-
-
+      
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注">
@@ -221,11 +209,17 @@ const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构
 const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 
-const userTypes = ref([
-  { label: '在校生', value: "1" },
-  { label: '毕业生', value: "2" },
-  // { label: '导师', value: "3" },
-]);
+const userTypes = computed(() => {
+  const types = [];
+  if (formType.value === 'create-S' || formType.value === 'update-S') {
+    types.push({ label: '在校生', value: "1" });
+    types.push({ label: '毕业生', value: "2" });
+  }
+  if (formType.value === 'create-T' || formType.value === 'update-T') {
+    types.push({ label: '导师', value: "3" });
+  }
+  return types;
+});
 
 //获取所有导师
 const users = ref()
@@ -250,7 +244,11 @@ const handleSupervisorChange = (value: number) => {
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  if (type === 'create-S' || type === 'create-T') {
+    dialogTitle.value = '新增'
+  } else if (type === 'update-T' || type === 'update-S') {
+    dialogTitle.value = '编辑'
+  }
   formType.value = type
   resetForm()
   // 修改时，设置数据

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

@@ -62,7 +62,7 @@
             <el-button
               type="primary"
               plain
-              @click="openForm('create')"
+              @click="openForm('create-S')"
               v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
@@ -138,7 +138,7 @@
                 <el-button
                   type="primary"
                   link
-                  @click="openForm('update', scope.row.id)"
+                  @click="openForm('update-S', scope.row.id)"
                   v-hasPermi="['system:user:update']"
                 >
                   <Icon icon="ep:edit" />修改

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

@@ -61,7 +61,7 @@
             <el-button
               type="primary"
               plain
-              @click="openForm('create')"
+              @click="openForm('create-T')"
               v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
@@ -132,7 +132,7 @@
                 <el-button
                   type="primary"
                   link
-                  @click="openForm('update', scope.row.id)"
+                  @click="openForm('update-T', scope.row.id)"
                   v-hasPermi="['system:user:update']"
                 >
                   <Icon icon="ep:edit" />修改

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

@@ -29,7 +29,7 @@
           <el-option :label="'著作'" :value="3" />
         </el-select>
       </el-form-item>
-      <el-form-item label="照片详情url" prop="detail">
+      <el-form-item label="图片材料" prop="detail">
         <UploadImg v-model="formData.detail" />
       </el-form-item>
     </el-form>