..
This commit is contained in:
@@ -4,6 +4,7 @@ import com.budwk.app.base.model.BaseModel;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import org.nutz.dao.entity.annotation.*;
|
import org.nutz.dao.entity.annotation.*;
|
||||||
|
import org.nutz.dao.interceptor.annotation.PrevInsert;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@@ -11,9 +12,11 @@ import org.nutz.dao.entity.annotation.*;
|
|||||||
@Comment("流程分类")
|
@Comment("流程分类")
|
||||||
public class ProcessCategory extends BaseModel {
|
public class ProcessCategory extends BaseModel {
|
||||||
|
|
||||||
@Id
|
@Name
|
||||||
@Comment("ID")
|
@Comment("ID")
|
||||||
private Long id;
|
@PrevInsert(uu32 = true)
|
||||||
|
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||||
|
private String id;
|
||||||
|
|
||||||
@Comment("名称")
|
@Comment("名称")
|
||||||
@Column
|
@Column
|
||||||
|
|||||||
@@ -381,14 +381,15 @@
|
|||||||
.v4-logo-container {
|
.v4-logo-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-right: 40px;
|
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
width: 250px;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.v4-logo {
|
.v4-logo {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: auto;
|
width: auto;
|
||||||
margin-right: 16px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.v4-nav {
|
.v4-nav {
|
||||||
|
|||||||
@@ -1320,7 +1320,7 @@ layout("/layouts/v4/baseLayout.html"){
|
|||||||
|
|
||||||
.oa-news-item-title,
|
.oa-news-item-title,
|
||||||
.oa-notice-item-title {
|
.oa-notice-item-title {
|
||||||
font-size: 14px;
|
font-size: 15px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: #333;
|
color: #333;
|
||||||
margin-bottom: 6px;
|
margin-bottom: 6px;
|
||||||
|
|||||||
@@ -29,7 +29,11 @@ layout("/layouts/platform.html"){
|
|||||||
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
|
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
|
||||||
<el-table-column prop="displayName" label="流程定义名称"></el-table-column>
|
<el-table-column prop="displayName" label="流程定义名称"></el-table-column>
|
||||||
<el-table-column prop="name" label="流程定义编码"></el-table-column>
|
<el-table-column prop="name" label="流程定义编码"></el-table-column>
|
||||||
<el-table-column prop="type" label="流程分类"></el-table-column>
|
<el-table-column prop="category" label="流程分类">
|
||||||
|
<template slot-scope="{row}">
|
||||||
|
{{categoryOptions.find(v=>v.id === row.category)?.name}}
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="isDeployed" label="是否部署">
|
<el-table-column prop="isDeployed" label="是否部署">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<el-tag size="mini" v-if="row.isDeployed===1" type="success">是</el-tag>
|
<el-tag size="mini" v-if="row.isDeployed===1" type="success">是</el-tag>
|
||||||
@@ -67,7 +71,7 @@ layout("/layouts/platform.html"){
|
|||||||
:rules="{ required: false, message: '请选择流程分类', trigger: 'change' }"
|
:rules="{ required: false, message: '请选择流程分类', trigger: 'change' }"
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-select v-model="formData.category" placeholder="请选择流程分类" clearable>
|
<el-select v-model="formData.category" placeholder="请选择流程分类" clearable>
|
||||||
<el-option v-for="item in categoryOptions" :key="item.id" :label="item.categoryName"
|
<el-option v-for="item in categoryOptions" :key="item.id" :label="item.name"
|
||||||
:value="item.id"></el-option>
|
:value="item.id"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
Reference in New Issue
Block a user