From 5ab6394ac5cb492a71040f1ca06ca1e6da659fcf Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Mon, 8 Jul 2024 00:35:32 +0800 Subject: [PATCH] add report --- src/views/mes/producereport/AdminIndex.vue | 297 ++++++++++++++++++ .../mes/producereport/DailyReportIndex.vue | 165 ++++++---- .../mes/producereport/ProduceReportForm.vue | 1 + src/views/mes/producereport/index.vue | 29 +- 4 files changed, 410 insertions(+), 82 deletions(-) create mode 100644 src/views/mes/producereport/AdminIndex.vue diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue new file mode 100644 index 00000000..d5762618 --- /dev/null +++ b/src/views/mes/producereport/AdminIndex.vue @@ -0,0 +1,297 @@ + + + diff --git a/src/views/mes/producereport/DailyReportIndex.vue b/src/views/mes/producereport/DailyReportIndex.vue index 59983aeb..eddf5c4a 100644 --- a/src/views/mes/producereport/DailyReportIndex.vue +++ b/src/views/mes/producereport/DailyReportIndex.vue @@ -61,7 +61,22 @@ - + + + + + + {{ dict.label }} + + + + + 搜索 重置 @@ -76,24 +91,12 @@ - - - - - - - - - - - - - - - - - - + + + + + + - - - @@ -129,43 +129,74 @@ + + + + + + + + - + + + + + + + + + + + + + + + + - diff --git a/src/views/mes/producereport/ProduceReportForm.vue b/src/views/mes/producereport/ProduceReportForm.vue index cb428ab2..7d8dd679 100644 --- a/src/views/mes/producereport/ProduceReportForm.vue +++ b/src/views/mes/producereport/ProduceReportForm.vue @@ -203,6 +203,7 @@ const submitForm = async () => { formLoading.value = true try { formData.value.reportDateString = formData.value.reportDate + formData.value.userId = userStore.getUser.id const data = formData.value as unknown as ProduceReportVO // 拼接子表的数据 data.produceReportDetails = produceReportDetailFormRef.value.getData() diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue index f2848acc..0dc9bf52 100644 --- a/src/views/mes/producereport/index.vue +++ b/src/views/mes/producereport/index.vue @@ -22,18 +22,6 @@ /> - - - - - - - - - + - + @@ -179,16 +166,17 @@ import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport' import ProduceReportForm from './ProduceReportForm.vue' import ProduceReportDetailList from './components/ProduceReportDetailList.vue' import {defaultProps, handleTree} from "@/utils/tree"; -import * as UserApi from "@/api/system/user"; + import {OrganizationApi} from "@/api/mes/organization"; -import {checkPermi} from "@/utils/permission"; +import {useUserStore} from "@/store/modules/user"; + /** 生产报工单 列表 */ defineOptions({ name: 'ProduceReport' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 -const userList = ref([]) // 用户列表 +const userStore = useUserStore() const organizationTree = ref() // 树形结构 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 @@ -280,9 +268,8 @@ const getOrganizationTree = async () => { } /** 初始化 **/ onMounted(async() => { + queryParams.userId = userStore.getUser.id await getList() await getOrganizationTree() - // 加载用户列表 - userList.value = await UserApi.getSimpleUserList() })