From 1401b95706fce82eb00fcc067fe1b3a66fffc326 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:30:18 +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/api/home/clgl/index.ts | 1 + src/views/Home/clgl/ClglCreate.vue | 12 +++++++----- src/views/Home/clgl/ClglDetail.vue | 15 +++++++++------ src/views/Home/clgl/index.vue | 13 +++++++------ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/api/home/clgl/index.ts b/src/api/home/clgl/index.ts index b9fe9d5..8d874d1 100644 --- a/src/api/home/clgl/index.ts +++ b/src/api/home/clgl/index.ts @@ -6,6 +6,7 @@ export interface ClglVO { carUserId: number // 申请人 carUserName: string // 申请人 dept: number // 部门 + deptName: string // 部门 carType: number // 用车类型 carDriver: string // 驾驶员 carStart: Date // 用车开始时间 diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue index e31cea0..99fa497 100644 --- a/src/views/Home/clgl/ClglCreate.vue +++ b/src/views/Home/clgl/ClglCreate.vue @@ -16,7 +16,7 @@ -
{{ deptInfo?.name }}
+
{{ deptInfo }}
获取失败
@@ -114,7 +114,6 @@ 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"; /** 车辆管理 表单 */ @@ -133,6 +132,7 @@ const formData = ref({ carUserId: undefined, carUserName: undefined, dept: undefined, + deptName: undefined, carType: undefined, carDriver: undefined, carStart: undefined, @@ -163,7 +163,7 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules const userList = ref([]) // 用户列表 -const deptInfo = ref({} as DeptVO ) // 部门信息 +const deptInfo = ref('') // 部门信息 const userInfo = ref('') // 用户名字 defineExpose({ open }) // 提供 open 方法，用于打开弹窗 @@ -172,7 +172,6 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { - // 校验表单 await formRef.value.validate() @@ -209,8 +208,11 @@ const getUserInfo = async () => { if (formData.value.carUserName == ''||formData.value.carUserName == undefined){ formData.value.carUserName = user.nickname } + if (formData.value.deptName == ''||formData.value.deptName == undefined){ + formData.value.deptName = user.dept.name + } if (formData.value.dept != undefined){ - deptInfo.value = await getDept(formData.value.dept) + deptInfo.value = formData.value.deptName } if (formData.value.carUserName != undefined){ userInfo.value = formData.value.carUserName diff --git a/src/views/Home/clgl/ClglDetail.vue b/src/views/Home/clgl/ClglDetail.vue index b125151..e95365f 100644 --- a/src/views/Home/clgl/ClglDetail.vue +++ b/src/views/Home/clgl/ClglDetail.vue @@ -16,7 +16,7 @@ -
{{ deptInfo?.name }}
+
{{ deptInfo }}
获取失败
@@ -115,7 +115,6 @@ 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' }) @@ -127,13 +126,14 @@ defineOptions({ name: 'ClglDetail' }) // const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 // const formType = ref('') // 表单的类型：create - 新增；update - 修改 -const deptInfo = ref({} as DeptVO ) // 部门信息 +const deptInfo = ref('') // 部门信息 const userInfo = ref('') // 用户名字 const formData = ref({ id: undefined, carUserId: undefined, - carUserName: '', + carUserName: undefined, dept: undefined, + deptName: undefined, carType: undefined, carDriver: undefined, carStart: undefined, @@ -147,8 +147,8 @@ const formData = ref({ carRemark: undefined, }) +//流程 const { query } = useRoute() // 查询参数 - const props = defineProps({ id: propTypes.number.def(undefined) }) @@ -176,8 +176,11 @@ const getUserInfo = async () => { if (formData.value.carUserName == ''||formData.value.carUserName == undefined){ formData.value.carUserName = user.nickname } + if (formData.value.deptName == ''||formData.value.deptName == undefined){ + formData.value.deptName = user.dept.name + } if (formData.value.dept != undefined){ - deptInfo.value = await getDept(formData.value.dept) + deptInfo.value = formData.value.deptName } if (formData.value.carUserName != undefined){ userInfo.value = formData.value.carUserName diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue index 620dbf3..a9eef01 100644 --- a/src/views/Home/clgl/index.vue +++ b/src/views/Home/clgl/index.vue @@ -75,9 +75,10 @@ - - + + +