apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-10-24 00:23:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整目录

Browse Source
This commit is contained in:
xiangheng
2023-12-22 15:53:24 +08:00
parent 0927cf3ee6
commit 791c68e9a6
14 changed files with 94 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin/src/api/flow_apply.ts → admin/src/api/flow/flow_apply.ts
View File

@@ -2,25 +2,25 @@ import request from '@/utils/request'
// 申请流程列表
export function flow_apply_lists(params?: Record<string, any>) {
return request.get({ url: '/flow_apply/list', params })
return request.get({ url: '/flow/flow_apply/list', params })
}
// 申请流程详情
export function flow_apply_detail(params: Record<string, any>) {
return request.get({ url: '/flow_apply/detail', params })
return request.get({ url: '/flow/flow_apply/detail', params })
}
// 申请流程新增
export function flow_apply_add(params: Record<string, any>) {
return request.post({ url: '/flow_apply/add', params })
return request.post({ url: '/flow/flow_apply/add', params })
}
// 申请流程编辑
export function flow_apply_edit(params: Record<string, any>) {
return request.post({ url: '/flow_apply/edit', params })
return request.post({ url: '/flow/flow_apply/edit', params })
}
// 申请流程删除
export function flow_apply_delete(params: Record<string, any>) {
return request.post({ url: '/flow_apply/del', params })
return request.post({ url: '/flow/flow_apply/del', params })
}

18
admin/src/api/flow_history.ts → admin/src/api/flow/flow_history.ts
View File

@@ -2,42 +2,42 @@ import request from '@/utils/request/index'
// 流程历史列表
export function flow_history_list(params?: Record<string, any>) {
return request.get({ url: '/flow_history/list', params })
return request.get({ url: '/flow/flow_history/list', params })
}
// 流程历史列表-所有
export function flow_history_list_all(params?: Record<string, any>) {
return request.get({ url: '/flow_history/listAll', params })
return request.get({ url: '/flow/flow_history/listAll', params })
}
// 流程历史详情
export function flow_history_detail(params: Record<string, any>) {
return request.get({ url: '/flow_history/detail', params })
return request.get({ url: '/flow/flow_history/detail', params })
}
// 流程历史新增
export function flow_history_add(params: Record<string, any>) {
return request.post({ url: '/flow_history/add', params })
return request.post({ url: '/flow/flow_history/add', params })
}
// 流程历史编辑
export function flow_history_edit(params: Record<string, any>) {
return request.post({ url: '/flow_history/edit', params })
return request.post({ url: '/flow/flow_history/edit', params })
}
// 流程历史删除
export function flow_history_delete(params: Record<string, any>) {
return request.post({ url: '/flow_history/del', params })
return request.post({ url: '/flow/flow_history/del', params })
}
// 获取下一个审批节点，中间可能有系统任务和结束节点被跳过
export function flow_history_next_node(params: Record<string, any>) {
return request.post({ url: '/flow_history/next_node', params })
return request.post({ url: '/flow/flow_history/next_node', params })
}
// 获取下一个审批节点，中间可能有系统任务和结束节点被跳过
export function flow_history_get_approver(params: Record<string, any>) {
return request.post({ url: '/flow_history/get_approver', params })
return request.post({ url: '/flow/flow_history/get_approver', params })
}
export function flow_history_pass(params: Record<string, any>) {
return request.post({ url: '/flow_history/pass', params })
return request.post({ url: '/flow/flow_history/pass', params })
}

12
admin/src/api/flow_template.ts → admin/src/api/flow/flow_template.ts
View File

@@ -2,30 +2,30 @@ import request from '@/utils/request'
// 流程模板列表
export function flow_template_lists(params?: Record<string, any>) {
return request.get({ url: '/flow_template/list', params })
return request.get({ url: '/flow/flow_template/list', params })
}
// 流程模板列表-所有
export function flow_template_lists_all(params?: Record<string, any>) {
return request.get({ url: '/flow_template/listAll', params })
return request.get({ url: '/flow/flow_template/listAll', params })
}
// 流程模板详情
export function flow_template_detail(params: Record<string, any>) {
return request.get({ url: '/flow_template/detail', params })
return request.get({ url: '/flow/flow_template/detail', params })
}
// 流程模板新增
export function flow_template_add(params: Record<string, any>) {
return request.post({ url: '/flow_template/add', params })
return request.post({ url: '/flow/flow_template/add', params })
}
// 流程模板编辑
export function flow_template_edit(params: Record<string, any>) {
return request.post({ url: '/flow_template/edit', params })
return request.post({ url: '/flow/flow_template/edit', params })
}
// 流程模板删除
export function flow_template_delete(params: Record<string, any>) {
return request.post({ url: '/flow_template/del', params })
return request.post({ url: '/flow/flow_template/del', params })
}

3
admin/src/views/flow_apply/components/apply_submit.vue → admin/src/views/flow/flow_apply/components/apply_submit.vue
View File

