5555

src/views/system/graduateStudent/UserForm.vue

@@ -40,7 +40,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="学号">
+          <el-form-item label="学号" prop="userNumber">
             <el-input v-model="formData.userNumber" placeholder="请输入学号"/>
           </el-form-item>
         </el-col>
@@ -98,7 +98,7 @@
                     placeholder="请选择导师名称"
                     clearable
                     filterable
-                    class="!w-240px"
+                    class="!w-full"
                   >
                     <el-option
                       v-for="user in users"

src/views/system/graduateStudent/index.vue

@@ -80,7 +80,7 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="导师" prop="leaderUserId">
+          <el-form-item label="导师" prop="leaderUserId" v-if="userInfo.userType === '4'">
             <el-input v-model="queryParams.leaderUserId" placeholder="请输入导师" clearable @keyup.enter="handleQuery" class="!w-240px" />
           </el-form-item>
           

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

@@ -8,6 +8,15 @@
       :inline="true"
       label-width="100px"
     >
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          class="!w-240px"
+          v-model="queryParams.date"
+          value-format="YYYY-MM-DD"
+          type="date"
+          placeholder="请选择日期"
+        />
+      </el-form-item>
         <el-form-item label="姓名" prop="studentName">
           <el-input
             placeholder="请输入姓名 "

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

@@ -7,28 +7,64 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <!-- <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-row>
+      <el-col :span="12">
+        <el-form-item label="日期" prop="date">
+          <el-date-picker
+            class="!w-full"
+            v-model="formData.date"
+            type="date"
+            value-format="x"
+            placeholder="选择日期"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="姓名" prop="studentName">
+          <el-input v-model="formData.studentName" placeholder="请输入姓名" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="学号" prop="userNumber">
+          <el-input v-model="formData.userNumber" placeholder="请输入学号" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="导师名称" prop="supervisor">
+        <el-input v-model="formData.supervisor" placeholder="请输入导师名称" />
       </el-form-item>
-      <el-form-item label="学号" prop="userNumber">
-        <el-input v-model="formData.userNumber" placeholder="请输入学号" />
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="工作间名称" prop="deptName">
+          <el-input v-model="formData.deptName" placeholder="请输入工作间名称" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="打卡类型" prop="clockInStatus">
+          <el-input v-model="clockInStatuE" value="请假" disabled />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <!-- <el-row>
+      <el-col :span="24">
+        <el-form-item label="备注原因" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注原因" />
       </el-form-item>
-      <el-form-item label="工作间id" prop="deptId">
+      </el-col>
+    </el-row> -->
+    
+      <!-- <el-form-item label="学生id" prop="studentId">
+        <el-input v-model="formData.studentId" placeholder="请输入学生id" />
+      </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="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-date-picker
@@ -57,10 +93,7 @@
           :value="option.value"
         />
         </el-select>
