添加增删改查

This commit is contained in:
lcj
2025-03-10 18:28:07 +08:00
parent 3e3f6f8aab
commit 340cc2029b
34 changed files with 3197 additions and 685 deletions

View File

@ -1,62 +0,0 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
/**
* 查询测试单列表
* @param query
* @returns {*}
*/
export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
return request({
url: '/demo/demo/list',
method: 'get',
params: query
});
};
/**
* 查询测试单详细
* @param id
*/
export const getDemo = (id: string | number): AxiosPromise<DemoVO> => {
return request({
url: '/demo/demo/' + id,
method: 'get'
});
};
/**
* 新增测试单
* @param data
*/
export const addDemo = (data: DemoForm) => {
return request({
url: '/demo/demo',
method: 'post',
data: data
});
};
/**
* 修改测试单
* @param data
*/
export const updateDemo = (data: DemoForm) => {
return request({
url: '/demo/demo',
method: 'put',
data: data
});
};
/**
* 删除测试单
* @param id
*/
export const delDemo = (id: string | number | Array<string | number>) => {
return request({
url: '/demo/demo/' + id,
method: 'delete'
});
};

View File

@ -1,90 +0,0 @@
export interface DemoVO {
/**
* 主键
*/
id: string | number;
/**
* 部门id
*/
deptId: string | number;
/**
* 用户id
*/
userId: string | number;
/**
* 排序号
*/
orderNum: number;
/**
* key键
*/
testKey: string;
/**
* 值
*/
value: string;
}
export interface DemoForm extends BaseEntity {
/**
* 主键
*/
id?: string | number;
/**
* 部门id
*/
deptId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 排序号
*/
orderNum?: number;
/**
* key键
*/
testKey?: string;
/**
* 值
*/
value?: string;
}
export interface DemoQuery extends PageQuery {
/**
* 部门id
*/
deptId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 排序号
*/
orderNum?: number;
/**
* key键
*/
testKey?: string;
/**
* 值
*/
value?: string;
}

View File

@ -1,62 +0,0 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { TreeVO, TreeForm, TreeQuery } from '@/api/demo/tree/types';
/**
* 查询测试树列表
* @param query
* @returns {*}
*/
export const listTree = (query?: TreeQuery): AxiosPromise<TreeVO[]> => {
return request({
url: '/demo/tree/list',
method: 'get',
params: query
});
};
/**
* 查询测试树详细
* @param id
*/
export const getTree = (id: string | number): AxiosPromise<TreeVO> => {
return request({
url: '/demo/tree/' + id,
method: 'get'
});
};
/**
* 新增测试树
* @param data
*/
export const addTree = (data: TreeForm) => {
return request({
url: '/demo/tree',
method: 'post',
data: data
});
};
/**
* 修改测试树
* @param data
*/
export const updateTree = (data: TreeForm) => {
return request({
url: '/demo/tree',
method: 'put',
data: data
});
};
/**
* 删除测试树
* @param id
*/
export const delTree = (id: string | number | Array<string | number>) => {
return request({
url: '/demo/tree/' + id,
method: 'delete'
});
};

View File

