diff --git a/src/api/home/qjgl/index.ts b/src/api/home/qjgl/index.ts index 5bb266e..13a8806 100644 --- a/src/api/home/qjgl/index.ts +++ b/src/api/home/qjgl/index.ts @@ -12,6 +12,7 @@ export interface QjglVO { filePath: string // 文件路径 userName: string // 作者 deptId: number // 部门id + deptName: string // 部门id processInstanceId: string // 流程实例的编号 userId: number // 申请人的用户编号 status: number // 审批状态 @@ -48,4 +49,4 @@ export const QjglApi = { exportQjgl: async (params) => { return await request.download({ url: `/home/qjgl/export-excel`, params }) } -} \ No newline at end of file +} diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue index b5bbfce..d75f087 100644 --- a/src/views/Home/clgl/ClglCreate.vue +++ b/src/views/Home/clgl/ClglCreate.vue @@ -132,7 +132,7 @@ const formData = ref({ carUserId: undefined, carUserName: undefined, dept: undefined, - deptName: undefined, + deptName: '', carType: undefined, carDriver: undefined, carStart: undefined, diff --git a/src/views/Home/qjgl/QjglCreate.vue b/src/views/Home/qjgl/QjglCreate.vue index 287ffda..ade86dc 100644 --- a/src/views/Home/qjgl/QjglCreate.vue +++ b/src/views/Home/qjgl/QjglCreate.vue @@ -22,8 +22,8 @@ -
{{ userInfo?.dept.name }}
-
{{ deptInfo?.name }}
+ +
{{ deptInfo }}
@@ -122,6 +122,7 @@ const formData = ref({ filePath: undefined, userName: '', deptId: '', + deptName: '', processInstanceId: undefined, userId: undefined, status: undefined @@ -136,8 +137,10 @@ const formRules = reactive({ deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref -const userInfo = ref({} as ProfileVO ) -const deptInfo = ref({} as DeptVO ) +// const userInfo = ref({} as ProfileVO ) +const userInfo = ref('') +// const deptInfo = ref({} as DeptVO ) +const deptInfo = ref('') /** 打开弹窗 */ // const open = async (type: string, id?: number) => { // dialogVisible.value = true @@ -156,22 +159,33 @@ const deptInfo = ref({} as DeptVO ) // } // defineExpose({ open }) // 提供 open 方法,用于打开弹窗 const getUserInfo = async () => { - if ( formData.value.deptId == '' ){ const users = await getUserProfile() - userInfo.value = users + // if ( formData.value.deptId == '' ){ + // userInfo.value = users + // formData.value.deptId= users.dept.id + // + // deptInfo.value = {} as DeptVO + // }else{ + // const dept = await getDept(formData.value.deptId) + // deptInfo.value = dept + // userInfo.value = {} as ProfileVO + // } + if (formData.value.deptId == ''||formData.value.deptId == undefined){ formData.value.deptId= users.dept.id - - deptInfo.value = {} as DeptVO - }else{ - const dept = await getDept(formData.value.deptId) - deptInfo.value = dept - userInfo.value = {} as ProfileVO } - if (formData.value.userName == ''){ - const users = await getUserProfile() + if (formData.value.deptName == ''||formData.value.deptName == undefined){ + formData.value.deptName= users.dept.name + } + + if (formData.value.userName == ''||formData.value.userName == undefined){ formData.value.userName= users.nickname } - + if (formData.value.deptName != undefined){ + deptInfo.value = formData.value.deptName + } + if (formData.value.userName != undefined){ + userInfo.value = formData.value.userName + } } //flow begin++++++++++++++++++++ // 指定审批人 @@ -225,6 +239,7 @@ const resetForm = () => { filePath: undefined, userName: '', deptId: '', + deptName: '', processInstanceId: undefined, userId: undefined, status: undefined diff --git a/src/views/Home/qjgl/QjglDetail.vue b/src/views/Home/qjgl/QjglDetail.vue index 5e102f2..f204b45 100644 --- a/src/views/Home/qjgl/QjglDetail.vue +++ b/src/views/Home/qjgl/QjglDetail.vue @@ -22,8 +22,8 @@ -
{{ userInfo?.dept.name }}
-
{{ deptInfo?.name }}
+ +
{{ deptInfo }}
@@ -108,6 +108,7 @@ const formData = ref({ filePath: undefined, userName: undefined, deptId: undefined, + deptName: undefined, processInstanceId: undefined, userId: undefined, status: undefined @@ -144,21 +145,38 @@ const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编 // } // defineExpose({ open }) // 提供 open 方法,用于打开弹窗 const getUserInfo = async () => { - if ( formData.value.deptId == '' ){ const users = await getUserProfile() - userInfo.value = users - formData.value.deptId= users.dept.id + // if ( formData.value.deptId == '' ){ + // userInfo.value = users + // formData.value.deptId= users.dept.id + // + // deptInfo.value = {} as DeptVO + // }else{ + // const dept = await getDept(formData.value.deptId) + // deptInfo.value = dept + // userInfo.value = {} as ProfileVO + // } + // if (formData.value.userName == ''){ + // const users = await getUserProfile() + // formData.value.userName= users.nickname + // } - deptInfo.value = {} as DeptVO - }else{ - const dept = await getDept(formData.value.deptId) - deptInfo.value = dept - userInfo.value = {} as ProfileVO + if (formData.value.deptId == ''||formData.value.deptId == undefined){ + formData.value.deptId= users.dept.id } - if (formData.value.userName == ''){ - const users = await getUserProfile() + if (formData.value.deptName == ''||formData.value.deptName == undefined){ + formData.value.deptName= users.dept.name + } + + if (formData.value.userName == ''||formData.value.userName == undefined){ formData.value.userName= users.nickname } + if (formData.value.deptName != undefined){ + deptInfo.value = formData.value.deptName + } + if (formData.value.userName != undefined){ + userInfo.value = formData.value.userName + } } /** 提交表单 */ diff --git a/src/views/Home/qjgl/index.vue b/src/views/Home/qjgl/index.vue index 6a591f2..c7a816a 100644 --- a/src/views/Home/qjgl/index.vue +++ b/src/views/Home/qjgl/index.vue @@ -295,6 +295,7 @@ const queryParams = reactive({ filePath: undefined, userName: undefined, deptId: undefined, + deptName: undefined, createTime: [], processInstanceId: undefined, userId: undefined,