diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index b859eb4..97c2754 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -16,6 +16,7 @@ import quality from '/public/config/quality.json' import { filterUser } from '@/views/quality/internal/workManage/components/filterUser' import { getStaffList } from '@/api/resource/register' +// import { getUserList } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -56,11 +57,15 @@ // 自动填充数据 if ($route.query.data) { const data = JSON.parse($route.query.data as string) - // console.log(data, 'data') + console.log(data, 'data') + // 获取用户列表 ruleForm.value.yearNum = data.yearNum ruleForm.value.yearTime = data.yearTime ruleForm.value.bizLabCode = data.bizLabCode - ruleForm.value.groupLeader = data.groupLeader + getUserList({ offset: 1, limit: 99999 }).then((res) => { + ruleForm.value.groupLeader = res.data.rows.filter((item: any) => item.name === data.groupLeader)[0]?.id || '' + }) + // ruleForm.value.groupLeader = data.groupLeader ruleForm.value.sceneUsers = data.teamMembers } } diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index b859eb4..97c2754 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -16,6 +16,7 @@ import quality from '/public/config/quality.json' import { filterUser } from '@/views/quality/internal/workManage/components/filterUser' import { getStaffList } from '@/api/resource/register' +// import { getUserList } from '@/api/system/user' const $route = useRoute() const $router = useRouter() const userStore = useUserStore() @@ -56,11 +57,15 @@ // 自动填充数据 if ($route.query.data) { const data = JSON.parse($route.query.data as string) - // console.log(data, 'data') + console.log(data, 'data') + // 获取用户列表 ruleForm.value.yearNum = data.yearNum ruleForm.value.yearTime = data.yearTime ruleForm.value.bizLabCode = data.bizLabCode - ruleForm.value.groupLeader = data.groupLeader + getUserList({ offset: 1, limit: 99999 }).then((res) => { + ruleForm.value.groupLeader = res.data.rows.filter((item: any) => item.name === data.groupLeader)[0]?.id || '' + }) + // ruleForm.value.groupLeader = data.groupLeader ruleForm.value.sceneUsers = data.teamMembers } } diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index 5c59a11..b1615f2 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -7,10 +7,12 @@ import { addWork, detailWork } from '@/api/quality/internal/workManage' import { filterUser } from '@/views/quality/internal/workManage/components/filterUser' import { getStaffList } from '@/api/resource/register' +import useUserStore from '@/store/modules/user' import quality from '/public/config/quality.json' const $route = useRoute() const $router = useRouter() const ruleFormRef = ref() // from组件 +const userStore = useUserStore() // 表单 const ruleForm = ref({ yearTime: '', @@ -96,6 +98,8 @@ ...ruleForm.value, internalAuditFiles: fileRef.value.list, workName: `${ruleForm.value.yearTime}年第${ruleForm.value.yearNum}次内部审核工作`, + createId: userStore.id, + createName: userStore.name, } if (ruleForm.value.teamMembers.length) { data.teamMembers = data.teamMembers.join(',')