diff --git a/src/locales/lang/en/action.ts b/src/locales/lang/en/action.ts
index 83227e1..cd23ad2 100644
--- a/src/locales/lang/en/action.ts
+++ b/src/locales/lang/en/action.ts
@@ -8,5 +8,6 @@ export default {
detail: 'Detail',
export: 'Export',
import: 'Import',
- sync: 'Sync'
+ sync: 'Sync',
+ cancel: 'Cancel'
}
diff --git a/src/locales/lang/zh-CN/action.ts b/src/locales/lang/zh-CN/action.ts
index 3d2dfcf..eaa422e 100644
--- a/src/locales/lang/zh-CN/action.ts
+++ b/src/locales/lang/zh-CN/action.ts
@@ -8,5 +8,6 @@ export default {
detail: '详情',
export: '导出',
import: '导入',
- sync: '同步'
+ sync: '同步',
+ cancel: '取消'
}
diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue
index 3b64cfc..6c8859a 100644
--- a/src/views/bpm/definition/index.vue
+++ b/src/views/bpm/definition/index.vue
@@ -1,3 +1,3 @@
- 开发中
+ 开发中 definition
diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue
index d453155..383cf84 100644
--- a/src/views/bpm/form/index.vue
+++ b/src/views/bpm/form/index.vue
@@ -72,7 +72,6 @@ function openForm(record: Recordable) {
if (typeof record.id === 'number') {
go({ name: 'BpmFormEditor', query: { id: record.id } })
}
- // openModal(true, { record, isUpdate: true })
}
function openDetail(record: Recordable) {
diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue
index 3b64cfc..1af7d27 100644
--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -1,3 +1,81 @@
- 开发中
+
+
+
+ 发起流程
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bpm/processInstance/processInstance.data.ts b/src/views/bpm/processInstance/processInstance.data.ts
new file mode 100644
index 0000000..ca7deb1
--- /dev/null
+++ b/src/views/bpm/processInstance/processInstance.data.ts
@@ -0,0 +1,109 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+ {
+ title: '流程编号',
+ dataIndex: 'id',
+ width: 260
+ },
+ {
+ title: '流程名称',
+ dataIndex: 'name',
+ width: 100
+ },
+ {
+ title: '流程分类',
+ dataIndex: 'category',
+ width: 120,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.BPM_MODEL_CATEGORY)
+ }
+ },
+ {
+ title: '当前审批任务',
+ dataIndex: 'tasks',
+ width: 120,
+ customRender: ({ record }) => {
+ if (record.tasks && record.tasks.length > 0) {
+ const texts: any[] = []
+ record.tasks.forEach((val) => {
+ texts.push(val.name)
+ })
+ return useRender.renderTags(texts)
+ }
+ }
+ },
+ {
+ title: '状态',
+ dataIndex: 'status',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)
+ }
+ },
+ {
+ title: '提交时间',
+ dataIndex: 'createTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '结束时间',
+ dataIndex: 'endTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ }
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '流程名称',
+ field: 'name',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '所属流程',
+ field: 'processDefinitionId',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '流程分类',
+ field: 'category',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '状态',
+ field: 'status',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '结果',
+ field: 'result',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '提交时间',
+ field: 'createTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ }
+]
diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue
index 3b64cfc..e8bc1bd 100644
--- a/src/views/bpm/taskAssignRule/index.vue
+++ b/src/views/bpm/taskAssignRule/index.vue
@@ -1,3 +1,3 @@
- 开发中
+ 开发中 taskAssignRule
diff --git a/src/views/infra/testDemo/index.vue b/src/views/infra/testDemo/index.vue
index 3b64cfc..0d29315 100644
--- a/src/views/infra/testDemo/index.vue
+++ b/src/views/infra/testDemo/index.vue
@@ -1,3 +1,3 @@
- 开发中
+ 开发中 testDemo