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

新增工种薪水设置

Browse Source
This commit is contained in:
Teo
2025-03-26 18:02:49 +08:00
parent 450672b692
commit 8a34db8aef
6 changed files with 664 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/materials/materials/index.vue
View File

@ -134,9 +134,9 @@
</template>
</el-dialog>
<materials-inventory-add-dialog :materials-id="currentMaterialsId" :project-id="currentProject.id" ref="dialogRef" />
<el-drawer title="材料详情" v-model="showDetailDrawer" :size="'40%'">
<el-dialog title="材料详情" v-model="showDetailDrawer" width="700px">
<materials-detail-drawer :materials-id="currentMaterialsId" />
</el-drawer>
</el-dialog>
</div>
</template>

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

@ -114,77 +114,134 @@
<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="100px">
<el-form-item label="人脸照" prop="pacePhoto">
<image-upload v-model="form.facePic" :limit="1" :is-show-tip="false" />
</el-form-item>
<el-form-item label="人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员姓名" />
</el-form-item>
<el-form-item label="分包公司" prop="contractorId">
<el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
<el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" />
</el-form-item>
<el-form-item label="身份证正面图片" prop="sfzFrontPic">
<image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
</el-form-item>
<el-form-item label="身份证背面图片" prop="sfzBackPic">
<image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
</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-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
</el-form-item>
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
</el-form-item>
<el-form-item label="身份证地址" prop="sfzSite">
<el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
</el-form-item>
<el-form-item label="身份证出生日期" prop="sfzBirth">
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
</el-form-item>
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
<el-form-item label="银行图片" prop="yhkPic">
<image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
</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="工种" prop="typeOfWork">
<el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
<el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="特种作业证图片" prop="specialWorkPic">
<image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
<el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
<el-form ref="constructionUserFormRef" :model="form" :rules="rules" label-width="130px" :inline="true">
<div class="block_box">
<div class="msg">用户信息</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="人脸照" prop="pacePhoto">
<image-upload v-model="form.facePic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证正面图片" prop="sfzFrontPic">
<image-upload v-model="form.sfzFrontPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证背面图片" prop="sfzBackPic">
<image-upload v-model="form.sfzBackPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入人员姓名" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="分包公司" prop="contractorId">
<el-select v-model="form.contractorId" clearable placeholder="请选择分包公司">
<el-option v-for="item in contractorOpt" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证号码" prop="sfzNumber">
<el-input v-model="form.sfzNumber" placeholder="请输入身份证号码" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效开始期" prop="sfzStart">
<el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证有效结束期" prop="sfzEnd">
<el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证地址" prop="sfzSite">
<el-input v-model="form.sfzSite" placeholder="请输入身份证地址" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="身份证出生日期" prop="sfzBirth">
<el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="籍贯" prop="nativePlace">
<el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
</el-form-item>
</div>
</div>
</div>
<div class="block_box">
<div class="msg">银行卡</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="银行图片" prop="yhkPic">
<image-upload v-model="form.yhkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="银行卡号" prop="yhkNumber">
<el-input v-model="form.yhkNumber" placeholder="请输入银行卡号" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="开户行" prop="yhkOpeningBank">
<el-input v-model="form.yhkOpeningBank" placeholder="请输入开户行" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="持卡人" prop="yhkCardholder">
<el-input v-model="form.yhkCardholder" placeholder="请输入持卡人" />
</el-form-item>
</div>
</div>
</div>
<div class="block_box">
<div class="msg">单位信息</div>
<div class="el-row">
<div class="el-col el-col-24">
<el-form-item label="特种作业证图片" prop="specialWorkPic">
<image-upload v-model="form.specialWorkPic" :limit="1" :is-show-tip="false" />
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="工种" prop="typeOfWork">
<el-select v-model="form.typeOfWork" clearable placeholder="请选择工种">
<el-option v-for="item in type_of_work" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="打卡" prop="clock">
<el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
<el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
<div class="el-col el-col-12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 240px" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -193,9 +250,9 @@
</div>
</template>
</el-dialog>
<el-drawer title="施工人员详情" v-model="showDetailDrawer" :size="'45%'">
<el-dialog title="施工人员详情" v-model="showDetailDrawer">
<construction-user-detail :user-id="currentUserId" />
</el-drawer>
</el-dialog>
</div>
</template>
@ -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<any>(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();
});
</script>
<style scoped>
.block_box {
border: 1px solid #9eccfa;
border-radius: 6px;
padding: 10px 20px 20px 10px;
margin-bottom: 20px;
}
.msg {
color: #409eff;
font-weight: 700;
font-size: 14px;
margin-bottom: 10px;
}
</style>

318
src/views/project/workWage/index.vue Normal file
View File

