优化
This commit is contained in:
@ -4,27 +4,13 @@
|
||||
<div v-show="showSearch" class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
|
||||
<el-form-item label="申请人" prop="userName">
|
||||
<el-input v-model="queryParams.userName" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
|
||||
<el-form-item label="申请人" prop="name">
|
||||
<el-input v-model="queryParams.name" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属班组" prop="leaveType">
|
||||
<el-select v-model="queryParams.teamId" placeholder="全部" clearable>
|
||||
<el-option v-for="dict in ProjectTeam" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="请假类型" prop="leaveType">
|
||||
<el-select v-model="queryParams.leaveType" placeholder="请选择请假类型" clearable>
|
||||
<el-option v-for="dict in user_leave_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="班组长意见" prop="gangerOpinion">
|
||||
<el-select v-model="queryParams.gangerOpinion" placeholder="全部" clearable>
|
||||
<el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="管理员意见" prop="managerOpinion">
|
||||
<el-select v-model="queryParams.managerOpinion" placeholder="全部" clearable>
|
||||
<el-option v-for="dict in user_opinion_type" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
<el-select v-model="queryParams.teamId" clearable placeholder="全部">
|
||||
<el-option label="全部" value="" />
|
||||
<el-option v-for="item in TeamList" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@ -37,38 +23,12 @@
|
||||
</transition>
|
||||
|
||||
<el-card shadow="never">
|
||||
<!-- <template #header>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:leave:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:leave:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:leave:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:leave:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
</template> -->
|
||||
|
||||
<el-table v-loading="loading" :data="leaveList">
|
||||
<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="argument" />
|
||||
<!-- <el-table-column label="请假申请时间" align="center" prop="userTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.userTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="请假申请时间" align="center" prop="createdAt" width="180"> </el-table-column>
|
||||
<el-table-column label="所属班组" align="center" prop="teamName">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="user_leave_type" :value="scope.row.teamName" />
|
||||
@ -79,28 +39,6 @@
|
||||
<dict-tag :options="user_review_status_type" :value="scope.row.cardNumber" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="班组长意见" align="center" prop="gangerOpinion">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="user_opinion_type" :value="scope.row.gangerOpinion" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="班组长说明" align="center" prop="gangerExplain" />
|
||||
<el-table-column label="班组长操作时间" align="center" prop="gangerTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.gangerTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管理员意见" align="center" prop="managerOpinion">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="user_opinion_type" :value="scope.row.managerOpinion" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管理员说明" align="center" prop="managerExplain" />
|
||||
<el-table-column label="请假申请时间" align="center" prop="userTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.userTime) }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-button link type="success" icon="View" @click="handleDetail(scope.row)">详情</el-button>
|
||||
@ -199,16 +137,13 @@
|
||||
</template>
|
||||
|
||||
<script setup name="Leave" lang="ts">
|
||||
import { listLeave, getLeave, delLeave, addLeave, updateLeave, AuditReissueCard } from '@/api/project/leave';
|
||||
import { listLeave, AuditReissueCard } from '@/api/project/leave';
|
||||
import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/project/leave/types';
|
||||
import { listProjectTeam } from '@/api/project/projectTeam';
|
||||
import { ProjectTeamVO } from '@/api/project/projectTeam/types';
|
||||
import { AuditReissueCardForm, ReissueCardVO } from '@/api/project/reissueCard/types';
|
||||
import { useUserStoreHook } from '@/store/modules/user';
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
const { user_leave_type, user_opinion_type, user_review_status_type } = toRefs<any>(
|
||||
proxy?.useDict('user_leave_type', 'user_opinion_type', 'user_review_status_type')
|
||||
);
|
||||
const { user_leave_type, user_review_status_type } = toRefs<any>(proxy?.useDict('user_leave_type', 'user_opinion_type', 'user_review_status_type'));
|
||||
import { getSysProjectTeamList } from '@/api/project/goUser/index';
|
||||
const detailObj = ref<ReissueCardVO>({
|
||||
userName: undefined,
|
||||
id: undefined,
|
||||
@ -225,18 +160,15 @@ const detailObj = ref<ReissueCardVO>({
|
||||
status: undefined,
|
||||
managerName: undefined
|
||||
});
|
||||
|
||||
const TeamList = ref([]); //班组列表
|
||||
const leaveList = ref<LeaveVO[]>([]);
|
||||
const buttonLoading = ref(false);
|
||||
const loading = ref(true);
|
||||
const showSearch = ref(true);
|
||||
const ids = ref<Array<string | number>>([]);
|
||||
const single = ref(true);
|
||||
const multiple = ref(true);
|
||||
const total = ref(0);
|
||||
|
||||
const queryFormRef = ref<ElFormInstance>();
|
||||
const leaveFormRef = ref<ElFormInstance>();
|
||||
const dialog = reactive<DialogOption>({
|
||||
visible: false,
|
||||
title: '',
|
||||
@ -246,8 +178,6 @@ const dialog = reactive<DialogOption>({
|
||||
const userStore = useUserStoreHook();
|
||||
// 从 store 中获取项目列表和当前选中的项目
|
||||
const currentProject = computed(() => userStore.selectedProject);
|
||||
const ProjectTeam = computed(() => proxy?.$cache.local.getJSON('ProjectTeamList') || []);
|
||||
|
||||
const initFormData: LeaveForm = {
|
||||
id: undefined,
|
||||
userId: undefined,
|
||||
@ -350,7 +280,11 @@ const getList = async () => {
|
||||
total.value = res.data.total;
|
||||
loading.value = false;
|
||||
};
|
||||
|
||||
// 获取班组
|
||||
const getTeamList = async () => {
|
||||
const res = await getSysProjectTeamList({ pageNum: 1, pageSize: 1000, projectId: currentProject.value.goId });
|
||||
TeamList.value = res.data.list;
|
||||
};
|
||||
/** 取消按钮 */
|
||||
const cancel = () => {
|
||||
reset();
|
||||
@ -410,10 +344,11 @@ const handleExport = () => {
|
||||
|
||||
//监听项目id刷新数据
|
||||
const listeningProject = watch(
|
||||
() => currentProject.value.id,
|
||||
() => currentProject.value.goId,
|
||||
(nid, oid) => {
|
||||
queryParams.value.projectId = nid;
|
||||
form.value.projectId = nid;
|
||||
getTeamList();
|
||||
getList();
|
||||
}
|
||||
);
|
||||
@ -423,6 +358,7 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
getTeamList();
|
||||
getList();
|
||||
});
|
||||
</script>
|
||||
|
Reference in New Issue
Block a user