diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 2dc9522d..b9058bb5 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -115,7 +115,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ children: [ { path: 'type/data/:dictType', - component: () => import('@/views/system/dict/data.vue'), + component: () => import('@/views/system/dict/index.vue'), name: 'data', meta: { title: '字典数据', @@ -123,7 +123,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ hidden: true, canTo: true, icon: '', - activeMenu: 'system/dict/data' + activeMenu: 'system/dict/index' } } ] @@ -162,7 +162,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ children: [ { path: 'job-log', - component: () => import('@/views/infra/job/logger/index.vue'), + component: () => import('@/views/infra/job/JobLog.vue'), name: 'JobLog', meta: { noCache: true, diff --git a/src/views/bpm/form/formEditor.vue b/src/views/bpm/form/formEditor.vue index 418a75e8..2893249d 100644 --- a/src/views/bpm/form/formEditor.vue +++ b/src/views/bpm/form/formEditor.vue @@ -62,7 +62,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { CommonStatusEnum } from '@/utils/constants' import * as FormApi from '@/api/bpm/form' import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate' -import { useClipboard } from '@vueuse/core' +// import { useClipboard } from '@vueuse/core' const { t } = useI18n() // 国际化 const message = useMessage() // 消息 diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue index 0d645c7d..b4293f5b 100644 --- a/src/views/bpm/oa/leave/create.vue +++ b/src/views/bpm/oa/leave/create.vue @@ -22,7 +22,7 @@ import { rules, allSchemas } from './leave.data' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { push } = useRouter() // 路由 - +// const { query } = useRoute() // 表单参数 const actionLoading = ref(false) // 按钮 Loading const formRef = ref() // 表单 Ref @@ -43,6 +43,8 @@ const submitForm = async () => { // data.endTime = XEUtils.toDateString(data.endTime, 'yyyy-MM-dd HH:mm:ss') data.startTime = Date.parse(new Date(data.startTime).toString()).toString() data.endTime = Date.parse(new Date(data.endTime).toString()).toString() + // console.log(query.id, 'query.id') + // data.id = query.id // 添加的提交 await LeaveApi.createLeaveApi(data) message.success(t('common.createSuccess')) diff --git a/src/views/bpm/processInstance/create.vue b/src/views/bpm/processInstance/create.vue index 1b59ec7c..7b8f108d 100644 --- a/src/views/bpm/processInstance/create.vue +++ b/src/views/bpm/processInstance/create.vue @@ -105,7 +105,10 @@ const handleSelect = async (row) => { // 情况二:业务表单 } else if (row.formCustomCreatePath) { await router.push({ - path: row.formCustomCreatePath + path: row.formCustomCreatePath, + query: { + id: row.id + } }) // 这里暂时无需加载流程图,因为跳出到另外个 Tab; } diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue index 012e6f68..6a09b147 100644 --- a/src/views/bpm/taskAssignRule/index.vue +++ b/src/views/bpm/taskAssignRule/index.vue @@ -64,7 +64,7 @@ show-checkbox :props="defaultProps" :data="deptTreeOptions" - empty-text="加载中,请稍后" + empty-text="加载中,请稍候" multiple /> diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue index b3af638b..0421eb16 100644 --- a/src/views/infra/build/index.vue +++ b/src/views/infra/build/index.vue @@ -32,7 +32,7 @@ diff --git a/src/views/system/post/form.vue b/src/views/system/post/form.vue new file mode 100644 index 00000000..065aecaf --- /dev/null +++ b/src/views/system/post/form.vue @@ -0,0 +1,91 @@ + +