47 8 months ago
parent
commit
9b154439c9

+ 39 - 1
src/views/system/dept/DeptForm.vue

@@ -24,7 +24,7 @@
       <el-form-item label="显示排序" prop="sort">
         <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
       </el-form-item>
-      <el-form-item label="负责人" prop="leaderUserId">
+      <!-- <el-form-item label="负责人" prop="leaderUserId">
         <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
           <el-option
             v-for="item in userList"
@@ -33,6 +33,24 @@
             :value="item.id"
           />
         </el-select>
+      </el-form-item> -->
+      <el-form-item label="负责人" prop="leaderUserId">
+        <el-select
+          v-model="formData.leaderUserId"
+          @change="handleSupervisorChange"
+          placeholder="请选择负责人"
+          clearable
+          filterable
+          multiple
+          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="phone">
         <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话" />
@@ -121,6 +139,22 @@ const open = async (type: string, id?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法,用于打开弹窗
 
+//获取所有导师
+const users = ref()
+const getSupervisor= async () => {
+  try {
+    const response = await UserApi.getSupervisor()
+    users.value = response
+  } catch (error) {
+    console.error('Error fetching user data:', error)
+  }
+}
+//传supervisorId给formData.leaderUserId
+const handleSupervisorChange = (values) => {
+  formData.value.leaderUserId = values;  // values 是选择的用户ID数组
+  // 如有需要,可以进行其他相关的处理
+}
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
 const submitForm = async () => {
@@ -171,4 +205,8 @@ const getTree = async () => {
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }
+
+onMounted(() => {
+  getSupervisor()
+})
 </script>

+ 1 - 1
src/views/system/workroomCollege/dept/DeptForm.vue

@@ -150,7 +150,7 @@ const getSupervisor= async () => {
 }
 //传supervisorId给formData.leaderUserId
 const handleSupervisorChange = (values) => {
-  formData.leaderUserId = values;  // values 是选择的用户ID数组
+  formData.value.leaderUserId = values;  // values 是选择的用户ID数组
   // 如有需要,可以进行其他相关的处理
 }
 

+ 2 - 2
src/views/system/workroomCollege/user/student.vue

@@ -133,9 +133,9 @@
               />
             </template>
           </el-table-column> -->
-          <el-table-column label="导入状态" align="center" prop="isgruaduate">
+          <el-table-column label="是否达成毕业条件" align="center" prop="isGraduate">
             <template #default="scope">
-              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isgruaduate" />  
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isGraduate" />  
             </template>
           </el-table-column>
           <el-table-column

+ 2 - 2
src/views/system/workroomTeacher/user/student.vue

@@ -120,9 +120,9 @@
               />
             </template>
           </el-table-column> -->
-          <el-table-column label="导入状态" align="center" prop="isgruaduate">
+          <el-table-column label="是否达成毕业条件" align="center" prop="isGraduate">
             <template #default="scope">
-              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isgruaduate" />  
+              <dict-tag :type="DICT_TYPE.SYSTEM_STUDENT_GRADUATE_STATUS" :value="scope.row.isGraduate" />  
             </template>
           </el-table-column>
           <el-table-column