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

流程分类

Browse Source
This commit is contained in:
xiangheng
2023-12-21 23:41:13 +08:00
parent 3471eb1a8f
commit e64a93c253
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
admin/src/views/flow_apply/edit.vue
View File

@@ -30,10 +30,10 @@
<el-form-item label="流程名称" prop="flowName"> <el-form-item label="流程名称" prop="flowName">
<el-input v-model="formData.flowName" placeholder="请输入流程名称" /> <el-input v-model="formData.flowName" placeholder="请输入流程名称" />
</el-form-item> </el-form-item>
<el-form-item label="流程分类" prop="flowGroup"> <!-- <el-form-item label="流程分类" prop="flowGroup">
<el-input v-model="formData.flowGroup" placeholder="请输入流程分类" /> <el-input v-model="formData.flowGroup" placeholder="请输入流程分类" />
</el-form-item> </el-form-item> -->
<el-form-item label="流程描述" prop="flowRemark"> <!-- <el-form-item label="流程描述" prop="flowRemark">
<el-input v-model="formData.flowRemark" placeholder="请输入流程描述" /> <el-input v-model="formData.flowRemark" placeholder="请输入流程描述" />
</el-form-item> </el-form-item>
@@ -44,7 +44,7 @@
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }" :autosize="{ minRows: 4, maxRows: 6 }"
/> />
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="状态：0待提交，1审批中，2审批完成，3审批失败" prop="status"> <!-- <el-form-item label="状态：0待提交，1审批中，2审批完成，3审批失败" prop="status">
<el-select <el-select
class="flex-1" class="flex-1"
@@ -94,12 +94,12 @@ const formData = reactive({
// applyUserId: '', // applyUserId: '',
// applyUserNickname: '', // applyUserNickname: '',
flowName: '', flowName: '',
flowGroup: '', // flowGroup: '',
flowRemark: '', // flowRemark: '',
flowFormData: '', // flowFormData: '',
flowProcessData: '', // flowProcessData: '',
status: 0, status: 0
formValue: '' // formValue: ''
}) })
const formRules = { const formRules = {
@@ -183,10 +183,10 @@ function handleTemplateChange(id: number) {
flow_template.value.find((item: any) => { flow_template.value.find((item: any) => {
if (item.id == id) { if (item.id == id) {
formData.flowName = item.flowName formData.flowName = item.flowName
formData.flowGroup = item.flowGroup // formData.flowGroup = item.flowGroup
formData.flowRemark = item.flowRemark // formData.flowRemark = item.flowRemark
formData.flowFormData = item.flowFormData // formData.flowFormData = item.flowFormData
formData.flowProcessData = item.flowProcessData // formData.flowProcessData = item.flowProcessData
return true return true
} }
}) })

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

@@ -63,7 +63,11 @@
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="ID" prop="id" /> <el-table-column label="ID" prop="id" />
<el-table-column label="数据名称" prop="name" min-width="120" /> <el-table-column label="数据名称" prop="name" min-width="120">
<template v-slot="{ row }">
<span :style="{ color: row.color }">{{ row.name }}</span>
</template>
</el-table-column>
<el-table-column label="数据值" prop="value" min-width="120" /> <el-table-column label="数据值" prop="value" min-width="120" />
<el-table-column label="颜色" prop="color" min-width="120" /> <el-table-column label="颜色" prop="color" min-width="120" />
<el-table-column label="状态"> <el-table-column label="状态">

4
server/admin/flow_apply/flow_apply_schema.go
View File

@@ -27,7 +27,7 @@ type FlowApplyAddReq struct {
TemplateId int `form:"templateId"` // 模板 TemplateId int `form:"templateId"` // 模板
ApplyUserId int `form:"applyUserId"` // 申请人id ApplyUserId int `form:"applyUserId"` // 申请人id
ApplyUserNickname string `form:"applyUserNickname"` // 申请人昵称 ApplyUserNickname string `form:"applyUserNickname"` // 申请人昵称
// FlowName string `form:"flowName"` // 流程名称 FlowName string `form:"flowName"` // 流程名称
// FlowGroup int `form:"flowGroup"` // 流程分类 // FlowGroup int `form:"flowGroup"` // 流程分类
// FlowRemark string `form:"flowRemark"` // 流程描述 // FlowRemark string `form:"flowRemark"` // 流程描述
// FlowFormData string `form:"flowFormData"` // 表单配置 // FlowFormData string `form:"flowFormData"` // 表单配置
@@ -43,7 +43,7 @@ type FlowApplyEditReq struct {
// TemplateId int `form:"templateId"` // 模板 // TemplateId int `form:"templateId"` // 模板
// ApplyUserId int `form:"applyUserId"` // 申请人id // ApplyUserId int `form:"applyUserId"` // 申请人id
// ApplyUserNickname string `form:"applyUserNickname"` // 申请人昵称 // ApplyUserNickname string `form:"applyUserNickname"` // 申请人昵称
// FlowName string `form:"flowName"` // 流程名称 FlowName string `form:"flowName"` // 流程名称
// FlowGroup int `form:"flowGroup"` // 流程分类 // FlowGroup int `form:"flowGroup"` // 流程分类
// FlowRemark string `form:"flowRemark"` // 流程描述 // FlowRemark string `form:"flowRemark"` // 流程描述
// FlowFormData string `form:"flowFormData"` // 表单配置 // FlowFormData string `form:"flowFormData"` // 表单配置

2
server/admin/flow_apply/flow_apply_service.go
View File

@@ -109,7 +109,7 @@ func (Service flowApplyService) Add(addReq FlowApplyAddReq) (e error) {
return return
} }
response.Copy(&obj, addReq) response.Copy(&obj, addReq)
obj.FlowName = flow_template_resp.FlowName // obj.FlowName = flow_template_resp.FlowName
obj.FlowGroup = flow_template_resp.FlowGroup obj.FlowGroup = flow_template_resp.FlowGroup
obj.FlowRemark = flow_template_resp.FlowRemark obj.FlowRemark = flow_template_resp.FlowRemark
obj.FlowFormData = flow_template_resp.FlowFormData obj.FlowFormData = flow_template_resp.FlowFormData