@ -1,80 +0,0 @@
export interface TreeVO {
/**
* 主键
*/
id: string | number;
/**
* 父id
*/
parentId: string | number;
/**
* 部门id
*/
deptId: string | number;
/**
* 用户id
*/
userId: string | number;
/**
* 值
*/
treeName: string;
/**
* 子对象
*/
children: TreeVO[];
}
export interface TreeForm extends BaseEntity {
/**
* 主键
*/
id?: string | number;
/**
* 父id
*/
parentId?: string | number;
/**
* 部门id
*/
deptId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 值
*/
treeName?: string;
}
export interface TreeQuery {
/**
* 父id
*/
parentId?: string | number;
/**
* 部门id
*/
deptId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 值
*/
treeName?: string;
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { LoginData, LoginResult, VerifyCodeResult, TenantInfo,UserProject } from './types';
import { LoginData, LoginResult, TenantInfo, UserProject, VerifyCodeResult } from './types';
import { UserInfo } from '@/api/system/user/types';
// pc端固定客户端授权id
@ -118,4 +118,4 @@ export function getUserProject(): AxiosPromise<UserProject[]> {
url: '/project/projectRelevancy/login/list',
method: 'get'
});
}
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MachineryVO, MachineryForm, MachineryQuery } from '@/api/machinery/machinery/types';
/**
* 查询机械列表
* @param query
* @returns {*}
*/
export const listMachinery = (query?: MachineryQuery): AxiosPromise<MachineryVO[]> => {
return request({
url: '/machinery/machinery/list',
method: 'get',
params: query
});
};
/**
* 查询机械详细
* @param id
*/
export const getMachinery = (id: string | number): AxiosPromise<MachineryVO> => {
return request({
url: '/machinery/machinery/' + id,
method: 'get'
});
};
/**
* 新增机械
* @param data
*/
export const addMachinery = (data: MachineryForm) => {
return request({
url: '/machinery/machinery',
method: 'post',
data: data
});
};
/**
* 修改机械
* @param data
*/
export const updateMachinery = (data: MachineryForm) => {
return request({
url: '/machinery/machinery',
method: 'put',
data: data
});
};
/**
* 删除机械
* @param id
*/
export const delMachinery = (id: string | number | Array<string | number>) => {
return request({
url: '/machinery/machinery/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,111 @@
export interface MachineryVO {
/**
* 主键id
*/
id: string | number;
/**
* 机械名称
*/
machineryName: string;
/**
* 机械型号
*/
machineryNumber: string;
/**
* 项目id
*/
projectId: string | number;
/**
* 数量
*/
number: number;
/**
* 负责人
*/
principal: string;
/**
* 备注
*/
remark: string;
}
export interface MachineryForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 机械名称
*/
machineryName?: string;
/**
* 机械型号
*/
machineryNumber?: string;
/**
* 项目id
*/
projectId?: string | number;
/**
* 数量
*/
number?: number;
/**
* 负责人
*/
principal?: string;
/**
* 备注
*/
remark?: string;
}
export interface MachineryQuery extends PageQuery {
/**
* 机械名称
*/
machineryName?: string;
/**
* 机械型号
*/
machineryNumber?: string;
/**
* 项目id
*/
projectId?: string | number;
/**
* 数量
*/
number?: number;
/**
* 负责人
*/
principal?: string;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/api/machinery/machineryDetail/types';
/**
* 查询机械详情列表
* @param query
* @returns {*}
*/
export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
return request({
url: '/machinery/machineryDetail/list',
method: 'get',
params: query
});
};
/**
* 查询机械详情详细
* @param id
*/
export const getMachineryDetail = (id: string | number): AxiosPromise<MachineryDetailVO> => {
return request({
url: '/machinery/machineryDetail/' + id,
method: 'get'
});
};
/**
* 新增机械详情
* @param data
*/
export const addMachineryDetail = (data: MachineryDetailForm) => {
return request({
url: '/machinery/machineryDetail',
method: 'post',
data: data
});
};
/**
* 修改机械详情
* @param data
*/
export const updateMachineryDetail = (data: MachineryDetailForm) => {
return request({
url: '/machinery/machineryDetail',
method: 'put',
data: data
});
};
/**
* 删除机械详情
* @param id
*/
export const delMachineryDetail = (id: string | number | Array<string | number>) => {
return request({
url: '/machinery/machineryDetail/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,156 @@
export interface MachineryDetailVO {
/**
* 主键id
*/
id: string | number;
/**
* 检验证编号
*/
checkoutNumber: string;
/**
* 检验单位
*/
checkoutUnit: string;
/**
* 检定日期/有效期
*/
checkoutDate: string;
/**
* 施工类型状态0正常 1停用
*/
status: number;
/**
* 0入场 1出场
*/
type: number;
/**
* 入场时间
*/
entryTime: string;
/**
* 备注
*/
remark: string;
/**
* 图片(英文逗号分隔)
*/
picture: string;
/**
* 机械主键id
*/
machineryId: string | number;
}
export interface MachineryDetailForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 检验证编号
*/
checkoutNumber?: string;
/**
* 检验单位
*/
checkoutUnit?: string;
/**
* 检定日期/有效期
*/
checkoutDate?: string;
/**
* 施工类型状态0正常 1停用
*/
status?: number;
/**
* 0入场 1出场
*/
type?: number;
/**
* 入场时间
*/
entryTime?: string;
/**
* 备注
*/
remark?: string;
/**
* 图片(英文逗号分隔)
*/
picture?: string;
/**
* 机械主键id
*/
machineryId?: string | number;
}
export interface MachineryDetailQuery extends PageQuery {
/**
* 检验证编号
*/
checkoutNumber?: string;
/**
* 检验单位
*/
checkoutUnit?: string;
/**
* 检定日期/有效期
*/
checkoutDate?: string;
/**
* 施工类型状态0正常 1停用
*/
status?: number;
/**
* 0入场 1出场
*/
type?: number;
/**
* 入场时间
*/
entryTime?: string;
/**
* 图片(英文逗号分隔)
*/
picture?: string;
/**
* 机械主键id
*/
machineryId?: string | number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from '@/api/project/constructionUser/types';
/**
* 查询施工人员列表
* @param query
* @returns {*}
*/
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
return request({
url: '/project/constructionUser/list',
method: 'get',
params: query
});
};
/**
* 查询施工人员详细
* @param id
*/
export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
return request({
url: '/project/constructionUser/' + id,
method: 'get'
});
};
/**
* 新增施工人员
* @param data
*/
export const addConstructionUser = (data: ConstructionUserForm) => {
return request({
url: '/project/constructionUser',
method: 'post',
data: data
});
};
/**
* 修改施工人员
* @param data
*/
export const updateConstructionUser = (data: ConstructionUserForm) => {
return request({
url: '/project/constructionUser',
method: 'put',
data: data
});
};
/**
* 删除施工人员
* @param id
*/
export const delConstructionUser = (id: string | number | Array<string | number>) => {
return request({
url: '/project/constructionUser/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,426 @@
export interface ConstructionUserVO {
/**
* 主键id
*/
id: string | number;
/**
* 微信id
*/
openid: string | number;
/**
* 微信名称
*/
nickName: string;
/**
* 人脸照
*/
pacePhoto: string;
/**
* 人员姓名
*/
userName: string;
/**
* 项目id
*/
projectId: string | number;
/**
* 分包公司id
*/
contractorId: string | number;
/**
* 班组id
*/
teamId: string | number;
/**
* 状态0在职 1离职
*/
status: number;
/**
* 是否代打
*/
isPinch: number;
/**
* 联系电话
*/
phone: string;
/**
* 0:保密 1:男 2女
*/
sex: number;
/**
* 民族
*/
nation: string;
/**
* 身份证号码
*/
sfzNumber: string;
/**
* 身份证有效开始期
*/
sfzStart: string;
/**
* 身份证有效结束期
*/
sfzEnd: string;
/**
* 身份证地址
*/
sfzSite: string;
/**
* 身份证出生日期
*/
sfzBirth: string;
/**
* 籍贯
*/
nativePlace: string;
/**
* 银行卡号
*/
yhkNumber: string;
/**
* 开户行
*/
yhkOpeningBank: string;
/**
* 持卡人
*/
yhkCardholder: string;
/**
* 工种(字典type_of_work)
*/
typeOfWork: number;
/**
* 打卡(0启用打卡 1禁止打卡)
*/
clock: number;
/**
* 入场时间
*/
entryDate: string;
/**
* 离场时间
*/
leaveDate: string;
/**
* 薪水
*/
salary: number;
/**
* 备注
*/
remark: string;
}
export interface ConstructionUserForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 微信id
*/
openid?: string | number;
/**
* 微信名称
*/
nickName?: string;
/**
* 人脸照
*/
pacePhoto?: string;
/**
* 人员姓名
*/
userName?: string;
/**
* 项目id
*/
projectId?: string | number;
/**
* 分包公司id
*/
contractorId?: string | number;
/**
* 班组id
*/
teamId?: string | number;
/**
* 状态0在职 1离职
*/
status?: number;
/**
* 是否代打
*/
isPinch?: number;
/**
* 联系电话
*/
phone?: string;
/**
* 0:保密 1:男 2女
*/
sex?: number;
/**
* 民族
*/
nation?: string;
/**
* 身份证号码
*/
sfzNumber?: string;
/**
* 身份证有效开始期
*/
sfzStart?: string;
/**
* 身份证有效结束期
*/
sfzEnd?: string;
/**
* 身份证地址
*/
sfzSite?: string;
/**
* 身份证出生日期
*/
sfzBirth?: string;
/**
* 籍贯
*/
nativePlace?: string;
/**
* 银行卡号
*/
yhkNumber?: string;
/**
* 开户行
*/
yhkOpeningBank?: string;
/**
* 持卡人
*/
yhkCardholder?: string;
/**
* 工种(字典type_of_work)
*/
typeOfWork?: number;
/**
* 打卡(0启用打卡 1禁止打卡)
*/
clock?: number;
/**
* 入场时间
*/
entryDate?: string;
/**
* 离场时间
*/
leaveDate?: string;
/**
* 薪水
*/
salary?: number;
/**
* 备注
*/
remark?: string;
}
export interface ConstructionUserQuery extends PageQuery {
/**
* 微信id
*/
openid?: string | number;
/**
* 微信名称
*/
nickName?: string;
/**
* 人脸照
*/
pacePhoto?: string;
/**
* 人员姓名
*/
userName?: string;
/**
* 项目id
*/
projectId?: string | number;
/**
* 分包公司id
*/
contractorId?: string | number;
/**
* 班组id
*/
teamId?: string | number;
/**
* 状态0在职 1离职
*/
status?: number;
/**
* 是否代打
*/
isPinch?: number;
/**
* 联系电话
*/
phone?: string;
/**
* 0:保密 1:男 2女
*/
sex?: number;
/**
* 民族
*/
nation?: string;
/**
* 身份证号码
*/
sfzNumber?: string;
/**
* 身份证有效开始期
*/
sfzStart?: string;
/**
* 身份证有效结束期
*/
sfzEnd?: string;
/**
* 身份证地址
*/
sfzSite?: string;
/**
* 身份证出生日期
*/
sfzBirth?: string;
/**
* 籍贯
*/
nativePlace?: string;
/**
* 银行卡号
*/
yhkNumber?: string;
/**
* 开户行
*/
yhkOpeningBank?: string;
/**
* 持卡人
*/
yhkCardholder?: string;
/**
* 工种(字典type_of_work)
*/
typeOfWork?: number;
/**
* 打卡(0启用打卡 1禁止打卡)
*/
clock?: number;
/**
* 入场时间
*/
entryDate?: string;
/**
* 离场时间
*/
leaveDate?: string;
/**
* 薪水
*/
salary?: number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ContractorVO, ContractorForm, ContractorQuery } from '@/api/project/contractor/types';
/**
* 查询分包单位列表
* @param query
* @returns {*}
*/
export const listContractor = (query?: ContractorQuery): AxiosPromise<ContractorVO[]> => {
return request({
url: '/project/contractor/list',
method: 'get',
params: query
});
};
/**
* 查询分包单位详细
* @param id
*/
export const getContractor = (id: string | number): AxiosPromise<ContractorVO> => {
return request({
url: '/project/contractor/' + id,
method: 'get'
});
};
/**
* 新增分包单位
* @param data
*/
export const addContractor = (data: ContractorForm) => {
return request({
url: '/project/contractor',
method: 'post',
data: data
});
};
/**
* 修改分包单位
* @param data
*/
export const updateContractor = (data: ContractorForm) => {
return request({
url: '/project/contractor',
method: 'put',
data: data
});
};
/**
* 删除分包单位
* @param id
*/
export const delContractor = (id: string | number | Array<string | number>) => {
return request({
url: '/project/contractor/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,111 @@
export interface ContractorVO {
/**
* 主键id
*/
id: string | number;
/**
* 公司名称
*/
name: string;
/**
* 负责人
*/
principal: string;
/**
* 负责人联系电话
*/
principalPhone: string;
/**
* 管理人
*/
custodian: string;
/**
* 管理人联系电话
*/
custodianPhone: string;
/**
* 备注
*/
remark: string;
}
export interface ContractorForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 公司名称
*/
name?: string;
/**
* 负责人
*/
principal?: string;
/**
* 负责人联系电话
*/
principalPhone?: string;
/**
* 管理人
*/
custodian?: string;
/**
* 管理人联系电话
*/
custodianPhone?: string;
/**
* 备注
*/
remark?: string;
}
export interface ContractorQuery extends PageQuery {
/**
* 公司名称
*/
name?: string;
/**
* 负责人
*/
principal?: string;
/**
* 负责人联系电话
*/
principalPhone?: string;
/**
* 管理人
*/
custodian?: string;
/**
* 管理人联系电话
*/
custodianPhone?: string;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ProjectTeamVO, ProjectTeamForm, ProjectTeamQuery } from '@/api/project/projectTeam/types';
/**
* 查询项目班组列表
* @param query
* @returns {*}
*/
export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectTeamVO[]> => {
return request({
url: '/project/projectTeam/list',
method: 'get',
params: query
});
};
/**
* 查询项目班组详细
* @param id
*/
export const getProjectTeam = (id: string | number): AxiosPromise<ProjectTeamVO> => {
return request({
url: '/project/projectTeam/' + id,
method: 'get'
});
};
/**
* 新增项目班组
* @param data
*/
export const addProjectTeam = (data: ProjectTeamForm) => {
return request({
url: '/project/projectTeam',
method: 'post',
data: data
});
};
/**
* 修改项目班组
* @param data
*/
export const updateProjectTeam = (data: ProjectTeamForm) => {
return request({
url: '/project/projectTeam',
method: 'put',
data: data
});
};
/**
* 删除项目班组
* @param id
*/
export const delProjectTeam = (id: string | number | Array<string | number>) => {
return request({
url: '/project/projectTeam/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,81 @@
export interface ProjectTeamVO {
/**
* 主键id
*/
id: string | number;
/**
* 项目id
*/
projectId: string | number;
/**
* 班组名称
*/
teamName: string;
/**
* 范围内打卡0范围内打卡 1任何地点打卡默认为1
*/
isClockIn: number;
/**
* 备注
*/
remark: string;
}
export interface ProjectTeamForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 项目id
*/
projectId?: string | number;
/**
* 班组名称
*/
teamName?: string;
/**
* 范围内打卡0范围内打卡 1任何地点打卡默认为1
*/
isClockIn?: number;
/**
* 备注
*/
remark?: string;
}
export interface ProjectTeamQuery extends PageQuery {
/**
* 项目id
*/
projectId?: string | number;
/**
* 班组名称
*/
teamName?: string;
/**
* 范围内打卡0范围内打卡 1任何地点打卡默认为1
*/
isClockIn?: number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } from '@/api/project/projectTeamMember/types';
/**
* 查询项目班组下的成员列表
* @param query
* @returns {*}
*/
export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<ProjectTeamMemberVO[]> => {
return request({
url: '/project/projectTeamMember/list',
method: 'get',
params: query
});
};
/**
* 查询项目班组下的成员详细
* @param id
*/
export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectTeamMemberVO> => {
return request({
url: '/project/projectTeamMember/' + id,
method: 'get'
});
};
/**
* 新增项目班组下的成员
* @param data
*/
export const addProjectTeamMember = (data: ProjectTeamMemberForm) => {
return request({
url: '/project/projectTeamMember',
method: 'post',
data: data
});
};
/**
* 修改项目班组下的成员
* @param data
*/
export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => {
return request({
url: '/project/projectTeamMember',
method: 'put',
data: data
});
};
/**
* 删除项目班组下的成员
* @param id
*/
export const delProjectTeamMember = (id: string | number | Array<string | number>) => {
return request({
url: '/project/projectTeamMember/' + id,
method: 'delete'
});
};

View File

@ -0,0 +1,96 @@
export interface ProjectTeamMemberVO {
/**
* 主键id
*/
id: string | number;
/**
* 班组id
*/
teamId: string | number;
/**
* 项目id
*/
projectId: string | number;
/**
* 施工人员id
*/
memberId: string | number;
/**
* 岗位默认为0普通员工1组长
*/
postId: string | number;
/**
* 备注
*/
remark: string;
}
export interface ProjectTeamMemberForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 班组id
*/
teamId?: string | number;
/**
* 项目id
*/
projectId?: string | number;
/**
* 施工人员id
*/
memberId?: string | number;
/**
* 岗位默认为0普通员工1组长
*/
postId?: string | number;
/**
* 备注
*/
remark?: string;
}
export interface ProjectTeamMemberQuery extends PageQuery {
/**
* 班组id
*/
teamId?: string | number;
/**
* 项目id
*/
projectId?: string | number;
/**
* 施工人员id
*/
memberId?: string | number;
/**
* 岗位默认为0普通员工1组长
*/
postId?: string | number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,253 @@
<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="机械名称" prop="machineryName">
<el-input v-model="queryParams.machineryName" placeholder="请输入机械名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="机械型号" prop="machineryNumber">
<el-input v-model="queryParams.machineryNumber" placeholder="请输入机械型号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="负责人" prop="principal">
<el-input v-model="queryParams.principal" 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="['machinery:machinery:add']"> 新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['machinery:machinery:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['machinery:machinery:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['machinery:machinery:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="machineryList" @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="machineryName" />
<el-table-column label="机械型号" align="center" prop="machineryNumber" />
<el-table-column label="数量" align="center" prop="number" />
<el-table-column label="负责人" align="center" prop="principal" />
<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="['machinery:machinery:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['machinery:machinery: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="machineryFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="机械名称" prop="machineryName">
<el-input v-model="form.machineryName" placeholder="请输入机械名称" />
</el-form-item>
<el-form-item label="机械型号" prop="machineryNumber">
<el-input v-model="form.machineryNumber" placeholder="请输入机械型号" />
</el-form-item>
<el-form-item label="数量" prop="number">
<el-input v-model="form.number" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="负责人" prop="principal">
<el-input v-model="form.principal" 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="Machinery" lang="ts">
import { addMachinery, delMachinery, getMachinery, listMachinery, updateMachinery } from '@/api/machinery/machinery';
import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const machineryList = ref<MachineryVO[]>([]);
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 machineryFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: MachineryForm = {
id: undefined,
machineryName: undefined,
machineryNumber: undefined,
projectId: currentProject.value.id,
number: undefined,
principal: undefined,
remark: undefined
};
const data = reactive<PageData<MachineryForm, MachineryQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
machineryName: undefined,
machineryNumber: undefined,
projectId: currentProject.value.id,
number: undefined,
principal: 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 listMachinery(queryParams.value);
machineryList.value = res.data.records;
total.value = res.data.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
machineryFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: MachineryVO[]) => {
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?: MachineryVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getMachinery(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改机械';
};
/** 提交按钮 */
const submitForm = () => {
machineryFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateMachinery(form.value).finally(() => (buttonLoading.value = false));
} else {
await addMachinery(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: MachineryVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除机械编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delMachinery(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'machinery/machinery/export',
{
...queryParams.value
},
`machinery_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

View File

@ -0,0 +1,281 @@
<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="检验证编号" prop="checkoutNumber">
<el-input v-model="queryParams.checkoutNumber" placeholder="请输入检验证编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检验单位" prop="checkoutUnit">
<el-input v-model="queryParams.checkoutUnit" placeholder="请输入检验单位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检定日期/有效期" prop="checkoutDate">
<el-input v-model="queryParams.checkoutDate" placeholder="请输入检定日期/有效期" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="入场时间" prop="entryTime">
<el-date-picker clearable
v-model="queryParams.entryTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择入场时间"
/>
</el-form-item>
<el-form-item label="图片(英文逗号分隔)" prop="picture">
<el-input v-model="queryParams.picture" placeholder="请输入图片(英文逗号分隔)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="机械主键id" prop="machineryId">
<el-input v-model="queryParams.machineryId" placeholder="请输入机械主键id" 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="['machinery:machineryDetail:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['machinery:machineryDetail:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['machinery:machineryDetail:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['machinery:machineryDetail:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="machineryDetailList" @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="检验证编号" align="center" prop="checkoutNumber" />
<el-table-column label="检验单位" align="center" prop="checkoutUnit" />
<el-table-column label="检定日期/有效期" align="center" prop="checkoutDate" />
<el-table-column label="施工类型状态" align="center" prop="status" />
<el-table-column label="0入场 1出场" align="center" prop="type" />
<el-table-column label="入场时间" align="center" prop="entryTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.entryTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="图片(英文逗号分隔)" align="center" prop="picture" />
<el-table-column label="机械主键id" align="center" prop="machineryId" />
<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="['machinery:machineryDetail:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['machinery:machineryDetail: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="machineryDetailFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="检验证编号" prop="checkoutNumber">
<el-input v-model="form.checkoutNumber" placeholder="请输入检验证编号" />
</el-form-item>
<el-form-item label="检验单位" prop="checkoutUnit">
<el-input v-model="form.checkoutUnit" placeholder="请输入检验单位" />
</el-form-item>
<el-form-item label="检定日期/有效期" prop="checkoutDate">
<el-input v-model="form.checkoutDate" placeholder="请输入检定日期/有效期" />
</el-form-item>
<el-form-item label="入场时间" prop="entryTime">
<el-date-picker clearable
v-model="form.entryTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择入场时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="图片(英文逗号分隔)" prop="picture">
<el-input v-model="form.picture" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="机械主键id" prop="machineryId">
<el-input v-model="form.machineryId" placeholder="请输入机械主键id" />
</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="MachineryDetail" lang="ts">
import { listMachineryDetail, getMachineryDetail, delMachineryDetail, addMachineryDetail, updateMachineryDetail } from '@/api/machinery/machineryDetail';
import { MachineryDetailVO, MachineryDetailQuery, MachineryDetailForm } from '@/api/machinery/machineryDetail/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const machineryDetailList = ref<MachineryDetailVO[]>([]);
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 machineryDetailFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: MachineryDetailForm = {
id: undefined,
checkoutNumber: undefined,
checkoutUnit: undefined,
checkoutDate: undefined,
status: undefined,
type: undefined,
entryTime: undefined,
remark: undefined,
picture: undefined,
machineryId: undefined,
}
const data = reactive<PageData<MachineryDetailForm, MachineryDetailQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
checkoutNumber: undefined,
checkoutUnit: undefined,
checkoutDate: undefined,
status: undefined,
type: undefined,
entryTime: undefined,
picture: undefined,
machineryId: 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 listMachineryDetail(queryParams.value);
machineryDetailList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
machineryDetailFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: MachineryDetailVO[]) => {
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?: MachineryDetailVO) => {
reset();
const _id = row?.id || ids.value[0]
const res = await getMachineryDetail(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改机械详情";
}
/** 提交按钮 */
const submitForm = () => {
machineryDetailFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateMachineryDetail(form.value).finally(() => buttonLoading.value = false);
} else {
await addMachineryDetail(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: MachineryDetailVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除机械详情编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
await delMachineryDetail(_ids);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('machinery/machineryDetail/export', {
...queryParams.value
}, `machineryDetail_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

View File

@ -7,9 +7,6 @@
<el-form-item label="公司名称" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入公司名称" 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="资质情况" prop="qualification">
<el-input v-model="queryParams.qualification" placeholder="请输入资质情况" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -45,15 +42,10 @@
</el-row>
</template>
<el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="companyList" @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="序号" type="index" width="60" align="center" />
<el-table-column label="项目名称" align="center">
<template #default="scope">
{{ getProjectName(scope.row.projectId) }}
</template>
</el-table-column>
<el-table-column label="公司名称" align="center" prop="companyName" />
<el-table-column label="公司状态" align="center" prop="status">
<template #default="{ row }">
@ -70,7 +62,6 @@
</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="资质情况" align="center" prop="qualification" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -94,9 +85,6 @@
<el-form-item label="公司名称" prop="companyName">
<el-input v-model="form.companyName" 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="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
@ -115,11 +103,18 @@
</template>
<script setup name="Company" lang="ts">
import { listCompany, getCompany, delCompany, addCompany, updateCompany } from '@/api/materials/company';
import { CompanyVO, CompanyQuery, CompanyForm } from '@/api/materials/company/types';
import { addCompany, delCompany, getCompany, listCompany, updateCompany } from '@/api/materials/company';
import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const projectList = computed(() => userStore.projects);
const currentProject = computed(() => userStore.selectedProject);
const companyList = ref<CompanyVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -140,7 +135,7 @@ const dialog = reactive<DialogOption>({
const initFormData: CompanyForm = {
id: undefined,
companyName: undefined,
projectId: undefined,
projectId: currentProject.value.id,
status: undefined,
remark: undefined,
qualification: undefined
@ -151,7 +146,7 @@ const data = reactive<PageData<CompanyForm, CompanyQuery>>({
pageNum: 1,
pageSize: 10,
companyName: undefined,
projectId: undefined,
projectId: currentProject.value.id,
status: undefined,
qualification: undefined,
params: {}
@ -168,7 +163,7 @@ const getList = async () => {
loading.value = true;
const res = await listCompany(queryParams.value);
companyList.value = res.data.records;
total.value = res.total;
total.value = res.data.total;
loading.value = false;
};
@ -260,25 +255,4 @@ const handleExport = () => {
onMounted(() => {
getList();
});
import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const projectList = computed(() => userStore.projects);
const currentProject = computed(() => userStore.selectedProject);
const materialsInventoryList = computed(() => {
// 如果有选中的项目,则只显示该项目的数据
if (currentProject.value && currentProject.value.id) {
return companyList.value.filter((item) => item.projectId === currentProject.value.id);
}
// 没有选中项目则显示所有数据
return companyList.value;
});
// 根据 projectId 获取对应的 projectName
const getProjectName = (projectId) => {
const project = projectList.value.find((p) => p.id === projectId);
return project ? project.name : projectId; // 如果找不到对应的项目名,则显示 ID
};
</script>

View File

@ -7,51 +7,6 @@
<el-form-item label="材料名称" prop="materialsName">
<el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="公司id" prop="companyId">
<el-input v-model="queryParams.companyId" 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="规格型号名称" prop="typeSpecificationName">
<el-input v-model="queryParams.typeSpecificationName" placeholder="请输入规格型号名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格型号文件路径" prop="typeSpecificationUrl">
<el-input v-model="queryParams.typeSpecificationUrl" placeholder="请输入规格型号文件路径" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="合格证编号名称" prop="certificateConformityName">
<el-input v-model="queryParams.certificateConformityName" placeholder="请输入合格证编号名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="合格证编号文件路径" prop="certificateConformityUrl">
<el-input v-model="queryParams.certificateConformityUrl" placeholder="请输入合格证编号文件路径" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="质量说明书编号" prop="qualityName">
<el-input v-model="queryParams.qualityName" placeholder="请输入质量说明书编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="质量说明书文件路径" prop="qualityUrl">
<el-input v-model="queryParams.qualityUrl" placeholder="请输入质量说明书文件路径" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检验报告编号" prop="inspectionReportName">
<el-input v-model="queryParams.inspectionReportName" placeholder="请输入检验报告编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检验报告文件路径" prop="inspectionReportUrl">
<el-input v-model="queryParams.inspectionReportUrl" placeholder="请输入检验报告文件路径" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="复试报告编号" prop="reexamineReportName">
<el-input v-model="queryParams.reexamineReportName" placeholder="请输入复试报告编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="复试报告文件路径" prop="reexamineReportUrl">
<el-input v-model="queryParams.reexamineReportUrl" placeholder="请输入复试报告文件路径" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="使用部位" prop="usePart">
<el-input v-model="queryParams.usePart" placeholder="请输入使用部位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="计量单位" prop="weightId">
<el-input v-model="queryParams.weightId" placeholder="请输入计量单位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="预计材料数量" prop="quantityCount">
<el-input v-model="queryParams.quantityCount" 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>
@ -84,18 +39,11 @@
</el-row>
</template>
<el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="materialsList" @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="序号" type="index" width="60" align="center" />
<el-table-column label="材料名称" align="center" prop="materialsName" />
<!-- <el-table-column label="公司id" align="center" prop="companyId" /> -->
<el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
<el-table-column label="项目名称" align="center" prop="">
<template #default="scope">
{{ getProjectName(scope.row.projectId) }}
</template>
</el-table-column>
<el-table-column label="规格型号名称" align="center" prop="typeSpecificationName" />
<el-table-column label="规格型号文件路径" align="center" prop="typeSpecificationUrl" />
<el-table-column label="合格证编号名称" align="center" prop="certificateConformityName" />
@ -148,9 +96,6 @@
<!-- <el-form-item label="公司id" prop="companyId">
<el-input v-model="form.companyId" 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="规格型号名称" prop="typeSpecificationName">
<el-input v-model="form.typeSpecificationName" placeholder="请输入规格型号名称" />
</el-form-item>
@ -205,11 +150,16 @@
</template>
<script setup name="Materials" lang="ts">
import { listMaterials, getMaterials, delMaterials, addMaterials, updateMaterials } from '@/api/materials/materials';
import { MaterialsVO, MaterialsQuery, MaterialsForm } from '@/api/materials/materials/types';
import { addMaterials, delMaterials, getMaterials, listMaterials, updateMaterials } from '@/api/materials/materials';
import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const materialsList = ref<MaterialsVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -231,7 +181,7 @@ const initFormData: MaterialsForm = {
id: undefined,
materialsName: undefined,
companyId: undefined,
projectId: undefined,
projectId: currentProject.value.id,
companyVo: undefined,
typeSpecificationName: undefined,
typeSpecificationUrl: undefined,
@ -256,7 +206,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
pageSize: 10,
materialsName: undefined,
companyId: undefined,
projectId: undefined,
projectId: currentProject.value.id,
companyVo: undefined,
typeSpecificationName: undefined,
typeSpecificationUrl: undefined,
@ -286,7 +236,7 @@ const getList = async () => {
loading.value = true;
const res = await listMaterials(queryParams.value);
materialsList.value = res.data.records;
total.value = res.total;
total.value = res.data.total;
loading.value = false;
};
@ -375,27 +325,6 @@ const handleExport = () => {
);
};
import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const projectList = computed(() => userStore.projects);
const currentProject = computed(() => userStore.selectedProject);
const materialsInventoryList = computed(() => {
// 如果有选中的项目,则只显示该项目的数据
if (currentProject.value && currentProject.value.id) {
return materialsList.value.filter((item) => item.projectId === currentProject.value.id);
}
// 没有选中项目则显示所有数据
return materialsList.value;
});
// 根据 projectId 获取对应的 projectName
const getProjectName = (projectId) => {
const project = projectList.value.find((p) => p.id === projectId);
return project ? project.name : projectId; // 如果找不到对应的项目名,则显示 ID
};
onMounted(() => {
getList();
});

View File

@ -4,12 +4,6 @@
<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="materialsId">
<el-input v-model="queryParams.materialsId" 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="出入库状态" prop="outPut">
<el-input v-model="queryParams.outPut" placeholder="请输入出入库状态" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -82,17 +76,12 @@
</el-row>
</template>
<el-table v-loading="loading" :data="materialsInventoryListNew" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="materialsInventoryList" @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="序号" type="index" width="60" align="center" />
<!-- <el-table-column label="材料id" align="center" prop="materialsId" /> -->
<el-table-column label="材料名称" align="center" prop="materialsVo.materialsName" />
<el-table-column label="项目名称" align="center">
<template #default="scope">
{{ getProjectName(scope.row.projectId) }}
</template>
</el-table-column>
<el-table-column label="出入库状态" align="center" prop="outPut" />
<el-table-column label="出/入库的数量" align="center" prop="number" />
<el-table-column label="出/入库操作时间" align="center" prop="outPutTime" width="180">
@ -186,16 +175,21 @@
<script setup name="MaterialsInventory" lang="ts">
import {
listMaterialsInventory,
getMaterialsInventory,
delMaterialsInventory,
addMaterialsInventory,
delMaterialsInventory,
getMaterialsInventory,
listMaterialsInventory,
updateMaterialsInventory
} from '@/api/materials/materialsInventory';
import { MaterialsInventoryVO, MaterialsInventoryQuery, MaterialsInventoryForm } from '@/api/materials/materialsInventory/types';
import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const materialsInventoryList = ref<MaterialsInventoryVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -216,7 +210,7 @@ const dialog = reactive<DialogOption>({
const initFormData: MaterialsInventoryForm = {
id: undefined,
materialsId: undefined,
projectId: undefined,
projectId: currentProject.value.id,
outPut: undefined,
number: undefined,
outPutTime: undefined,
@ -239,7 +233,7 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
pageNum: 1,
pageSize: 10,
materialsId: undefined,
projectId: undefined,
projectId: currentProject.value.id,
outPut: undefined,
number: undefined,
outPutTime: undefined,
@ -269,7 +263,7 @@ const getList = async () => {
loading.value = true;
const res = await listMaterialsInventory(queryParams.value);
materialsInventoryList.value = res.data.records;
total.value = res.total;
total.value = res.data.total;
loading.value = false;
};
@ -357,27 +351,6 @@ const handleExport = () => {
`materialsInventory_${new Date().getTime()}.xlsx`
);
};
import { useUserStoreHook } from '@/store/modules/user';
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const projectList = computed(() => userStore.projects);
const currentProject = computed(() => userStore.selectedProject);
const materialsInventoryListNew = computed(() => {
// 如果有选中的项目,则只显示该项目的数据
if (currentProject.value && currentProject.value.id) {
return materialsInventoryList.value.filter((item) => item.projectId === currentProject.value.id);
}
// 没有选中项目则显示所有数据
return materialsInventoryList.value;
});
// 根据 projectId 获取对应的 projectName
const getProjectName = (projectId) => {
const project = projectList.value.find((p) => p.id === projectId);
return project ? project.name : projectId; // 如果找不到对应的项目名,则显示 ID
};
onMounted(() => {
getList();
});

View File

@ -1,44 +0,0 @@
<script setup lang="ts">
// 模拟分包单位数据列表
const subcontractedUnits = [
{ id: 1, name: '分包单位A' },
{ id: 2, name: '分包单位B' },
{ id: 3, name: '分包单位C' }
];
// 模拟一个方法,点击按钮时触发
const handleButtonClick = () => {
console.log('点击了按钮,对分包单位进行操作');
};
</script>
<template>
<div>
<h1>分包单位</h1>
<ul>
<li v-for="unit in subcontractedUnits" :key="unit.id">{{ unit.name }}</li>
</ul>
<button @click="handleButtonClick">操作分包单位</button>
</div>
</template>
<style scoped lang="scss">
/* 这里可以添加一些样式,比如设置列表样式和按钮样式 */
ul {
list-style-type: none;
padding: 0;
}
li {
margin: 5px 0;
}
button {
padding: 8px 16px;
background-color: #007bff;
color: white;
border: none;
border-radius: 4px;
cursor: pointer;
}
</style>

View File

@ -1,10 +0,0 @@
<script setup lang="ts">
</script>
<template>
<div><h1>班组分配</h1></div>
</template>
<style scoped lang="scss">
</style>

View File

@ -1,151 +0,0 @@
<script setup lang="ts">
import { computed } from 'vue';
import { useUserStore } from '@/store/modules/user';
import { storeToRefs } from 'pinia';
// 获取用户存储
const userStore = useUserStore();
// 使 selectedProject 保持响应式
const { selectedProject } = storeToRefs(userStore);
// 模拟不同项目的施工人员数据
const projectWorkers = [
{
projectId: '1897160897167638529',
workers: [
{ id: 1, name: '张三', role: '工头', phone: '13800000001' },
{ id: 2, name: '李四', role: '电工', phone: '13800000002' },
{ id: 3, name: '王五', role: '焊工', phone: '13800000003' }
]
},
{
projectId: '1897161054676336641',
workers: [
{ id: 4, name: '赵六', role: '木工', phone: '13800000004' },
{ id: 5, name: '孙七', role: '油漆工', phone: '13800000005' },
{ id: 6, name: '周八', role: '瓦工', phone: '13800000006' }
]
},
{
projectId: '1897161104060071938',
workers: [
{ id: 7, name: '吴九', role: '钢筋工', phone: '13800000007' },
{ id: 8, name: '郑十', role: '施工员', phone: '13800000008' },
{ id: 9, name: '冯十一', role: '安全员', phone: '13800000009' }
]
}
];
// 计算当前项目的施工人员
const workers = computed(() => {
const project = projectWorkers.find((p) => p.projectId === selectedProject.value?.id);
return project ? project.workers : [];
});
</script>
<template>
<div class="container">
<h1>施工人员列表</h1>
<div class="project-info">
<span class="label">当前选中的项目</span>
<span class="project-name">{{ selectedProject?.name || '未选择项目' }}</span>
</div>
<div class="workers-list">
<h2>施工人员</h2>
<ul v-if="workers.length > 0">
<li v-for="worker in workers" :key="worker.id">
<span class="worker-name">{{ worker.name }}</span>
<span class="worker-role">{{ worker.role }}</span>
<span class="worker-phone">{{ worker.phone }}</span>
</li>
</ul>
<p v-else class="no-workers">暂无施工人员数据</p>
</div>
</div>
</template>
<style scoped lang="scss">
.container {
padding: 20px;
background-color: #f9f9f9;
border-radius: 10px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
text-align: center;
}
h1 {
font-size: 24px;
color: #333;
margin-bottom: 15px;
}
.project-info {
padding: 10px;
background: #fff;
border-radius: 8px;
display: inline-block;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
}
.label {
font-size: 16px;
color: #666;
}
.project-name {
font-size: 18px;
font-weight: bold;
color: #007bff;
margin-left: 5px;
}
.workers-list {
margin-top: 20px;
background: #fff;
padding: 15px;
border-radius: 10px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
text-align: left;
}
h2 {
font-size: 20px;
color: #444;
margin-bottom: 10px;
}
ul {
list-style: none;
padding: 0;
}
li {
padding: 8px 0;
border-bottom: 1px solid #ddd;
display: flex;
justify-content: space-between;
align-items: center;
}
.worker-name {
font-size: 16px;
font-weight: bold;
color: #333;
}
.worker-role {
font-size: 14px;
color: #666;
}
.worker-phone {
font-size: 14px;
color: #888;
}
.no-workers {
font-size: 16px;
color: #999;
margin-top: 10px;
}
</style>

View File

@ -0,0 +1,385 @@
<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="人员姓名" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入人员姓名" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="分包公司id" prop="contractorId">
<el-input v-model="queryParams.contractorId" placeholder="请输入分包公司id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工种(字典type_of_work)" prop="typeOfWork">
<el-input v-model="queryParams.typeOfWork" placeholder="请输入工种(字典type_of_work)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="打卡(0启用打卡 1禁止打卡)" prop="clock">
<el-input v-model="queryParams.clock" placeholder="请输入打卡(0启用打卡 1禁止打卡)" 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:constructionUser:add']">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:constructionUser:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:constructionUser:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:constructionUser:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="constructionUserList" @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="userName" />
<el-table-column label="分包公司id" align="center" prop="contractorId" />
<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="0:保密 1:男 2女" align="center" prop="sex" />
<el-table-column label="民族" align="center" prop="nation" />
<el-table-column label="身份证号码" align="center" prop="sfzNumber" />
<el-table-column label="工种(字典type_of_work)" align="center" prop="typeOfWork">
<template #default="scope">
<dict-tag :options="type_of_work" :value="scope.row.typeOfWork" />
</template>
</el-table-column>
<el-table-column label="打卡(0启用打卡 1禁止打卡)" align="center" prop="clock" />
<el-table-column label="入场时间" align="center" prop="entryDate" />
<el-table-column label="离场时间" align="center" prop="leaveDate" />
<el-table-column label="薪水" align="center" prop="salary" />
<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>
</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="constructionUserFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="微信id" prop="openid">
<el-input v-model="form.openid" placeholder="请输入微信id" />
</el-form-item>
<el-form-item label="微信名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入微信名称" />
</el-form-item>
<el-form-item label="人脸照" prop="pacePhoto">
<el-input v-model="form.pacePhoto" type="textarea" placeholder="请输入内容" />
</el-form-item>
<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>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" />
</el-form-item>
<el-form-item label="身份证号码" prop="sfzNumber">
<el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="身份证有效开始期" prop="sfzStart">
<el-input v-model="form.sfzStart" placeholder="请输入身份证有效开始期" />
</el-form-item>
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-input v-model="form.sfzEnd" 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-form-item>
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
<el-form-item label="银行卡号" prop="yhkNumber">
<el-input v-model="form.yhkNumber" placeholder="请输入银行卡号" />
</el-form-item>
<el-form-item label="开户行" prop="yhkOpeningBank">
<el-input v-model="form.yhkOpeningBank" placeholder="请输入开户行" />
</el-form-item>
<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>
<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>
<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="ConstructionUser" lang="ts">
import {
addConstructionUser,
delConstructionUser,
getConstructionUser,
listConstructionUser,
updateConstructionUser
} from '@/api/project/constructionUser';
import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const constructionUserList = ref<ConstructionUserVO[]>([]);
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 constructionUserFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ConstructionUserForm = {
id: undefined,
openid: undefined,
nickName: undefined,
pacePhoto: undefined,
userName: undefined,
projectId: currentProject.value.id,
contractorId: undefined,
teamId: undefined,
status: undefined,
isPinch: undefined,
phone: undefined,
sex: undefined,
nation: undefined,
sfzNumber: undefined,
sfzStart: undefined,
sfzEnd: undefined,
sfzSite: undefined,
sfzBirth: undefined,
nativePlace: undefined,
yhkNumber: undefined,
yhkOpeningBank: undefined,
yhkCardholder: undefined,
typeOfWork: undefined,
clock: undefined,
entryDate: undefined,
leaveDate: undefined,
salary: undefined,
remark: undefined
};
const data = reactive<PageData<ConstructionUserForm, ConstructionUserQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
openid: undefined,
nickName: undefined,
pacePhoto: undefined,
userName: undefined,
projectId: currentProject.value.id,
contractorId: undefined,
teamId: undefined,
status: undefined,
isPinch: undefined,
phone: undefined,
sex: undefined,
nation: undefined,
sfzNumber: undefined,
sfzStart: undefined,
sfzEnd: undefined,
sfzSite: undefined,
sfzBirth: undefined,
nativePlace: undefined,
yhkNumber: undefined,
yhkOpeningBank: undefined,
yhkCardholder: undefined,
typeOfWork: undefined,
clock: undefined,
entryDate: undefined,
leaveDate: undefined,
salary: undefined,
params: {}
},
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' }]
}
});
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;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
constructionUserFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ConstructionUserVO[]) => {
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?: ConstructionUserVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getConstructionUser(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改施工人员';
};
/** 提交按钮 */
const submitForm = () => {
constructionUserFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateConstructionUser(form.value).finally(() => (buttonLoading.value = false));
} else {
await addConstructionUser(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ConstructionUserVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除施工人员编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delConstructionUser(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'project/constructionUser/export',
{
...queryParams.value
},
`constructionUser_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

View File

@ -0,0 +1,257 @@
<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="公司名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入公司名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="负责人" prop="principal">
<el-input v-model="queryParams.principal" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="负责人联系电话" prop="principalPhone">
<el-input v-model="queryParams.principalPhone" placeholder="请输入负责人联系电话" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="管理人" prop="custodian">
<el-input v-model="queryParams.custodian" placeholder="请输入管理人" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="管理人联系电话" prop="custodianPhone">
<el-input v-model="queryParams.custodianPhone" 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:contractor:add']"> 新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:contractor:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:contractor:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:contractor:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="contractorList" @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="name" />
<el-table-column label="负责人" align="center" prop="principal" />
<el-table-column label="负责人联系电话" align="center" prop="principalPhone" />
<el-table-column label="管理人" align="center" prop="custodian" />
<el-table-column label="管理人联系电话" align="center" prop="custodianPhone" />
<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>
</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="contractorFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="公司名称" prop="name">
<el-input v-model="form.name" placeholder="请输入公司名称" />
</el-form-item>
<el-form-item label="负责人" prop="principal">
<el-input v-model="form.principal" placeholder="请输入负责人" />
</el-form-item>
<el-form-item label="负责人联系电话" prop="principalPhone">
<el-input v-model="form.principalPhone" placeholder="请输入负责人联系电话" />
</el-form-item>
<el-form-item label="管理人" prop="custodian">
<el-input v-model="form.custodian" placeholder="请输入管理人" />
</el-form-item>
<el-form-item label="管理人联系电话" prop="custodianPhone">
<el-input v-model="form.custodianPhone" 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="Contractor" lang="ts">
import { addContractor, delContractor, getContractor, listContractor, updateContractor } from '@/api/project/contractor';
import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const contractorList = ref<ContractorVO[]>([]);
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 contractorFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ContractorForm = {
id: undefined,
name: undefined,
principal: undefined,
principalPhone: undefined,
custodian: undefined,
custodianPhone: undefined,
remark: undefined
};
const data = reactive<PageData<ContractorForm, ContractorQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
principal: undefined,
principalPhone: undefined,
custodian: undefined,
custodianPhone: 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 listContractor(queryParams.value);
contractorList.value = res.data.records;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
contractorFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ContractorVO[]) => {
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?: ContractorVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getContractor(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改分包单位';
};
/** 提交按钮 */
const submitForm = () => {
contractorFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateContractor(form.value).finally(() => (buttonLoading.value = false));
} else {
await addContractor(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ContractorVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除分包单位编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delContractor(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'project/contractor/export',
{
...queryParams.value
},
`contractor_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

View File

@ -89,7 +89,7 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="" align="center" prop="id" v-if="true" />
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目简称" align="center" prop="shortName" />
<!-- <el-table-column label="父项目id" align="center" prop="pId" /> -->

View File

@ -27,7 +27,7 @@ const selectedProjects = ref<number[]>([]);
const getProjectList = async () => {
try {
const res = await listProject();
allProjects.value = res.records.map((project) => ({
allProjects.value = res.data.records.map((project) => ({
key: project.id,
label: project.projectName
}));
@ -41,8 +41,8 @@ const getUserProjects = async () => {
const res = await listUserProjects({ userId: props.userId });
// 使 res.records res.rows
selectedProjects.value = Array.isArray(res.records)
? res.records.map((item) => item.projectId)
selectedProjects.value = Array.isArray(res.data.records)
? res.data.records.map((item) => item.projectId)
: [];
console.log('已加载用户关联项目:', selectedProjects.value);

View File

@ -0,0 +1,81 @@
<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>-->
</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';
interface Props {
row: 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 projectTeamMemberList = ref<ProjectTeamMemberVO[]>([]);
const total = ref(0);
const loading = ref(true);
/** 查询项目班组下的成员列表 */
const getList = async () => {
loading.value = true;
// 转换搜索参数
const params = {
...searchParams.value
};
const res = await listProjectTeamMember(params);
projectTeamMemberList.value = res.data.records;
total.value = res.data.total;
loading.value = false;
};
// 打开弹窗
const openModal = () => {
visible.value = true;
};
// 关闭弹窗
const closeModal = () => {
visible.value = false;
};
// 暴露函数给父组件
defineExpose({
openModal
});
onMounted(() => {
getList();
});
</script>

View File

@ -0,0 +1,250 @@
<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="班组名称" prop="teamName">
<el-input v-model="queryParams.teamName" 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: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>
</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>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:projectTeam:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="projectTeamList" @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="teamName" />
<el-table-column label="范围内打卡" align="center" prop="isClockIn" />
<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>
</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="projectTeamFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="班组名称" prop="teamName">
<el-input v-model="form.teamName" placeholder="请输入班组名称" />
</el-form-item>
<el-form-item label="打卡范围" prop="isClockIn">
<el-input v-model="form.isClockIn" 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>
<user-list-dialog ref="userListVisible" :row="currentRow" />
</div>
</template>
<script setup name="ProjectTeam" lang="ts">
import { addProjectTeam, delProjectTeam, getProjectTeam, listProjectTeam, updateProjectTeam } from '@/api/project/projectTeam';
import { ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
import { useUserStoreHook } from '@/store/modules/user';
import UserListDialog from '@/views/project/projectTeam/component/UserListDialog.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const projectTeamList = ref<ProjectTeamVO[]>([]);
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 userListVisible = ref();
const currentRow = ref<ProjectTeamVO>();
const queryFormRef = ref<ElFormInstance>();
const projectTeamFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ProjectTeamForm = {
id: undefined,
projectId: currentProject.value.id,
teamName: undefined,
isClockIn: undefined,
remark: undefined
};
const data = reactive<PageData<ProjectTeamForm, ProjectTeamQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: currentProject.value.id,
teamName: undefined,
isClockIn: undefined,
params: {}
},
rules: {
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
isClockIn: [{ required: true, message: '范围内打卡不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询项目班组列表 */
const getList = async () => {
loading.value = true;
const res = await listProjectTeam(queryParams.value);
projectTeamList.value = res.data.records;
total.value = res.data.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
projectTeamFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ProjectTeamVO[]) => {
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?: ProjectTeamVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getProjectTeam(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改项目班组';
};
/** */
const handleUserList = (row?: ProjectTeamVO) => {
if (userListVisible.value) {
currentRow.value = row;
userListVisible.value.openModal();
}
};
/** 提交按钮 */
const submitForm = () => {
projectTeamFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.projectId = currentProject.value.id;
if (form.value.id) {
await updateProjectTeam(form.value).finally(() => (buttonLoading.value = false));
} else {
await addProjectTeam(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ProjectTeamVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除项目班组编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delProjectTeam(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'project/projectTeam/export',
{
...queryParams.value
},
`projectTeam_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

View File

@ -0,0 +1,272 @@
<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>

View File

@ -60,7 +60,7 @@
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
<el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
<el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()"> 新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
@ -76,13 +76,15 @@
<el-dropdown class="mt-[1px]">
<el-button plain type="info">
更多
<el-icon class="el-icon--right"><arrow-down /></el-icon
></el-button>
<el-icon class="el-icon--right">
<arrow-down />
</el-icon>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
<el-dropdown-item v-has-permi="['system:user:import']" icon="Top" @click="handleImport">导入数据</el-dropdown-item>
<el-dropdown-item v-has-permi="['system:user:export']" icon="Download" @click="handleExport">导出数据</el-dropdown-item>
<el-dropdown-item v-has-permi="['system:user:import']" icon="Top" @click="handleImport">导入数据 </el-dropdown-item>
<el-dropdown-item v-has-permi="['system:user:export']" icon="Download" @click="handleExport"> 导出数据 </el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@ -127,13 +129,7 @@
<el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.userId !== 1" content="编辑关联项目" placement="top">
<el-button
v-hasPermi="['system:user:edit']"
link
type="primary"
icon="Edit"
@click="handleUpdateProject(scope.row)"
></el-button>
<el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdateProject(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -211,7 +207,7 @@
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -280,9 +276,12 @@
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<template #tip>
<div class="text-center el-upload__tip">
<div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
<div class="el-upload__tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板 </el-link>
</div>
</template>
</el-upload>
@ -301,14 +300,12 @@ import api from '@/api/system/user';
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
import { RoleVO } from '@/api/system/role/types';
import { PostQuery, PostVO } from '@/api/system/post/types';
import { treeselect } from '@/api/system/dept';
import { PostVO } from '@/api/system/post/types';
import { globalHeaders } from '@/utils/request';
import { to } from 'await-to-js';
import { optionselect } from '@/api/system/post';
import ShuttleFrame from '../../project/projectRelevancy/component/ShuttleFrame.vue';
import { ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
import ShuttleFrame from '../../personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue';
const router = useRouter();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));