tcy
afa1a2b384
- 在TeamMeetingForm接口中添加meetingTheme字段 - 新增查询项目班组成员和分包公司班组的API - 完善班组会议详情抽屉组件，优化图片显示逻辑 - 扩展班组会议表单，增加班组、施工单位、宣讲人等多选功能 - 优化安全巡检页面布局和表单字段
352 lines
13 KiB
Vue
352 lines
13 KiB
Vue
<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="meetingDate">
|
|
<el-date-picker clearable v-model="queryParams.meetingDate" type="date" value-format="YYYY-MM-DD"
|
|
placeholder="请选择开会时间" />
|
|
</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="['safety:teamMeeting:add']"> 新增
|
|
</el-button>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
|
|
v-hasPermi="['safety:teamMeeting:remove']">
|
|
删除
|
|
</el-button>
|
|
</el-col>
|
|
<!-- <el-col :span="1.5">
|
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:teamMeeting:export']">导出 </el-button>
|
|
</el-col> -->
|
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
|
</el-row>
|
|
</template>
|
|
|
|
<el-table v-loading="loading" :data="teamMeetingList" @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="compereName" />
|
|
<el-table-column label="施工单位" align="center" prop="contractorName" />
|
|
<el-table-column label="班组名称" align="center" prop="teamName" />
|
|
<el-table-column label="参与人数" align="center">
|
|
<template #default="scope">
|
|
<span>{{ scope.row.participantList.length + 1 }}</span>
|
|
</template>
|
|
</el-table-column>
|
|
<el-table-column label="开会时间" align="center" prop="meetingDate" width="180">
|
|
<template #default="scope">
|
|
<span>{{ parseTime(scope.row.meetingDate, '{y}-{m}-{d}') }}</span>
|
|
</template>
|
|
</el-table-column>
|
|
<el-table-column label="上传时间" align="center" prop="createTime" width="180" />
|
|
<!-- <template #default="scope">
|
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {hh}:{mm}:{ss}') }}</span>
|
|
</template>
|
|
</el-table-column> -->
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<template #default="scope">
|
|
<el-space>
|
|
<el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
|
|
v-hasPermi="['safety:teamMeeting:query']">
|
|
详情
|
|
</el-button>
|
|
<!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:teamMeeting:edit']"> 修改 </el-button> -->
|
|
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
|
|
v-hasPermi="['safety:teamMeeting:remove']">
|
|
删除
|
|
</el-button>
|
|
</el-space>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table>
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
|
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
</el-card>
|
|
<!-- 添加或修改站班会对话框 -->
|
|
<el-dialog :title="dialog.title" v-model="dialog.visible" width="50%" append-to-body>
|
|
<el-form ref="teamMeetingFormRef" :model="form" :rules="rules" label-width="80px">
|
|
<el-form-item label="开会时间" prop="meetingDate">
|
|
<el-date-picker clearable v-model="form.meetingDate" type="date" value-format="YYYY-MM-DD HH:mm:ss"
|
|
placeholder="请选择开会时间" />
|
|
</el-form-item>
|
|
<el-form-item label="班组名称" prop="teamId">
|
|
<el-select v-model="form.teamId" placeholder="请选择班组">
|
|
<el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-form-item>
|
|
<el-form-item label="施工单位" prop="contractorId">
|
|
<el-select v-model="form.contractorId" placeholder="请选择施工单位">
|
|
<el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-form-item>
|
|
<el-form-item label="宣讲人" prop="compereId">
|
|
<el-select v-model="form.compereId" placeholder="请选择宣讲人">
|
|
<el-option v-for="item in compereList" :key="item.memberId" :label="item.memberName"
|
|
:value="item.memberId" />
|
|
</el-select>
|
|
</el-form-item>
|
|
<el-form-item label="参与人" prop="participantIdList">
|
|
<el-select v-model="form.participantIdList" placeholder="请选择参与人" multiple>
|
|
<el-option v-for="item in participantList" :key="item.memberId" :label="item.memberName"
|
|
:value="item.memberId" />
|
|
</el-select>
|
|
</el-form-item>
|
|
<el-form-item label="班会主题" prop="meetingTheme">
|
|
<el-input v-model="form.meetingTheme" placeholder="请输入班会主题" />
|
|
</el-form-item>
|
|
<el-form-item label="班会内容">
|
|
<editor v-model="form.content" :min-height="192" />
|
|
</el-form-item>
|
|
<el-form-item label="班会图片" prop="picture">
|
|
<image-upload v-model="form.pictureList" />
|
|
</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>
|
|
<el-dialog title="站班会详情" v-model="showDetailDrawer" width="800px">
|
|
<TeamMeetingDetailDrawer :team-meeting-id="currentTeamMeetingId" />
|
|
</el-dialog>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup name="TeamMeeting" lang="ts">
|
|
console.log(111);
|
|
|
|
import { addTeamMeeting, delTeamMeeting, getTeamMeeting, listTeamMeeting, updateTeamMeeting, listProjectTeamMember, getProjectContractorTeamList } from '@/api/safety/teamMeeting';
|
|
import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/teamMeeting/types';
|
|
import { useUserStoreHook } from '@/store/modules/user';
|
|
import TeamMeetingDetailDrawer from '@/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue';
|
|
|
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
|
// 获取用户 store
|
|
const userStore = useUserStoreHook();
|
|
// 从 store 中获取项目列表和当前选中的项目
|
|
const currentProject = computed(() => userStore.selectedProject);
|
|
const teamMeetingList = ref<TeamMeetingVO[]>([]);
|
|
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 teamList = ref<any>([]);
|
|
const contractorList = ref<any>([]);
|
|
const compereList = ref<any>([]);
|
|
const participantList = ref<any>([]);
|
|
|
|
|
|
|
|
const queryFormRef = ref<ElFormInstance>();
|
|
const teamMeetingFormRef = ref<ElFormInstance>();
|
|
const currentTeamMeetingId = ref<string | number>(0);
|
|
const dialog = reactive<DialogOption>({
|
|
visible: false,
|
|
title: ''
|
|
});
|
|
|
|
const initFormData: TeamMeetingForm = {
|
|
id: undefined,
|
|
projectId: currentProject.value?.id,
|
|
teamId: undefined,
|
|
contractorId: undefined,
|
|
meetingDate: undefined,
|
|
compereId: undefined,
|
|
participantIdList: undefined,
|
|
content: undefined,
|
|
pictureList: undefined,
|
|
remark: undefined,
|
|
meetingTheme: undefined
|
|
};
|
|
const data = reactive<PageData<TeamMeetingForm, TeamMeetingQuery>>({
|
|
form: { ...initFormData },
|
|
queryParams: {
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
projectId: currentProject.value?.id,
|
|
teamId: undefined,
|
|
contractorId: undefined,
|
|
meetingDate: undefined,
|
|
compereId: undefined,
|
|
participantIdList: undefined,
|
|
content: undefined,
|
|
params: {}
|
|
},
|
|
rules: {
|
|
id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
|
|
projectId: [{ required: true, message: '项目id不能为空', trigger: 'change' }],
|
|
teamId: [{ required: true, message: '班组id不能为空', trigger: 'change' }],
|
|
contractorId: [{ required: true, message: '分包公司id不能为空', trigger: 'change' }]
|
|
}
|
|
});
|
|
|
|
const { queryParams, form, rules } = toRefs(data);
|
|
|
|
/** 查询站班会列表 */
|
|
const getList = async () => {
|
|
loading.value = true;
|
|
const res = await listTeamMeeting(queryParams.value);
|
|
teamMeetingList.value = res.rows;
|
|
total.value = res.total;
|
|
loading.value = false;
|
|
};
|
|
|
|
/** 取消按钮 */
|
|
const cancel = () => {
|
|
reset();
|
|
dialog.visible = false;
|
|
};
|
|
|
|
/** 表单重置 */
|
|
const reset = () => {
|
|
form.value = { ...initFormData };
|
|
teamMeetingFormRef.value?.resetFields();
|
|
};
|
|
|
|
/** 搜索按钮操作 */
|
|
const handleQuery = () => {
|
|
queryParams.value.pageNum = 1;
|
|
getList();
|
|
};
|
|
|
|
/** 重置按钮操作 */
|
|
const resetQuery = () => {
|
|
queryFormRef.value?.resetFields();
|
|
handleQuery();
|
|
};
|
|
|
|
/** 多选框选中数据 */
|
|
const handleSelectionChange = (selection: TeamMeetingVO[]) => {
|
|
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 showDetailDrawer = ref<boolean>(false);
|
|
const handleShowDrawer = (row?: TeamMeetingVO) => {
|
|
currentTeamMeetingId.value = row.id;
|
|
showDetailDrawer.value = true;
|
|
};
|
|
|
|
/** 修改按钮操作 */
|
|
const handleUpdate = async (row?: TeamMeetingVO) => {
|
|
reset();
|
|
const _id = row?.id || ids.value[0];
|
|
const res = await getTeamMeeting(_id);
|
|
Object.assign(form.value, res.data);
|
|
dialog.visible = true;
|
|
dialog.title = '修改站班会';
|
|
};
|
|
|
|
/** 提交按钮 */
|
|
const submitForm = () => {
|
|
teamMeetingFormRef.value?.validate(async (valid: boolean) => {
|
|
if (valid) {
|
|
buttonLoading.value = true;
|
|
if (form.value.id) {
|
|
await updateTeamMeeting(form.value).finally(() => (buttonLoading.value = false));
|
|
} else {
|
|
await addTeamMeeting(form.value).finally(() => (buttonLoading.value = false));
|
|
}
|
|
proxy?.$modal.msgSuccess('操作成功');
|
|
dialog.visible = false;
|
|
await getList();
|
|
}
|
|
});
|
|
};
|
|
|
|
/** 删除按钮操作 */
|
|
const handleDelete = async (row?: TeamMeetingVO) => {
|
|
const _ids = row?.id || ids.value;
|
|
await proxy?.$modal.confirm('是否确认删除站班会编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
|
|
await delTeamMeeting(_ids);
|
|
proxy?.$modal.msgSuccess('删除成功');
|
|
await getList();
|
|
};
|
|
|
|
/** 导出按钮操作 */
|
|
const handleExport = () => {
|
|
proxy?.download(
|
|
'safety/teamMeeting/export',
|
|
{
|
|
...queryParams.value
|
|
},
|
|
`teamMeeting_${new Date().getTime()}.xlsx`
|
|
);
|
|
};
|
|
|
|
//监听项目id刷新数据
|
|
const listeningProject = watch(
|
|
() => currentProject.value?.id,
|
|
(nid, oid) => {
|
|
queryParams.value.projectId = nid;
|
|
form.value.projectId = nid;
|
|
getList();
|
|
}
|
|
);
|
|
|
|
onUnmounted(() => {
|
|
listeningProject();
|
|
});
|
|
console.log(11);
|
|
const getTeamAndContractor = async () => {
|
|
const projectId = currentProject.value?.id;
|
|
const { data: { teamList: teamListRes, contractorList: contractorListRes } } = await getProjectContractorTeamList(projectId);
|
|
console.log(teamListRes, contractorListRes);
|
|
|
|
teamList.value = teamListRes;
|
|
contractorList.value = contractorListRes;
|
|
};
|
|
const getUsers = async () => {
|
|
const { rows } = await listProjectTeamMember({
|
|
projectId: currentProject.value?.id
|
|
})
|
|
compereList.value = rows.filter(item => item.postId == 1)
|
|
participantList.value = rows.filter(item => item.postId == 0)
|
|
};
|
|
const getData = async () => {
|
|
await getTeamAndContractor()
|
|
await getUsers()
|
|
};
|
|
onMounted(() => {
|
|
console.log(122);
|
|
getList();
|
|
getData();
|
|
});
|
|
</script>
|