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:
lcj
2025-03-12 15:55:32 +08:00
parent d359113dbe
commit 4d0ec4ca6f
11 changed files with 443 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/project/constructionUser/types.ts
View File

@ -289,7 +289,7 @@ export interface ConstructionUserForm extends BaseEntity {
remark?: string;
}
export interface ConstructionUserQuery extends PageQuery {
export interface ConstructionUserQuery extends PageRequest {
/**
* 微信id
*/
@ -325,6 +325,11 @@ export interface ConstructionUserQuery extends PageQuery {
*/
teamId?: string | number;
/**
* 不在班组id
*/
notTeamId?: string | number;
/**
* 状态（0在职 1离职）
*/

16
src/api/project/contractor/types.ts
View File

@ -33,7 +33,6 @@ export interface ContractorVO {
* 备注
*/
remark: string;
}
export interface ContractorForm extends BaseEntity {
@ -71,11 +70,9 @@ export interface ContractorForm extends BaseEntity {
* 备注
*/
remark?: string;
}
export interface ContractorQuery extends PageQuery {
export interface ContractorQuery extends PageRequest {
/**
* 公司名称
*/
@ -101,11 +98,8 @@ export interface ContractorQuery extends PageQuery {
*/
custodianPhone?: string;
/**
* 日期范围参数
*/
params?: any;
/**
* 日期范围参数
*/
params?: any;
}

2
src/api/project/project/types.ts
View File

@ -222,7 +222,7 @@ export interface ProjectForm extends BaseEntity {
isDelete?: number;
}
export interface ProjectQuery extends PageQuery {
export interface ProjectQuery extends PageRequest {
/**
* 项目名称
*/

16
src/api/project/projectTeam/types.ts
View File

@ -23,7 +23,6 @@ export interface ProjectTeamVO {
* 备注
*/
remark: string;
}
export interface ProjectTeamForm extends BaseEntity {
@ -51,11 +50,9 @@ export interface ProjectTeamForm extends BaseEntity {
* 备注
*/
remark?: string;
}
export interface ProjectTeamQuery extends PageQuery {
export interface ProjectTeamQuery extends PageRequest {
/**
* 项目id
*/
@ -71,11 +68,8 @@ export interface ProjectTeamQuery extends PageQuery {
*/
isClockIn?: number;
/**
* 日期范围参数
*/
params?: any;
/**
* 日期范围参数
*/
params?: any;
}

16
src/api/project/projectTeamMember/types.ts
View File

@ -28,7 +28,6 @@ export interface ProjectTeamMemberVO {
* 备注
*/
remark: string;
}
export interface ProjectTeamMemberForm extends BaseEntity {
@ -61,11 +60,9 @@ export interface ProjectTeamMemberForm extends BaseEntity {
* 备注
*/
remark?: string;
}
export interface ProjectTeamMemberQuery extends PageQuery {
export interface ProjectTeamMemberQuery extends PageRequest {
/**
* 班组id
*/
@ -86,11 +83,8 @@ export interface ProjectTeamMemberQuery extends PageQuery {
*/
postId?: string | number;
/**
* 日期范围参数
*/
params?: any;
/**
* 日期范围参数
*/
params?: any;
}

144
src/views/project/constructionUser/index.vue
View File

@ -8,13 +8,19 @@
<el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="分包公司" prop="contractorId">
<el-input v-model="queryParams.contractorId" placeholder="请输入分包公司" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.contractorId" clearable placeholder="请选择分包公司">
<el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="工种" prop="typeOfWork">
<el-input v-model="queryParams.typeOfWork" placeholder="请输入工种" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.typeOfWork" clearable placeholder="请选择工种">
<el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="打卡" prop="clock">
<el-input v-model="queryParams.clock" placeholder="请输入打卡" clearable @keyup.enter="handleQuery" />
<el-select v-model="queryParams.clock" clearable placeholder="请选择打卡">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -59,12 +65,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="分包公司" align="center">
<el-table-column label="分包公司" align="center" prop="contractorVo.name" />
<el-table-column label="班组" align="center" prop="teamId">
<template #default="scope">
<div>{{ scope.row.ContractorVO.name }}</div>
{{ getTeamName(scope.row.teamId) }}
</template>
</el-table-column>
<el-table-column label="班组id" align="center" prop="teamId" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="性别" align="center" prop="sex">
@ -90,23 +96,19 @@
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['project:constructionUser:remove']"
></el-button>
</el-tooltip>
<el-space wrap>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:constructionUser:edit']">
修改
</el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:constructionUser:remove']">
删除
</el-button>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改施工人员对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -123,17 +125,10 @@
<el-form-item label="人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员姓名" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="分包公司id" prop="contractorId">
<el-input v-model="form.contractorId" placeholder="请输入分包公司id" />
</el-form-item>
<el-form-item label="班组id" prop="teamId">
<el-input v-model="form.teamId" placeholder="请输入班组id" />
</el-form-item>
<el-form-item label="是否代打" prop="isPinch">
<el-input v-model="form.isPinch" placeholder="请输入是否代打" />
<el-form-item label="分包公司" prop="contractorId">
<el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
<el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
@ -145,16 +140,16 @@
<el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="身份证有效开始期" prop="sfzStart">
<el-input v-model="form.sfzStart" placeholder="请输入身份证有效开始期" />
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
</el-form-item>
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-input v-model="form.sfzEnd" placeholder="请输入身份证有效结束期" />
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
</el-form-item>
<el-form-item label="身份证地址" prop="sfzSite">
<el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
</el-form-item>
<el-form-item label="身份证出生日期" prop="sfzBirth">
<el-input v-model="form.sfzBirth" placeholder="请输入身份证出生日期" />
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
</el-form-item>
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
@ -168,20 +163,15 @@
<el-form-item label="持卡人" prop="yhkCardholder">
<el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
</el-form-item>
<el-form-item label="工种(字典type_of_work)" prop="typeOfWork">
<el-input v-model="form.typeOfWork" placeholder="请输入工种(字典type_of_work)" />
<el-form-item label="工种" prop="typeOfWork">
<el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
<el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="打卡(0启用打卡 1禁止打卡)" prop="clock">
<el-input v-model="form.clock" placeholder="请输入打卡(0启用打卡 1禁止打卡)" />
</el-form-item>
<el-form-item label="入场时间" prop="entryDate">
<el-input v-model="form.entryDate" placeholder="请输入入场时间" />
</el-form-item>
<el-form-item label="离场时间" prop="leaveDate">
<el-input v-model="form.leaveDate" placeholder="请输入离场时间" />
</el-form-item>
<el-form-item label="薪水" prop="salary">
<el-input v-model="form.salary" placeholder="请输入薪水" />
<el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@ -206,8 +196,11 @@ import {
updateConstructionUser
} from '@/api/project/constructionUser';
import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types';
import { useUserStoreHook } from '@/store/modules/user';
import { listContractor } from '@/api/project/contractor';
import { listProjectTeam } from '@/api/project/projectTeam';
import { ContractorVO } from '@/api/project/contractor/types';
import { ProjectTeamVO } from '@/api/project/projectTeam/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { type_of_work, user_sex_type, user_clock_type } = toRefs<any>(proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type'));
@ -266,8 +259,10 @@ const initFormData: ConstructionUserForm = {
const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend',
openid: undefined,
nickName: undefined,
pacePhoto: undefined,
@ -298,8 +293,7 @@ const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
},
rules: {
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
sex: [{ required: true, message: '0:保密 1:男 2女不能为空', trigger: 'change' }],
clock: [{ required: true, message: '打卡(0启用打卡 1禁止打卡)不能为空', trigger: 'blur' }]
clock: [{ required: true, message: '打卡不能为空', trigger: 'blur' }]
}
});
@ -309,11 +303,53 @@ const { queryParams, form, rules } = toRefs(data);
const getList = async () => {
loading.value = true;
const res = await listConstructionUser(queryParams.value);
constructionUserList.value = res.rows;
total.value = res.total;
constructionUserList.value = res.data.records;
total.value = res.data.total;
loading.value = false;
};
const contractorOpt = ref();
/** 查询当前项目下的分包公司列表 */
const getContractorList = async () => {
loading.value = true;
const res = await listContractor({
current: 1,
pageSize: 20,
sortField: 'createTime',
sortOrder: 'descend'
});
contractorOpt.value = res.data.records.map((contractor: ContractorVO) => ({
value: contractor.id,
label: contractor.name
}));
loading.value = false;
};
const projectTeamOpt = ref();
/** 查询当前项目下的班组列表 */
const getProjectTeamList = async () => {
loading.value = true;
const res = await listProjectTeam({
current: 1,
pageSize: 20,
sortField: 'createTime',
sortOrder: 'descend',
projectId: currentProject.value.id
});
projectTeamOpt.value = res.data.records.map((projectTeam: ProjectTeamVO) => ({
value: projectTeam.id,
label: projectTeam.teamName
}));
loading.value = false;
};
const getTeamName = (teamId: string | number) => {
const team = projectTeamOpt.value.find((item: any) => item.value === teamId);
return team ? team.label : teamId;
};
/** 取消按钮 */
const cancel = () => {
reset();
@ -328,7 +364,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
queryParams.value.current = 1;
getList();
};
@ -401,5 +437,7 @@ const handleExport = () => {
onMounted(() => {
getList();
getContractorList();
getProjectTeamList();
});
</script>

20
src/views/project/contractor/index.vue
View File

@ -62,17 +62,17 @@
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:contractor:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:contractor:remove']"></el-button>
</el-tooltip>
<el-space wrap>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:contractor:edit']">修改 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:contractor:remove']">
删除
</el-button>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改分包单位对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -141,7 +141,7 @@ const initFormData: ContractorForm = {
const data = reactive<PageData<ContractorForm, ContractorQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
current: 1,
pageSize: 10,
name: undefined,
principal: undefined,
@ -162,7 +162,7 @@ const getList = async () => {
loading.value = true;
const res = await listContractor(queryParams.value);
contractorList.value = res.data.records;
total.value = res.total;
total.value = res.data.total;
loading.value = false;
};
@ -180,7 +180,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
queryParams.value.current = 1;
getList();
};

28
src/views/project/project/index.vue
View File

@ -53,7 +53,6 @@
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="项目类型" align="center" prop="type" />
<el-table-column label="项目类别" align="center" prop="isType">
<template #default="scope">
@ -68,23 +67,22 @@
<el-table-column label="开工时间" align="center" prop="onStreamTime" />
<el-table-column label="打卡范围" align="center" prop="punchRange" />
<el-table-column label="设计总量" align="center" prop="designTotal" />
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="安全协议书" align="center" prop="securityAgreement" /> -->
<!-- <el-table-column label="排序字段" align="center" prop="sort" />/ -->
<!-- <el-table-column label="显示隐藏" align="center" prop="showHidden" /> -->
<!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']"></el-button>
</el-tooltip>
<el-space wrap>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改项目对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -104,10 +102,6 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<!-- <el-form-item label="删除时间" prop="deletedAt">
<el-date-picker clearable v-model="form.deletedAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择删除时间">
</el-date-picker>
</el-form-item> -->
<el-form-item label="项目地址" prop="projectSite">
<el-input v-model="form.projectSite" placeholder="请输入项目地址" />
</el-form-item>
@ -156,8 +150,8 @@
</template>
<script setup name="Project" lang="ts">
import { listProject, getProject, delProject, addProject, updateProject } from '@/api/project/project';
import { ProjectVO, ProjectQuery, ProjectForm } from '@/api/project/project/types';
import { addProject, delProject, getProject, listProject, updateProject } from '@/api/project/project';
import { ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable, project_category_type } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'project_category_type'));
@ -205,8 +199,10 @@ const initFormData: ProjectForm = {
const data = reactive<PageData<ProjectForm, ProjectQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend',
projectName: undefined,
shortName: undefined,
pId: undefined,
@ -260,7 +256,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
queryParams.value.current = 1;
getList();
};

317
src/views/project/projectTeam/component/UserListDialog.vue
View File

@ -1,68 +1,204 @@
<template>
<div>
<el-dialog title="项目班组的成员" v-model="visible" @close="closeModal">
<h3>{{ row.teamName }}</h3>
<div>{{ JSON.stringify(row) }}</div>
<div>{{ JSON.stringify(projectTeamMemberList) }}</div>
<!-- <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="施工人员" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入施工人员id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-input v-model="queryParams.postId" placeholder="请输入岗位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>-->
<template #header>
{{ props.projectTeamVo.teamName }}
</template>
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="施工人员" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入施工人员" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">
<el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button size="small" type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectTeamMember:add']">
新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
size="small"
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate()"
v-hasPermi="['project:projectTeamMember:edit']"
>
修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
size="small"
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['project:projectTeamMember:remove']"
>
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button size="small" type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeamMember:export']">
导出
</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="projectTeamMemberList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="施工人员" align="center" prop="memberName" />
<el-table-column label="岗位" align="center" prop="postId">
<template #default="scope">
<dict-tag :options="user_post_type" :value="scope.row.postId" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-space wrap>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeamMember:edit']">
修改
</el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:projectTeamMember:remove']">
删除
</el-button>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-dialog>
<!-- 添加或修改项目班组下的成员对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="projectTeamMemberFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="施工人员" prop="memberId">
<el-select v-model="form.memberId" clearable placeholder="请选择岗位">
<el-option v-for="item in userNotInTeamOpt" :key="item.value" :label="item.label" :value="item.value" />
<pagination
v-show="total > 0"
:total="userNotInTeamTotal"
v-model:page="userQueryParams.current"
v-model:limit="userQueryParams.pageSize"
@pagination="getUserListNotInTeam"
/>
</el-select>
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-select v-model="form.postId" clearable placeholder="请选择岗位">
<el-option v-for="item in user_post_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ProjectTeamVO } from '@/api/project/projectTeam/types';
import { ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
import { listProjectTeamMember } from '@/api/project/projectTeamMember';
import { computed, onMounted, ref } from 'vue';
import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
import {
addProjectTeamMember,
delProjectTeamMember,
getProjectTeamMember,
listProjectTeamMember,
updateProjectTeamMember
} from '@/api/project/projectTeamMember';
import { computed, reactive, ref } from 'vue';
import { useUserStoreHook } from '@/store/modules/user';
import { listConstructionUser } from '@/api/project/constructionUser';
import { ConstructionUserVO } from '@/api/project/constructionUser/types';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { user_post_type } = toRefs<any>(proxy?.useDict('user_post_type'));
interface Props {
row: ProjectTeamVO;
projectTeamVo: ProjectTeamVO;
}
const props = withDefaults(defineProps<Props>(), {});
const row = computed(() => {
return props.row;
});
// 是否可见
const visible = ref(false);
// 搜索条件
const searchParams = ref({
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend'
const initFormData: ProjectTeamMemberForm = {
id: undefined,
teamId: props.projectTeamVo.id,
projectId: currentProject.value.id,
memberId: undefined,
postId: undefined,
remark: undefined
};
const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
form: { ...initFormData },
queryParams: {
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend',
teamId: props.projectTeamVo.id,
projectId: currentProject.value.id,
memberId: undefined,
postId: undefined,
params: {}
},
rules: {
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
}
});
const projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
const total = ref(0);
const buttonLoading = ref(false);
const loading = 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 projectTeamMemberFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const { queryParams, form, rules } = toRefs(data);
const projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
/** 查询项目班组下的成员列表 */
const getList = async () => {
loading.value = true;
// 转换搜索参数
const params = {
...searchParams.value
};
const res = await listProjectTeamMember(params);
const res = await listProjectTeamMember(queryParams.value);
projectTeamMemberList.value = res.data.records;
total.value = res.data.total;
loading.value = false;
};
/** 查询项目下的成员列表 */
// 打开弹窗
const openModal = () => {
visible.value = true;
getList();
};
// 关闭弹窗
@ -70,12 +206,115 @@ const closeModal = () => {
visible.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
projectTeamMemberFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.current = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ProjectTeamMemberVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加项目班组下的成员';
getUserListNotInTeam();
};
const userNotInTeamOpt = ref();
const userNotInTeamTotal = ref();
const userQueryParams = ref({
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend'
});
// 获取不在当前班组的成员
const getUserListNotInTeam = async () => {
loading.value = true;
const res = await listConstructionUser({ ...userQueryParams.value, notTeamId: props.projectTeamVo.id });
userNotInTeamOpt.value = res.data.records.map((user: ConstructionUserVO) => ({
value: user.id,
label: user.userName
}));
userNotInTeamTotal.value = res.data.total;
loading.value = false;
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ProjectTeamMemberVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getProjectTeamMember(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改项目班组下的成员';
};
/** 提交按钮 */
const submitForm = () => {
projectTeamMemberFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
} else {
await addProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ProjectTeamMemberVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除项目班组下的成员编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delProjectTeamMember(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'project/projectTeamMember/export',
{
...queryParams.value
},
`projectTeamMember_${new Date().getTime()}.xlsx`
);
};
// 暴露函数给父组件
defineExpose({
openModal
});
onMounted(() => {
getList();
});
</script>

50
src/views/project/projectTeam/index.vue
View File

@ -23,13 +23,13 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:projectTeam:add']"> 新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:projectTeam:edit']"
>修改
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:projectTeam:edit']">
修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:projectTeam:remove']"
>删除
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:projectTeam:remove']">
删除
</el-button>
</el-col>
<el-col :span="1.5">
@ -43,23 +43,25 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="班组名称" align="center" prop="teamName" />
<el-table-column label="范围内打卡" align="center" prop="isClockIn" />
<el-table-column label="打卡范围" align="center" prop="isClockIn">
<template #default="scope">
<dict-tag :options="team_clock_type" :value="scope.row.isClockIn" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="班组成员" placement="top">
<el-button link type="primary" icon="User" @click="handleUserList(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeam:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:projectTeam:remove']"></el-button>
</el-tooltip>
<el-space wrap>
<el-button link type="primary" icon="User" @click="handleUserList(scope.row)">班组成员</el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeam:edit']"> 修改 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:projectTeam:remove']">
删除
</el-button>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改项目班组对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -81,7 +83,7 @@
</div>
</template>
</el-dialog>
<user-list-dialog ref="userListVisible" :row="currentRow" />
<user-list-dialog ref="userListVisible" :projectTeamVo="currentRow" />
</div>
</template>
@ -92,7 +94,7 @@ import { useUserStoreHook } from '@/store/modules/user';
import UserListDialog from '@/views/project/projectTeam/component/UserListDialog.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { team_clock_type } = toRefs<any>(proxy?.useDict('team_clock_type'));
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
@ -106,7 +108,13 @@ const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const userListVisible = ref();
const currentRow = ref<ProjectTeamVO>();
const currentRow = ref<ProjectTeamVO>({
id: undefined,
projectId: undefined,
teamName: undefined,
isClockIn: undefined,
remark: undefined
});
const queryFormRef = ref<ElFormInstance>();
const projectTeamFormRef = ref<ElFormInstance>();
@ -126,8 +134,10 @@ const initFormData: ProjectTeamForm = {
const data = reactive<PageData<ProjectTeamForm, ProjectTeamQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
current: 1,
pageSize: 10,
sortField: 'createTime',
sortOrder: 'descend',
projectId: currentProject.value.id,
teamName: undefined,
isClockIn: undefined,
@ -164,7 +174,7 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
queryParams.value.current = 1;
getList();
};

272
src/views/project/projectTeamMember/index.vue
View File

@ -1,272 +0,0 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="班组id" prop="teamId">
<el-input v-model="queryParams.teamId" placeholder="请输入班组id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="施工人员id" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入施工人员id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-input v-model="queryParams.postId" placeholder="请输入岗位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</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:projectTeamMember:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:projectTeamMember:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['project:projectTeamMember:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeamMember:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="projectTeamMemberList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" v-if="true" />
<el-table-column label="班组id" align="center" prop="teamId" />
<el-table-column label="项目id" align="center" prop="projectId" />
<el-table-column label="施工人员id" align="center" prop="memberId" />
<el-table-column label="岗位" align="center" prop="postId" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:projectTeamMember:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['project:projectTeamMember:remove']"
></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改项目班组下的成员对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="projectTeamMemberFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="班组id" prop="teamId">
<el-input v-model="form.teamId" placeholder="请输入班组id" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="施工人员id" prop="memberId">
<el-input v-model="form.memberId" placeholder="请输入施工人员id" />
</el-form-item>
<el-form-item label="岗位" prop="postId">
<el-input v-model="form.postId" placeholder="请输入岗位" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="ProjectTeamMember" lang="ts">
import {
addProjectTeamMember,
delProjectTeamMember,
getProjectTeamMember,
listProjectTeamMember,
updateProjectTeamMember
} from '@/api/project/projectTeamMember';
import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
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 projectTeamMemberFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ProjectTeamMemberForm = {
id: undefined,
teamId: undefined,
projectId: currentProject.value.id,
memberId: undefined,
postId: undefined,
remark: undefined
};
const data = reactive<PageData<ProjectTeamMemberForm, ProjectTeamMemberQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
teamId: undefined,
projectId: currentProject.value.id,
memberId: undefined,
postId: undefined,
params: {}
},
rules: {
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询项目班组下的成员列表 */
const getList = async () => {
loading.value = true;
const res = await listProjectTeamMember(queryParams.value);
projectTeamMemberList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
projectTeamMemberFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ProjectTeamMemberVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加项目班组下的成员';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ProjectTeamMemberVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getProjectTeamMember(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改项目班组下的成员';
};
/** 提交按钮 */
const submitForm = () => {
projectTeamMemberFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
} else {
await addProjectTeamMember(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ProjectTeamMemberVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除项目班组下的成员编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delProjectTeamMember(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'project/projectTeamMember/export',
{
...queryParams.value
},
`projectTeamMember_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>