@@ -60,7 +60,7 @@ import {
flow_history_next_node,
flow_history_get_approver,
flow_history_pass
} from '@/api/flow_history'
} from '@/api/flow/flow_history'
const dialogVisible = ref(false)
@@ -153,3 +153,4 @@ defineExpose({
// margin: 0; /* 如果页面出现垂直滚动条，则加入此行CSS以消除之 */
// }
</style>
@/api/flow/flow_history

5
admin/src/views/flow_apply/edit.vue → admin/src/views/flow/flow_apply/edit.vue
View File

@@ -67,8 +67,8 @@
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { flow_apply_edit, flow_apply_add, flow_apply_detail } from '@/api/flow_apply'
import { flow_template_lists_all } from '@/api/flow_template'
import { flow_apply_edit, flow_apply_add, flow_apply_detail } from '@/api/flow/flow_apply'
import { flow_template_lists_all } from '@/api/flow/flow_template'
import Popup from '@/components/popup/index.vue'
import feedback from '@/utils/feedback'
@@ -236,3 +236,4 @@ defineExpose({
getDetail
})
</script>
@/api/flow/flow_apply@/api/flow/flow_template

5
admin/src/views/flow_apply/index.vue → admin/src/views/flow/flow_apply/index.vue
View File

@@ -120,13 +120,13 @@ import {
flow_apply_lists,
flow_apply_edit,
flow_apply_detail
} from '@/api/flow_apply'
} from '@/api/flow/flow_apply'
import { useDictData } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import ApplySubmit from '@/views/flow_apply/components/apply_submit.vue'
import ApplySubmit from './components/apply_submit.vue'
import ViewForm from '@/components/flow/XForm/view.vue'
import useUserStore from '@/stores/modules/user'
@@ -227,3 +227,4 @@ const SaveViewForm = (id, form_data) => {
}
getLists()
</script>
@/api/flow/flow_apply

0
admin/src/views/flow_history/done.vue → admin/src/views/flow/flow_history/done.vue
View File

88
admin/src/views/flow_history/edit.vue → admin/src/views/flow/flow_history/edit.vue
View File

@@ -10,51 +10,56 @@
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="申请id" prop="applyId">
<el-input v-model="formData.applyId" placeholder="请输入申请id" />
</el-form-item>
<el-form-item label="模板id" prop="templateId">
<el-input v-model="formData.templateId" placeholder="请输入模板id" />
</el-form-item>
<el-form-item label="申请人id" prop="applyUserId">
<el-input v-model="formData.applyUserId" placeholder="请输入申请人id" />
</el-form-item>
<el-form-item label="申请人昵称" prop="applyUserNickname">
<el-input v-model="formData.applyUserNickname" placeholder="请输入申请人昵称" />
</el-form-item>
<el-form-item label="审批人id" prop="approverId">
<el-input v-model="formData.approverId" placeholder="请输入审批人id" />
</el-form-item>
<el-form-item label="审批用户昵称" prop="approverNickname">
<el-input v-model="formData.approverNickname" placeholder="请输入审批用户昵称" />
</el-form-item>
<el-form-item label="节点" prop="nodeId">
<el-input v-model="formData.nodeId" placeholder="请输入节点" />
</el-form-item>
<el-form-item label="表单值" prop="formValue">
<el-input
v-model="formData.formValue"
placeholder="请输入表单值"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
<el-form-item label="通过状态：0待处理，1通过，2拒绝" prop="passStatus">
<el-radio-group v-model="formData.passStatus" placeholder="请选择通过状态：0待处理，1通过，2拒绝">
<el-radio label="0">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="通过备注" prop="passRemark">
<el-input v-model="formData.passRemark" placeholder="请输入通过备注" />
</el-form-item>
<el-form-item label="申请id" prop="applyId">
<el-input v-model="formData.applyId" placeholder="请输入申请id" />
</el-form-item>
<el-form-item label="模板id" prop="templateId">
<el-input v-model="formData.templateId" placeholder="请输入模板id" />
</el-form-item>
<el-form-item label="申请人id" prop="applyUserId">
<el-input v-model="formData.applyUserId" placeholder="请输入申请人id" />
</el-form-item>
<el-form-item label="申请人昵称" prop="applyUserNickname">
<el-input v-model="formData.applyUserNickname" placeholder="请输入申请人昵称" />
</el-form-item>
<el-form-item label="审批人id" prop="approverId">
<el-input v-model="formData.approverId" placeholder="请输入审批人id" />
</el-form-item>
<el-form-item label="审批用户昵称" prop="approverNickname">
<el-input
v-model="formData.approverNickname"
placeholder="请输入审批用户昵称"
/>
</el-form-item>
<el-form-item label="节点" prop="nodeId">
<el-input v-model="formData.nodeId" placeholder="请输入节点" />
</el-form-item>
<el-form-item label="表单值" prop="formValue">
<el-input
v-model="formData.formValue"
placeholder="请输入表单值"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
<el-form-item label="通过状态：0待处理，1通过，2拒绝" prop="passStatus">
<el-radio-group
v-model="formData.passStatus"
placeholder="请选择通过状态：0待处理，1通过，2拒绝"
>
<el-radio label="0">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="通过备注" prop="passRemark">
<el-input v-model="formData.passRemark" placeholder="请输入通过备注" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { flow_history_edit, flow_history_add, flow_history_detail } from '@/api/flow_history'
import { flow_history_edit, flow_history_add, flow_history_detail } from '@/api/flow/flow_history'
import Popup from '@/components/popup/index.vue'
import feedback from '@/utils/feedback'
import type { PropType } from 'vue'
@@ -83,7 +88,7 @@ const formData = reactive({
nodeId: '',
formValue: '',
passStatus: '',
passRemark: '',
passRemark: ''
})
const formRules = {
@@ -163,7 +168,7 @@ const formRules = {
message: '请输入通过备注',
trigger: ['blur']
}
],
]
}
const handleSubmit = async () => {
@@ -206,3 +211,4 @@ defineExpose({
getDetail
})
</script>
@/api/flow/flow_history

3
admin/src/views/flow_history/index.vue → admin/src/views/flow/flow_history/index.vue
View File

@@ -85,7 +85,7 @@
</div>
</template>
<script lang="ts" setup>
import { flow_history_delete, flow_history_list } from '@/api/flow_history'
import { flow_history_delete, flow_history_list } from '@/api/flow/flow_history'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -134,3 +134,4 @@ const handleDelete = async (id: number) => {
getLists()
</script>
@/api/flow/flow_history

7
admin/src/views/flow_history/todo.vue → admin/src/views/flow/flow_history/todo.vue
View File

@@ -71,13 +71,13 @@
</div>
</template>
<script lang="ts" setup>
import { flow_apply_detail } from '@/api/flow_apply'
import { flow_history_list, flow_history_edit } from '@/api/flow_history'
import { flow_apply_detail } from '@/api/flow/flow_apply'
import { flow_history_list, flow_history_edit } from '@/api/flow/flow_history'
import { useDictData } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import useUserStore from '@/stores/modules/user'
import ApplySubmit from '@/views/flow_apply/components/apply_submit.vue'
import ApplySubmit from '@/views/flow/flow_apply/components/apply_submit.vue'
import ViewForm from '@/components/flow/XForm/view.vue'
const userStore = useUserStore()
@@ -153,3 +153,4 @@ const OpenApplySubmit = async (row: any) => {
}
getLists()
</script>
@/api/flow/flow_apply@/api/flow/flow_history

7
admin/src/views/flow_template/edit.vue → admin/src/views/flow/flow_template/edit.vue
View File

@@ -41,7 +41,11 @@
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { flow_template_edit, flow_template_add, flow_template_detail } from '@/api/flow_template'
import {
flow_template_edit,
flow_template_add,
flow_template_detail
} from '@/api/flow/flow_template'
import Popup from '@/components/popup/index.vue'
import feedback from '@/utils/feedback'
import type { PropType } from 'vue'
@@ -146,3 +150,4 @@ defineExpose({
getDetail
})
</script>
@/api/flow/flow_template

6
admin/src/views/flow_template/index.vue → admin/src/views/flow/flow_template/index.vue
View File

@@ -75,9 +75,8 @@ import {
flow_template_delete,
flow_template_lists,
flow_template_edit,
flow_template_add,
flow_template_detail
} from '@/api/flow_template'
flow_template_add
} from '@/api/flow/flow_template'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
@@ -182,3 +181,4 @@ const handleConfig = async (data: any) => {
}
getLists()
</script>
@/api/flow/flow_template

6
admin/src/views/setting/dict/data/edit.vue
View File

@@ -30,11 +30,7 @@
<el-input v-model="formData.value" placeholder="请输入数据值" clearable />
</el-form-item>
<el-form-item label="颜色" prop="color">
<el-input
v-model="formData.color"
placeholder="请输入颜色值（可选）"
clearable
/>
<el-color-picker v-model="formData.color" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<div>

6
server/admin/flow/enter.go
View File

@@ -20,7 +20,7 @@ func FlowApplyRoute(rg *gin.RouterGroup) {
handle := flow_apply.FlowApplyHandler{}
rg = rg.Group("/", middleware.TokenAuth())
rg = rg.Group("/flow", middleware.TokenAuth())
rg.GET("/flow_apply/list", handle.List)
rg.GET("/flow_apply/detail", handle.Detail)
rg.POST("/flow_apply/add", handle.Add)
@@ -44,7 +44,7 @@ func FlowHistoryRoute(rg *gin.RouterGroup) {
handle := flow_history.FlowHistoryHandler{}
rg = rg.Group("/", middleware.TokenAuth())
rg = rg.Group("/flow", middleware.TokenAuth())
rg.GET("/flow_history/list", handle.List)
rg.GET("/flow_history/listAll", handle.ListAll)
rg.GET("/flow_history/detail", handle.Detail)
@@ -73,7 +73,7 @@ func FlowTemplateRoute(rg *gin.RouterGroup) {
handle := flow_template.FlowTemplateHandler{}
rg = rg.Group("/", middleware.TokenAuth())
rg = rg.Group("/flow", middleware.TokenAuth())
rg.GET("/flow_template/list", handle.List)
rg.GET("/flow_template/listAll", handle.ListAll)
rg.GET("/flow_template/detail", handle.Detail)