diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index bc62a3c..4dc14f0 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -127,7 +127,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ } ] }, - { path: '/codegen', component: Layout, @@ -325,6 +324,30 @@ const remainingRouter: AppRouteRecordRaw[] = [ title: '查看 OA 请假', activeMenu: '/bpm/oa/leave' } + }, + { + path: 'fta/enterprise/create', + component: () => import('@/views/fta/enterpriseinformation/create.vue'), + name: 'FtaEnterpriseCreate', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '发起 企业信息填报 请假', + activeMenu: '/enterpriseInformation/enterprise-information' + } + }, + { + path: 'fta/enterprise/detail', + component: () => import('@/views/fta/enterpriseinformation/detail.vue'), + name: 'FtaEnterpriseDetail', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '查看 企业信息填报 请假', + activeMenu: '/enterpriseInformation/enterprise-information' + } } ] }, diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue index 28a15af..bef053f 100644 --- a/src/views/bpm/oa/leave/create.vue +++ b/src/views/bpm/oa/leave/create.vue @@ -101,7 +101,7 @@ const formRules = reactive({ const formRef = ref() // 表单 Ref // 指定审批人 -const processDefineKey = 'oa_leave' // 流程定义 Key +const processDefineKey = 'oa_leave_new' // 流程定义 Key const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue index 4316481..cccb136 100644 --- a/src/views/bpm/oa/leave/index.vue +++ b/src/views/bpm/oa/leave/index.vue @@ -34,9 +34,9 @@ value-format="YYYY-MM-DD HH:mm:ss" /> - + - + { return } processInstance.value = data - + console.log("获取到的流程实例:",data) // 设置表单信息 const processDefinition = data.processDefinition if (processDefinition.formType === 10) { diff --git a/src/views/fta/enterpriseinformation/create.vue b/src/views/fta/enterpriseinformation/create.vue new file mode 100644 index 0000000..0f6b443 --- /dev/null +++ b/src/views/fta/enterpriseinformation/create.vue @@ -0,0 +1,215 @@ + + diff --git a/src/views/fta/enterpriseinformation/detail.vue b/src/views/fta/enterpriseinformation/detail.vue new file mode 100644 index 0000000..917d695 --- /dev/null +++ b/src/views/fta/enterpriseinformation/detail.vue @@ -0,0 +1,81 @@ + + diff --git a/src/views/fta/enterpriseinformation/index.vue b/src/views/fta/enterpriseinformation/index.vue index 72c4533..da6a62a 100644 --- a/src/views/fta/enterpriseinformation/index.vue +++ b/src/views/fta/enterpriseinformation/index.vue @@ -117,6 +117,10 @@ 搜索 重置 + + + 发起创建 + + + + - + + +