taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
taoge1020
2025-07-29 16:26:34 +08:00
parent 78c13c4131 c069b53636
commit 496adee0b4
9 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/login.vue
View File

@ -79,7 +79,7 @@
</template>
<script setup lang="ts">
import { getCodeImg, getTenantList } from '@/api/login';
import { getCodeImg, getGoToken, getTenantList } from '@/api/login';
import { authBinding } from '@/api/system/social/auth';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
@ -151,8 +151,12 @@ const handleLogin = () => {
// 调用action的登录方法
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
//获取Go服务Token保存本地
const goToken = await getGoToken();
proxy.$cache.local.set('goToken', goToken.data.token);
const redirectUrl = redirect.value || '/';
await router.push(redirectUrl);
loading.value = false;
} else {
loading.value = false;

12
src/views/project/leave/index.vue
View File

@ -63,7 +63,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="50" />
<el-table-column label="申请人" align="center" prop="userName" />
<el-table-column label="申请请假说明" align="center" prop="userExplain" />
<el-table-column label="申请请假说明" align="center" prop="argument" />
<!-- <el-table-column label="请假申请时间" align="center" prop="userTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.userTime, '{y}-{m}-{d}') }}</span>
@ -74,9 +74,9 @@
<dict-tag :options="user_leave_type" :value="scope.row.teamName" />
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<el-table-column label="状态" align="center" prop="cardNumber">
<template #default="scope">
<dict-tag :options="user_review_status_type" :value="scope.row.status" />
<dict-tag :options="user_review_status_type" :value="scope.row.cardNumber" />
</template>
</el-table-column>
<!-- <el-table-column label="班组长意见" align="center" prop="gangerOpinion">
@ -189,7 +189,7 @@
</el-step>
<el-step title="结果" :status="resultsStatus">
<template #description>
<div>{{ user_review_status_type[parseInt(detailObj.status) - 1].label }}</div>
<div>{{ user_review_status_type[parseInt(detailObj.cardNumber) - 1].label }}</div>
</template>
</el-step>
</el-steps>
@ -346,8 +346,8 @@ const resultsStatus = computed(() => {
const getList = async () => {
loading.value = true;
const res = await listLeave(queryParams.value);
leaveList.value = res.rows;
total.value = res.total;
leaveList.value = res.data.list;
total.value = res.data.total;
loading.value = false;
};