diff --git a/src/views/Home/bgyp/BgypCreate.vue b/src/views/Home/bgyp/BgypCreate.vue index a3c3e20..87e6085 100644 --- a/src/views/Home/bgyp/BgypCreate.vue +++ b/src/views/Home/bgyp/BgypCreate.vue @@ -49,6 +49,7 @@ type="date" value-format="x" placeholder="选择申请时间" + disabled /> @@ -114,7 +115,7 @@ const formData = ref({ usageQuantity: undefined, unit: undefined, usagePurpose: undefined, - usageDate: undefined, + usageDate: Date.now(), status: undefined, userId: undefined, processInstanceId: undefined, diff --git a/src/views/Home/bgyp/index.vue b/src/views/Home/bgyp/index.vue index 81371e1..9f59bfb 100644 --- a/src/views/Home/bgyp/index.vue +++ b/src/views/Home/bgyp/index.vue @@ -171,13 +171,13 @@ const getList = async () => { } /**发起操作 */ -const handleCreate = () => { - router.push({ name: 'BgypCreate' }) +const handleCreate =async () => { + await router.push({name: 'BgypCreate'}) } /** 审批进度 */ -const handleProcessDetail = (row) => { - router.push({ +const handleProcessDetail =async (row) => { + await router.push({ name: 'BpmProcessInstanceDetail', query: { id: row.processInstanceId @@ -186,8 +186,8 @@ const handleProcessDetail = (row) => { } /** 详情操作 */ -const handleDetail = (row: LeaveApi.LeaveVO) => { - router.push({ +const handleDetail =async (row: LeaveApi.LeaveVO) => { + await router.push({ name: 'BgypDetail', query: { id: row.id @@ -231,7 +231,7 @@ const handleExport = async () => { } /** 初始化 **/ -onMounted(() => { - getList() +onMounted(async () => { + await getList() }) diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue index d642b18..e8a91db 100644 --- a/src/views/Home/clgl/index.vue +++ b/src/views/Home/clgl/index.vue @@ -272,7 +272,7 @@ const handleExport = async () => { } /** 初始化 **/ -onMounted(() => { - getList() +onMounted(async () => { + await getList() }) diff --git a/src/views/Home/jbgl/JbglCreate.vue b/src/views/Home/jbgl/JbglCreate.vue index 01cd7cc..614b1ea 100644 --- a/src/views/Home/jbgl/JbglCreate.vue +++ b/src/views/Home/jbgl/JbglCreate.vue @@ -30,37 +30,8 @@ - - - - - - - - - - - - - - - - - - - + + @@ -82,10 +53,40 @@ type="date" value-format="x" placeholder="选择申请时间" + disabled /> + + + + + + + + + + + + + + + + + @@ -102,7 +103,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 {number} from "echarts"; /** 加班管理 表单 */ defineOptions({ name: 'JbglCreate' }) @@ -118,7 +118,7 @@ const formData = ref({ userId: undefined, deptName: undefined, deptId: undefined, - usageDate: undefined, + usageDate: Date.now(), type: undefined, startDate: undefined, endDate: undefined, diff --git a/src/views/Home/jbgl/JbglDetail.vue b/src/views/Home/jbgl/JbglDetail.vue index 6c5581a..50a303c 100644 --- a/src/views/Home/jbgl/JbglDetail.vue +++ b/src/views/Home/jbgl/JbglDetail.vue @@ -24,42 +24,13 @@ - + - - - - - - - - - - - - - - - - - - - + + @@ -87,6 +58,35 @@ + + + + + + + + + + + + + + + + + diff --git a/src/views/Home/jbgl/index.vue b/src/views/Home/jbgl/index.vue index 68b7489..15dadc2 100644 --- a/src/views/Home/jbgl/index.vue +++ b/src/views/Home/jbgl/index.vue @@ -265,7 +265,7 @@ const handleExport = async () => { } /** 初始化 **/ -onMounted(() => { - getList() +onMounted(async () => { + await getList() })