From 2a459bf09b912b045e3c53d7bfc40a96a679774a Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:20:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/clgl/ClglCreate.vue | 150 +++++++++++++------- src/views/Home/clgl/ClglDetail.vue | 214 ++++++++++++++--------------- src/views/Home/clgl/index.vue | 113 +++++++-------- 3 files changed, 256 insertions(+), 221 deletions(-) diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue index cbef299..c43f864 100644 --- a/src/views/Home/clgl/ClglCreate.vue +++ b/src/views/Home/clgl/ClglCreate.vue @@ -7,53 +7,20 @@ label-width="100px" v-loading="formLoading" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
{{ userInfo}}
+
获取失败
+ + + + +
{{ deptInfo?.name }}
+
获取失败
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -81,6 +113,8 @@ import { ClglApi, ClglVO } from '@/api/home/clgl' import * as DefinitionApi from '@/api/bpm/definition' import * as UserApi from '@/api/system/user' import {useTagsViewStore} from "@/store/modules/tagsView" +import {getUserProfile} from "@/api/system/user/profile"; +import {DeptVO, getDept} from "@/api/system/dept"; /** 车辆管理 表单 */ @@ -111,8 +145,6 @@ const formData = ref({ carRemark: undefined, }) const formRules = reactive({ - carUser: [{ required: true, message: '申请人不能为空', trigger: 'blur' }], - dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }], carType: [{ required: true, message: '用车类型不能为空', trigger: 'change' }], carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }], carStart: [{ required: true, message: '用车开始时间不能为空', trigger: 'blur' }], @@ -130,6 +162,8 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules const userList = ref([]) // 用户列表 +const deptInfo = ref({} as DeptVO ) // 部门信息 +const userInfo = ref('') // 用户名字 defineExpose({ open }) // 提供 open 方法，用于打开弹窗 @@ -161,8 +195,26 @@ const submitForm = async () => { formLoading.value = false } } + +//获取用户部门 +const getUserInfo = async () => { + const user = await getUserProfile(); + if (formData.value.dept == ''||formData.value.dept == undefined){ + formData.value.dept = user.dept.id + } + if (formData.value.carUser == ''||formData.value.carUser == undefined){ + formData.value.carUser = user.id + } + if (formData.value.dept != undefined){ + deptInfo.value = await getDept(formData.value.dept) + } + if (user != undefined){ + userInfo.value = user.nickname + } +} /** 初始化 */ onMounted(async () => { + await getUserInfo() const processDefinitionDetail = await DefinitionApi.getProcessDefinition( undefined, processDefineKey diff --git a/src/views/Home/clgl/ClglDetail.vue b/src/views/Home/clgl/ClglDetail.vue index a25334a..f6e47f9 100644 --- a/src/views/Home/clgl/ClglDetail.vue +++ b/src/views/Home/clgl/ClglDetail.vue @@ -7,56 +7,20 @@ label-width="100px" v-loading="formLoading" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
{{ userInfo}}
+
获取失败
+ + + + +
{{ deptInfo?.name }}
+
获取失败
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -82,6 +114,8 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { ClglApi } from '@/api/home/clgl' import {propTypes} from "@/utils/propTypes"; +import {getUserProfile} from "@/api/system/user/profile"; +import {DeptVO, getDept} from "@/api/system/dept"; /** 车辆管理 表单 */ defineOptions({ name: 'ClglDetail' }) @@ -93,6 +127,8 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的类型：create - 新增；update - 修改 +const deptInfo = ref({} as DeptVO ) // 部门信息 +const userInfo = ref('') // 用户名字 const formData = ref({ id: undefined, carUser: undefined, @@ -126,8 +162,26 @@ const getInfo = async () => { detailLoading.value = false } } + +//获取用户部门 +const getUserInfo = async () => { + const user = await getUserProfile(); + if (formData.value.dept == ''||formData.value.dept == undefined){ + formData.value.dept = user.dept.id + } + if (formData.value.carUser == ''||formData.value.carUser == undefined){ + formData.value.carUser = user.id + } + if (formData.value.dept != undefined){ + deptInfo.value = await getDept(formData.value.dept) + } + if (user != undefined){ + userInfo.value = user.nickname + } +} /** 初始化 **/ onMounted(() => { + getUserInfo() getInfo() }) const formRules = reactive({ @@ -135,66 +189,6 @@ const formRules = reactive({ }) const formRef = ref() // 表单 Ref -/** 打开弹窗 */ -// const open = async (type: string, id?: number) => { -// dialogVisible.value = true -// dialogTitle.value = t('action.' + type) -// formType.value = type -// resetForm() -// // 修改时，设置数据 -// if (id) { -// formLoading.value = true -// try { -// formData.value = await ClglApi.getClgl(id) -// } finally { -// formLoading.value = false -// } -// } -// } defineExpose({ open }) // 提供 open 方法，用于打开弹窗 -/** 提交表单 */ -// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 -// const submitForm = async () => { -// // 校验表单 -// await formRef.value.validate() -// // 提交请求 -// formLoading.value = true -// try { -// const data = formData.value as unknown as ClglVO -// if (formType.value === 'create') { -// await ClglApi.createClgl(data) -// message.success(t('common.createSuccess')) -// } else { -// await ClglApi.updateClgl(data) -// message.success(t('common.updateSuccess')) -// } -// dialogVisible.value = false -// // 发送操作成功的事件 -// emit('success') -// } finally { -// formLoading.value = false -// } -// } - -/** 重置表单 */ -// const resetForm = () => { -// formData.value = { -// id: undefined, -// carUser: undefined, -// dept: undefined, -// carType: undefined, -// carDriver: undefined, -// carStart: undefined, -// carEnd: undefined, -// carAddress: undefined, -// carInfo: undefined, -// carStartMileage: undefined, -// carEndMileage: undefined, -// carStatus: undefined, -// carReason: undefined, -// carRemark: undefined, -// } -// formRef.value?.resetFields() -// } diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue index 47a1223..a55c867 100644 --- a/src/views/Home/clgl/index.vue +++ b/src/views/Home/clgl/index.vue @@ -76,8 +76,11 @@ - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + - - + + - + @@ -139,22 +142,6 @@ > 详情 - - 编辑 - - - 删除 - @@ -178,6 +165,8 @@ import { ClglApi, ClglVO } from '@/api/home/clgl' import ClglForm from './ClglForm.vue' import router from "@/router"; import * as LeaveApi from '@/api/bpm/leave' +import {getUser} from "@/api/system/user"; +import {dateFormatter2} from "@/utils/formatTime"; /** 车辆管理 列表 */ defineOptions({ name: 'Clgl' }) @@ -196,14 +185,14 @@ const queryParams = reactive({ dept: undefined, carType: undefined, carDriver: undefined, - carStart: undefined, - carStart: [], + carStart: null, + // carStart: [], carEnd: undefined, - carEnd: [], + // carEnd: [], carAddress: undefined, carStartMileage: undefined, carEndMileage: undefined, - carStatus: undefined, + carStatus: null, createTime: [], }) const queryFormRef = ref() // 搜索的表单 @@ -240,9 +229,25 @@ watch( getList() } ) - - - +// const getUserNameById = (id:number) => { +// if (id==undefined) return "未知用户" +// // const user = getUser(id) +// // if (!user) { +// // return '未知用户'; +// // } +// // const name = user.nickname ? user.nickname : user.name || '未知用户'; +// // console.log("name: ",name) +// // return name +// return getUser(id).then(user => { +// if (!user) { +// return '未知用户'; +// } +// // 选择昵称或真实姓名 +// const name = user.nickname ? user.nickname : user.name || '未知用户'; +// console.log("name: ", name); +// return name; +// }); +// } /** 查询列表 */ const getList = async () => { loading.value = true @@ -269,22 +274,6 @@ const resetQuery = () => { /** 添加/修改操作 */ const formRef = ref() -const openForm = (type: string, id?: number) => { - formRef.value.open(type, id) -} - -/** 删除按钮操作 */ -const handleDelete = async (id: number) => { - try { - // 删除的二次确认 - await message.delConfirm() - // 发起删除 - await ClglApi.deleteClgl(id) - message.success(t('common.delSuccess')) - // 刷新列表 - await getList() - } catch {} -} /** 导出按钮操作 */ const handleExport = async () => {