diff --git a/plus-ui/src/api/project/workWage/index.ts b/plus-ui/src/api/project/workWage/index.ts new file mode 100644 index 00000000..01ed29d3 --- /dev/null +++ b/plus-ui/src/api/project/workWage/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { WorkWageVO, WorkWageForm, WorkWageQuery } from '@/api/project/workWage/types'; + +/** + * 查询工种薪水列表 + * @param query + * @returns {*} + */ + +export const listWorkWage = (query?: WorkWageQuery): AxiosPromise => { + return request({ + url: '/project/workWage/list', + method: 'get', + params: query + }); +}; + +/** + * 查询工种薪水详细 + * @param id + */ +export const getWorkWage = (id: string | number): AxiosPromise => { + return request({ + url: '/project/workWage/' + id, + method: 'get' + }); +}; + +/** + * 新增工种薪水 + * @param data + */ +export const addWorkWage = (data: WorkWageForm) => { + return request({ + url: '/project/workWage', + method: 'post', + data: data + }); +}; + +/** + * 修改工种薪水 + * @param data + */ +export const updateWorkWage = (data: WorkWageForm) => { + return request({ + url: '/project/workWage', + method: 'put', + data: data + }); +}; + +/** + * 删除工种薪水 + * @param id + */ +export const delWorkWage = (id: string | number | Array) => { + return request({ + url: '/project/workWage/' + id, + method: 'delete' + }); +}; diff --git a/plus-ui/src/api/project/workWage/types.ts b/plus-ui/src/api/project/workWage/types.ts new file mode 100644 index 00000000..75a59898 --- /dev/null +++ b/plus-ui/src/api/project/workWage/types.ts @@ -0,0 +1,131 @@ +export interface WorkWageVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 工种 + */ + workType: string; + + /** + * 是否是特种兵（1是 2否） + */ + isSpecialType: string; + + /** + * 工资计算方式（1计时 2计件） + */ + wageCalculationType: string; + + /** + * 工资标准 + */ + wage: number; + + /** + * 工资计量单位 + */ + wageMeasureUnit: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface SpecialType{ + label:string;//名称 + value:number | string;//id +} + +export interface WorkWageForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 工种 + */ + workType?: string; + + /** + * 是否是特种兵（1是 2否） + */ + isSpecialType?: string; + + /** + * 工资计算方式（1计时 2计件） + */ + wageCalculationType?: string; + + /** + * 工资标准 + */ + wage?: number; + + /** + * 工资计量单位 + */ + wageMeasureUnit?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface WorkWageQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 工种 + */ + workType?: string; + + /** + * 是否是特种兵（1是 2否） + */ + isSpecialType?: string; + + /** + * 工资计算方式（1计时 2计件） + */ + wageCalculationType?: string; + + /** + * 工资标准 + */ + wage?: number; + + /** + * 工资计量单位 + */ + wageMeasureUnit?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/plus-ui/src/views/materials/materials/index.vue b/plus-ui/src/views/materials/materials/index.vue index b80d0836..dd738c53 100644 --- a/plus-ui/src/views/materials/materials/index.vue +++ b/plus-ui/src/views/materials/materials/index.vue @@ -134,9 +134,9 @@ - + - + diff --git a/plus-ui/src/views/project/constructionUser/index.vue b/plus-ui/src/views/project/constructionUser/index.vue index 8159aff5..3e2ea582 100644 --- a/plus-ui/src/views/project/constructionUser/index.vue +++ b/plus-ui/src/views/project/constructionUser/index.vue @@ -114,77 +114,134 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+
用户信息
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
银行卡
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
单位信息
+
+
+ + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + +
+
+
- + - + @@ -214,6 +271,7 @@ import { listProjectTeam } from '@/api/project/projectTeam'; import { ContractorVO } from '@/api/project/contractor/types'; import { ProjectTeamVO } from '@/api/project/projectTeam/types'; import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue'; +import ProjectTypes from '@/utils/propTypes'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { type_of_work, user_sex_type, user_clock_type } = toRefs(proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type')); @@ -329,7 +387,8 @@ const getContractorList = async () => { loading.value = true; const res = await listContractor({ pageNum: 1, - pageSize: 20 + pageSize: 20, + projectId: currentProject.value.id }); contractorOpt.value = res.rows.map((contractor: ContractorVO) => ({ value: contractor.id, @@ -461,3 +520,18 @@ onMounted(() => { getProjectTeamList(); }); + diff --git a/plus-ui/src/views/project/workWage/index.vue b/plus-ui/src/views/project/workWage/index.vue new file mode 100644 index 00000000..ba944728 --- /dev/null +++ b/plus-ui/src/views/project/workWage/index.vue @@ -0,0 +1,318 @@ + + + diff --git a/plus-ui/src/views/safety/teamMeeting/index.vue b/plus-ui/src/views/safety/teamMeeting/index.vue index 3ed654c6..8f31ee4a 100644 --- a/plus-ui/src/views/safety/teamMeeting/index.vue +++ b/plus-ui/src/views/safety/teamMeeting/index.vue @@ -91,9 +91,9 @@ - + - +