diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue new file mode 100644 index 0000000..4a92993 --- /dev/null +++ b/src/views/system/process/editProcess.vue @@ -0,0 +1,229 @@ + + + + + + + 流程编辑 + + + + + 保存 + + + 关闭 + + + + + {{ form.number }} + + + {{ form.name }} + + + {{ form.business }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程配置 + + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue new file mode 100644 index 0000000..4a92993 --- /dev/null +++ b/src/views/system/process/editProcess.vue @@ -0,0 +1,229 @@ + + + + + + + 流程编辑 + + + + + 保存 + + + 关闭 + + + + + {{ form.number }} + + + {{ form.name }} + + + {{ form.business }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程配置 + + + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue new file mode 100644 index 0000000..4a92993 --- /dev/null +++ b/src/views/system/process/editProcess.vue @@ -0,0 +1,229 @@ + + + + + + + 流程编辑 + + + + + 保存 + + + 关闭 + + + + + {{ form.number }} + + + {{ form.name }} + + + {{ form.business }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程配置 + + + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} - - - - - - - - - - - - - - - - - - - - - - - 重置 - - - - - - - - - - 编辑 - - - 详情 - - - 废止 - - - 删除 - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + 重置 + + + + + + + + + + 编辑 + + + 详情 + + + 废止 + + + 删除 + + + + + + + + + + + + + 详情 + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue new file mode 100644 index 0000000..4a92993 --- /dev/null +++ b/src/views/system/process/editProcess.vue @@ -0,0 +1,229 @@ + + + + + + + 流程编辑 + + + + + 保存 + + + 关闭 + + + + + {{ form.number }} + + + {{ form.name }} + + + {{ form.business }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程配置 + + + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} - - - - - - - - - - - - - - - - - - - - - - - 重置 - - - - - - - - - - 编辑 - - - 详情 - - - 废止 - - - 删除 - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + 重置 + + + + + + + + + + 编辑 + + + 详情 + + + 废止 + + + 删除 + + + + + + + + + + + + + 详情 + diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue index b4b8abb..2e30a95 100644 --- a/src/views/system/user/list.user.vue +++ b/src/views/system/user/list.user.vue @@ -230,8 +230,10 @@ 组织机构 - + @@ -243,12 +245,16 @@ - + - + @@ -265,8 +271,10 @@ 重置密码 - + 角色分配 @@ -280,8 +288,10 @@ --> - + @@ -314,9 +324,9 @@ - + - +