@@ -50,40 +53,18 @@
-
- 无图片
- ![]()
-
-
- 无文件
-
- 下载
-
-
+
编辑
+
+ 详情
+
+
+
+ 删除
+
-
-
- 更多
-
-
- 详情
-
-
-
- 删除
-
-
-
-
@@ -95,206 +76,206 @@
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
index fa0a282..619c975 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
@@ -5,12 +5,16 @@
-
+
+
-
+
+
@@ -35,72 +39,85 @@
-
+
+
-
+
+
-
+
+
-
+
-
+
-
+
-
+
-
+
+
-
+
+
-
+
-
+
+
-
+
+
-
+
+
-
+
+
@@ -118,6 +135,7 @@
import { httpAction, getAction } from '@api/manage'
import { validateDuplicateValue } from '@/utils/util'
+ import moment from "dayjs";
export default {
name: 'ModulexForm',
@@ -134,6 +152,13 @@
data () {
return {
model:{
+ workLevel: 2,
+ workStatus: 0,
+ duration: 1,
+ submitTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ realDuration: 16,
+ status: 1,
+ verisonStatus: 1,
},
labelCol: {
xs: { span: 24 },
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue b/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
index f4c48dc..8c359e0 100644
--- a/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
@@ -4,6 +4,20 @@
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
@@ -12,18 +26,18 @@
新增
-
导出
-
- 导入
-
-
-
-
-
- 删除
-
- 批量操作
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54,36 +68,19 @@
无图片
![]()
-
- 无文件
-
- 下载
-
-
+
编辑
-
- 更多
-
-
- 详情
-
-
-
- 删除
-
-
-
-
+ 详情
+
+
+
+ 删除
+
+
@@ -124,7 +121,7 @@
{
title:'项目id',
align:"center",
- dataIndex: 'projectId'
+ dataIndex: 'projectId_dictText'
},
{
title:'角色名称',
@@ -139,12 +136,17 @@
{
title:'父用户',
align:"center",
- dataIndex: 'sourceId'
+ dataIndex: 'sourceId_dictText'
},
{
title:'上级用户',
align:"center",
- dataIndex: 'pid'
+ dataIndex: 'pid_dictText'
+ },
+ {
+ title:'创建时间',
+ align:"center",
+ dataIndex: 'createTime'
},
{
title: '操作',
@@ -161,7 +163,7 @@
deleteBatch: "/projectx/projectUserRole/deleteBatch",
exportXlsUrl: "/projectx/projectUserRole/exportXls",
importExcelUrl: "projectx/projectUserRole/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
index 03bd00e..12f7ead 100644
--- a/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
@@ -4,28 +4,32 @@
-
-
+
+
-
+
-
+
-
+
-
+
+
@@ -36,89 +40,86 @@
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
index 8712f85..0c2b0c2 100644
--- a/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
+++ b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
@@ -37,25 +37,25 @@
新增
-
导出
-
- 导入
-
-
-
-
-
-
-
- 删除
-
-
- 批量操作
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -92,19 +92,13 @@
编辑
-
- 更多
-
-
- 详情
-
-
-
- 删除
-
-
-
-
+ 详情
+
+
+
+ 删除
+
+
@@ -157,21 +151,21 @@ export default {
align: "center",
dataIndex: 'projectCode'
},
- {
- title: '项目描述',
- align: "center",
- dataIndex: 'pmDescribe'
- },
- {
- title: '项目图片',
- align: "center",
- dataIndex: 'projectPic'
- },
- {
- title: '项目网址',
- align: "center",
- dataIndex: 'projectUrl'
- },
+ // {
+ // title: '项目描述',
+ // align: "center",
+ // dataIndex: 'pmDescribe'
+ // },
+ // {
+ // title: '项目图片',
+ // align: "center",
+ // dataIndex: 'projectPic'
+ // },
+ // {
+ // title: '项目网址',
+ // align: "center",
+ // dataIndex: 'projectUrl'
+ // },
// {
// title:'源码地址',
// align:"center",
@@ -203,16 +197,21 @@ export default {
return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
}
},
- // {
- // title:'复制来源',
- // align:"center",
- // dataIndex: 'sourceProjectId'
- // },
+ {
+ title:'复制来源',
+ align:"center",
+ dataIndex: 'sourceProjectId_dictText'
+ },
{
title: '项目状态',
align: "center",
dataIndex: 'projectStatus_dictText'
},
+ {
+ title: '创建时间',
+ align: "center",
+ dataIndex: 'createTime'
+ },
{
title: '管理',
dataIndex: 'htmlSlot',
diff --git a/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
index 199451a..e31b1c1 100644
--- a/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
+++ b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
@@ -25,7 +25,8 @@
-
+
+
@@ -50,17 +51,19 @@
-
+
-
+
-
+
+
@@ -77,7 +80,7 @@
-
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
index 2a1a376..8921e72 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
@@ -51,15 +51,28 @@ public class Modulex implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
- /**上级模块id*/
+ /**
+ * 上级模块id
+ * 关联表字段 modulex.id
+ * 显示：上级名称
+ */
@Excel(name = "上级模块id", width = 15)
@ApiModelProperty(value = "上级模块id")
+ @Dict(dictTable = "modulex",dicText = "module_name",dicCode = "id")
private String pid;
- /**项目id*/
+ /**
+ * 项目id
+ * 关联表字段 modulex.id
+ * 显示：项目名称
+ */
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
+ @Dict(dictTable = "projectx",dicText = "project_name",dicCode = "id")
private String projectId;
- /**中文名称*/
+ /**
+ * 中文名称
+ * 相同上级的模块不能重名
+ */
@Excel(name = "中文名称", width = 15)
@ApiModelProperty(value = "中文名称")
private String moduleName;
@@ -75,7 +88,11 @@ public class Modulex implements Serializable {
@Excel(name = "内容描述", width = 15)
@ApiModelProperty(value = "内容描述")
private String pmDescribe;
- /**责任人*/
+ /**
+ * 责任人
+ * 关联表字段 用户表.id(s)
+ * 用户id列表；模块的开发任务可以分配给多个人员；显示：用户名称（列表）
+ */
@Excel(name = "责任人", width = 15)
@ApiModelProperty(value = "责任人")
private String managerUsers;
@@ -89,7 +106,7 @@ public class Modulex implements Serializable {
private Integer workLevel;
/**
* 任务状态
- * 值：未发布0、已发布1、开发中2、已完成3、已驳回8；默认0
+ * 值：未发布0、已发布1、开发中2、已完成3、已审核4、DEBUG9；默认0
*/
@Excel(name = "任务状态", width = 15)
@ApiModelProperty(value = "任务状态")
@@ -101,7 +118,10 @@ public class Modulex implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布时间")
private Date publishTime;
- /**任务时长*/
+ /**
+ * 任务时长
+ * 单位小时；等于下级模块时长的和；默认1（小时）
+ */
@Excel(name = "任务时长", width = 15)
@ApiModelProperty(value = "任务时长")
private Double duration;
@@ -121,13 +141,22 @@ public class Modulex implements Serializable {
@Excel(name = "实际时长", width = 15)
@ApiModelProperty(value = "实际时长")
private Double realDuration;
- /**用户角色*/
+ /**
+ * 用户角色
+ * 关联表字段 project_user_role.id(s)
+ * 规则 角色列表；哪些用户可以使用该模块，即未来系统的权限分配；显示角色名（列表）
+ */
@Excel(name = "用户角色", width = 15)
@ApiModelProperty(value = "用户角色")
private String userRole;
- /**关联实体*/
+ /**
+ * 关联实体
+ * 关联表字段 tablex.id
+ * 规则 关联实体表；关联的是该模块管理的实体；最下级（子）模块有；显示表名
+ */
@Excel(name = "关联实体", width = 15)
@ApiModelProperty(value = "关联实体")
+ @Dict(dictTable = "tablex",dicText = "table_name",dicCode = "id")
private String relatedBean;
/**原型图*/
@Excel(name = "原型图", width = 15)
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
index 8d95b08..0dfd71f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -50,9 +51,14 @@ public class ProjectUserRole implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
- /**项目id*/
+ /**
+ * 项目id
+ * 关联表字段 projectx.id
+ * 显示：项目名称
+ */
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
+ @Dict(dictTable = "projectx",dicText = "project_name",dicCode = "id")
private String projectId;
/**角色名称*/
@Excel(name = "角色名称", width = 15)
@@ -62,12 +68,22 @@ public class ProjectUserRole implements Serializable {
@Excel(name = "角色描述", width = 15)
@ApiModelProperty(value = "角色描述")
private String pmDescribe;
- /**父用户*/
+ /**
+ * 父用户
+ * 关联表字段 project_user_role.id
+ * 继承的用户角色；显示：角色名称
+ */
@Excel(name = "父用户", width = 15)
@ApiModelProperty(value = "父用户")
+ @Dict(dictTable = "project_user_role",dicText = "user_role",dicCode = "id")
private String sourceId;
- /**上级用户*/
+ /**
+ * 上级用户
+ * 关联表字段 project_user_role.id
+ * 本用户的上级用户角色；显示：角色名称
+ */
@Excel(name = "上级用户", width = 15)
@ApiModelProperty(value = "上级用户")
+ @Dict(dictTable = "project_user_role",dicText = "user_role",dicCode = "id")
private String pid;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
index b09eb84..b66b103 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
@@ -99,9 +99,14 @@ public class Projectx implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "完成时间")
private Date completeTime;
- /**复制来源*/
+ /**
+ * 复制来源
+ * 关联表字段 projectx.id
+ * 规则 复制源项目的id；显示：源项目名称
+ */
@Excel(name = "复制来源", width = 15)
@ApiModelProperty(value = "复制来源")
+ @Dict(dictTable = "projectx", dicText = "project_name",dicCode = "id")
private String sourceProjectId;
/**项目状态*/
@Excel(name = "项目状态", width = 15)