diff --git a/yudao-ui-admin-vue3/src/api/bpm/model/index.ts b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts index d47b30c10..0335a3db8 100644 --- a/yudao-ui-admin-vue3/src/api/bpm/model/index.ts +++ b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts @@ -22,6 +22,7 @@ export type ModelVO = { status: number remark: string createTime: string + bpmnXml: string } export const getModelPageApi = async (params) => { diff --git a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue index 340497512..34f91ce0f 100644 --- a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue +++ b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue @@ -5,7 +5,7 @@ - diff --git a/yudao-ui-admin-vue3/src/views/Error/404.vue b/yudao-ui-admin-vue3/src/views/Error/404.vue index 337d78d01..d1ccb62ec 100644 --- a/yudao-ui-admin-vue3/src/views/Error/404.vue +++ b/yudao-ui-admin-vue3/src/views/Error/404.vue @@ -1,10 +1,6 @@ diff --git a/yudao-ui-admin-vue3/src/views/Error/500.vue b/yudao-ui-admin-vue3/src/views/Error/500.vue index c66e713f4..9f784fd2d 100644 --- a/yudao-ui-admin-vue3/src/views/Error/500.vue +++ b/yudao-ui-admin-vue3/src/views/Error/500.vue @@ -1,10 +1,6 @@ diff --git a/yudao-ui-admin-vue3/src/views/bpm/definition/definition.data.ts b/yudao-ui-admin-vue3/src/views/bpm/definition/definition.data.ts index 4e25b6c3c..919cbd9c0 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/definition/definition.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/definition/definition.data.ts @@ -1,7 +1,4 @@ -import { reactive } from 'vue' -import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas' - -import { DICT_TYPE } from '@/utils/dict' +import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' // CrudSchema const crudSchemas = reactive({ diff --git a/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue b/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue index 3021c0e2a..19a7cf06a 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/definition/index.vue @@ -46,20 +46,16 @@ diff --git a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue index 60ee85ea1..0d645c7d1 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/create.vue @@ -21,7 +21,7 @@ import { rules, allSchemas } from './leave.data' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 -const router = useRouter() // 路由 +const { push } = useRouter() // 路由 // 表单参数 const actionLoading = ref(false) // 按钮 Loading @@ -41,15 +41,13 @@ const submitForm = async () => { const data = unref(formRef)?.formModel as LeaveApi.LeaveVO // data.startTime = XEUtils.toDateString(data.startTime, 'yyyy-MM-dd HH:mm:ss') // data.endTime = XEUtils.toDateString(data.endTime, 'yyyy-MM-dd HH:mm:ss') - data.startTime = Date.parse(new Date(data.startTime).toString()) - data.endTime = Date.parse(new Date(data.endTime).toString()) + data.startTime = Date.parse(new Date(data.startTime).toString()).toString() + data.endTime = Date.parse(new Date(data.endTime).toString()).toString() // 添加的提交 await LeaveApi.createLeaveApi(data) message.success(t('common.createSuccess')) // 关闭窗口 - router.push({ - path: '/bpm/oa/leave' - }) + push('/bpm/oa/leave') } finally { actionLoading.value = false } diff --git a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue index 4699dc0be..bb30d0756 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue @@ -5,7 +5,7 @@ -