-      </el-form-item> -->
-      <el-form-item label="备注原因" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注原因" />
-      </el-form-item>
+      </el-form-item> -->     
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -81,11 +114,13 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const clockInStatuE = ref('2') // 打卡状态
 const formData = ref({
   id: undefined,
   studentId: undefined,
   studentName: undefined,
   userNumber: undefined,
+  supervisor: undefined,
   deptId: undefined,
   deptName: undefined,
   date: undefined,
@@ -95,8 +130,13 @@ const formData = ref({
 })
 const formRules = reactive({
   studentId: [{ required: true, message: '学生id不能为空', trigger: 'blur' }],
+  studentName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  userNumber: [{ required: true, message: '学号不能为空', trigger: 'blur' }],
+  supervisor: [{ required: true, message: '导师名称不能为空', trigger: 'blur' }],
   deptId: [{ required: true, message: '工作间id不能为空', trigger: 'blur' }],
+  deptName: [{ required: true, message: '工作间名称不能为空', trigger: 'blur' }],
   date: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
+  
 })
 const formRef = ref() // 表单 Ref
 
@@ -126,6 +166,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  formData.value.clockInStatus = clockInStatuE.value
   // 校验表单
   await formRef.value.validate()
   // 提交请求
@@ -154,6 +195,7 @@ const resetForm = () => {
     studentId: undefined,
     studentName: undefined,
     userNumber: undefined,
+    supervisor: undefined,
     deptId: undefined,
     deptName: undefined,
     date: undefined,

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

@@ -8,6 +8,15 @@
       :inline="true"
       label-width="100px"
     >
+        <el-form-item label="日期" prop="date">
+          <el-date-picker
+            class="!w-240px"
+            v-model="queryParams.date"
+            value-format="YYYY-MM-DD"
+            type="date"
+            placeholder="请选择日期"
+          />
+        </el-form-item>
         <el-form-item label="姓名" prop="studentName">
           <el-input
             placeholder="请输入姓名 "

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

@@ -105,12 +105,12 @@
         <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
           <el-form-item label="导师名称" prop="supervisorId">
             <el-select
+               class="!w-full"
                v-model="formData.supervisor"
                @change="handleSupervisorChange"
                placeholder="请选择导师名称"
                clearable
                filterable
-               class="!w-240px"
             >
               <el-option
                  v-for="user in users"

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

@@ -44,7 +44,15 @@
               class="!w-240px"
             />
           </el-form-item>
-          
+          <el-form-item label="工作间" prop="deptId" v-if="userInfo.userType === '4'">
+            <el-input
+              v-model="queryParams.deptId"
+              placeholder="请输入工作间"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
@@ -280,9 +288,17 @@ import StudentImportForm from './studentImportForm.vue'
 import UserImportFormzip from './UserImportFormzip.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
+import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 
 defineOptions({ name: 'SystemUser' })
 
+const userInfo = ref({} as ProfileVO)
+const getUserInfo = async () => {
+  const users = await getUserProfile()
+  console.log(users)
+  userInfo.value = users
+}
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -444,6 +460,7 @@ const handleRole = (row: UserApi.UserVO) => {
 
 /** 初始化 */
 onMounted(() => {
+  getUserInfo()
   getList()
 })
 </script>

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

@@ -44,6 +44,15 @@
               class="!w-240px"
             />
           </el-form-item>
+          <el-form-item label="工作间" prop="deptId" v-if="userInfo.userType === '4'">
+            <el-input
+              v-model="queryParams.deptId"
+              placeholder="请输入工作间"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
@@ -254,9 +263,17 @@ import UserImportForm from './UserImportForm.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
 import TeacherImportForm from './teacherImportForm .vue'
+import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 
 defineOptions({ name: 'SystemUser' })
 
+const userInfo = ref({} as ProfileVO)
+const getUserInfo = async () => {
+  const users = await getUserProfile()
+  console.log(users)
+  userInfo.value = users
+}
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -415,6 +432,7 @@ const handleRole = (row: UserApi.UserVO) => {
 
 /** 初始化 */
 onMounted(() => {
+  getUserInfo()
   getList()
 })
 </script>

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

@@ -41,12 +41,26 @@
           clearable
           class="!w-240px"
         >
-          <el-option :label="'论文'" :value="1" />
-          <el-option :label="'专利'" :value="2" />
-          <el-option :label="'著作'" :value="3" />
+          <el-option :label="'北大中文核心期刊论文'" :value="1" />
+          <el-option :label="'SCI、EI、SSCI、A&HCI国际学术期刊论文'" :value="2" />
+          <el-option :label="'SCI、EI、ISIP会议论文'" :value="3" />
+          <el-option :label="'专利'" :value="4" />
+          <el-option :label="'著作'" :value="5" />
+          <el-option :label="'竞赛'" :value="6" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="署名" prop="sort">
+        <el-select
+          v-model="queryParams.sort"
+          placeholder="请选择署名"
+          clearable
+          class="!w-240px"
+        >
+          <el-option :label="'第一作者'" :value="1" />
+          <el-option :label="'第二作者'" :value="2" />
+        </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"
@@ -56,7 +70,7 @@
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-220px"
         />
-      </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>
@@ -87,23 +101,41 @@
       <el-table-column type="index" width="50" />
       <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="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 == 2
+               ? 'SCI、EI、SSCI、A&HCI国际学术期刊论文'
                 : rowData.row.achievementType == 3
+               ? 'SCI、EI、ISIP会议论文'
+                : rowData.row.achievementType ==4
+               ? '专利'
+                : rowData.row.achievementType == 5
                ? '著作'
+                : rowData.row.achievementType == 6
+               ? '竞赛'
                 : '未知类型'
             }}
           </span>
         </template>
       </el-table-column>
+      <el-table-column label="署名" align="center" prop="sort">
+        <template #default="rowData">
+          <span>
+            {{ 
+              rowData.row.sort == 1
+               ? '第一作者'
+                : rowData.row.sort == 2
+               ? '第二作者'
+                : '其他'
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -180,6 +212,7 @@ const queryParams = reactive({
   userName: undefined,
   createTime: [],
   detail: undefined,
+  sort: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中

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

@@ -41,12 +41,26 @@
           clearable
           class="!w-240px"
         >
-          <el-option :label="'论文'" :value="1" />
-          <el-option :label="'专利'" :value="2" />
-          <el-option :label="'著作'" :value="3" />
+          <el-option :label="'北大中文核心期刊论文'" :value="1" />
+          <el-option :label="'SCI、EI、SSCI、A&HCI国际学术期刊论文'" :value="2" />
+          <el-option :label="'SCI、EI、ISIP会议论文'" :value="3" />
+          <el-option :label="'专利'" :value="4" />
+          <el-option :label="'著作'" :value="5" />
+          <el-option :label="'竞赛'" :value="6" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="署名" prop="sort">
+        <el-select
+          v-model="queryParams.sort"
+          placeholder="请选择署名"
+          clearable
+          class="!w-240px"
+        >
+          <el-option :label="'第一作者'" :value="1" />
+          <el-option :label="'第二作者'" :value="2" />
+        </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"
@@ -56,7 +70,7 @@
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-220px"
         />
-      </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>
@@ -87,23 +101,41 @@
       <el-table-column type="index" width="50" />
       <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="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 == 2
+               ? 'SCI、EI、SSCI、A&HCI国际学术期刊论文'
                 : rowData.row.achievementType == 3
+               ? 'SCI、EI、ISIP会议论文'
+                : rowData.row.achievementType ==4
+               ? '专利'
+                : rowData.row.achievementType == 5
                ? '著作'
+                : rowData.row.achievementType == 6
+               ? '竞赛'
                 : '未知类型'
             }}
           </span>
         </template>
       </el-table-column>
+      <el-table-column label="署名" align="center" prop="sort">
+        <template #default="rowData">
+          <span>
+            {{ 
+              rowData.row.sort == 1
+               ? '第一作者'
+                : rowData.row.sort == 2
+               ? '第二作者'
+                : '其他'
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -180,6 +212,7 @@ const queryParams = reactive({
   userName: undefined,
   createTime: [],
   detail: undefined,
+  sort: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中