@ -0,0 +1,318 @@
<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="workType">
<el-select v-model="queryParams.workType" placeholder="请选择工种" clearable >
<el-option v-for="dict in type_of_work" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="工资计算方式" prop="wageCalculationType" label-width="100px">
<el-select v-model="queryParams.wageCalculationType" placeholder="请选择工资计算方式" clearable >
<el-option v-for="dict in wageCalculationTypeList" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="工资计量单位" prop="wageMeasureUnit" label-width="100px">
<el-select v-model="queryParams.wageMeasureUnit" placeholder="请选择工资计量单位" clearable >
<el-option v-for="dict in wage_measure_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-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:workWage:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:workWage:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:workWage:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:workWage:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="workWageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="60px"/>
<!-- <el-table-column label="主键id" align="center" prop="id" v-if="true" /> -->
<!-- <el-table-column label="项目id" align="center" prop="projectId" /> -->
<el-table-column label="工种" align="center" prop="workType">
<template #default="scope">
<dict-tag :options="type_of_work" :value="scope.row.workType"/>
</template>
</el-table-column>
<el-table-column label="是否是特种兵" align="center" prop="isSpecialType" >
<template #default="scope">
{{ scope.row.isSpecialType==1?'是':"否" }}
</template>
</el-table-column>
<el-table-column label="工资计算方式" align="center" prop="wageCalculationType" >
<template #default="scope">
{{ scope.row.wageCalculationType==1?'计时':"计件" }}
</template>
</el-table-column>
<el-table-column label="工资标准" align="center" prop="wage" />
<el-table-column label="工资计量单位" align="center" prop="wageMeasureUnit">
<template #default="scope">
<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" />
<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:workWage:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:workWage: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="workWageFormRef" :model="form" :rules="rules" label-width="100px">
<!-- <el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
</el-form-item> -->
<el-form-item label="工种" prop="workType">
<el-select v-model="form.workType" placeholder="请选择工种">
<el-option
v-for="dict in type_of_work"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否是特种兵 " prop="isSpecialType">
<el-select v-model="form.isSpecialType" placeholder="请选择是否是特种兵">
<el-option
v-for="dict in isSpecialTypeList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工资计算方式" prop="wageCalculationType">
<el-select v-model="form.wageCalculationType" placeholder="请选择工资计算方式">
<el-option
v-for="dict in wageCalculationTypeList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工资标准" prop="wage">
<el-input v-model="form.wage" placeholder="请输入工资标准" />
</el-form-item>
<el-form-item label="工资计量单位" prop="wageMeasureUnit">
<el-select v-model="form.wageMeasureUnit" placeholder="请选择工资计量单位">
<el-option
v-for="dict in wage_measure_unit_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="WorkWage" lang="ts">
import { listWorkWage, getWorkWage, delWorkWage, addWorkWage, updateWorkWage } from '@/api/project/workWage';
import { WorkWageVO, WorkWageQuery, WorkWageForm,SpecialType } from '@/api/project/workWage/types';
import { useUserStoreHook } from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { type_of_work, wage_measure_unit_type } = toRefs<any>(proxy?.useDict('type_of_work', 'wage_measure_unit_type'));
console.log(type_of_work);
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const workWageList = ref<WorkWageVO[]>([]);
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 workWageFormRef = ref<ElFormInstance>();
const isSpecialTypeList=ref<Array<SpecialType>>([
{label:"是",value:"1"},
{label:"否",value:"2"}
])
const wageCalculationTypeList=ref<Array<SpecialType>>([
{label:"计时",value:"1"},
{label:"计件",value:"2"}
])
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: WorkWageForm = {
id: undefined,
projectId: currentProject.value.id,
workType: undefined,
isSpecialType: undefined,
wageCalculationType: undefined,
wage: undefined,
wageMeasureUnit: undefined,
remark: undefined,
}
const data = reactive<PageData<WorkWageForm, WorkWageQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: currentProject.value.id,
workType: undefined,
isSpecialType: undefined,
wageCalculationType: undefined,
wage: undefined,
wageMeasureUnit: 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 listWorkWage(queryParams.value);
workWageList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
workWageFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: WorkWageVO[]) => {
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?: WorkWageVO) => {
reset();
const _id = row?.id || ids.value[0]
const res = await getWorkWage(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改工种薪水";
}
/** 提交按钮 */
const submitForm = () => {
workWageFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateWorkWage(form.value).finally(() => buttonLoading.value = false);
} else {
await addWorkWage(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: WorkWageVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除工种薪水编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
await delWorkWage(_ids);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('project/workWage/export', {
...queryParams.value
}, `workWage_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

4
src/views/safety/teamMeeting/index.vue
View File

@ -91,9 +91,9 @@
</div>
</template>
</el-dialog>
<el-drawer title="站班会详情" v-model="showDetailDrawer" :size="'40%'">
<el-dialog title="站班会详情" v-model="showDetailDrawer" width="800px">
<team-meeting-detail-drawer :team-meeting-id="currentTeamMeetingId" />
</el-drawer>
</el-dialog>
</div>
</template>