diff --git a/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue b/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue
index f2123038..c5507bc0 100644
--- a/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue
+++ b/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue
@@ -4,6 +4,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
@@ -13,9 +33,9 @@
新增
导出
-
+
@@ -71,7 +91,14 @@
编辑
-
+ 详情
+
+
+
+ 删除
+
+
+
@@ -128,35 +155,45 @@
dataIndex: 'nums'
},
{
- title:'部件名称',
+ title:'款式名称',
align:"center",
- dataIndex: 'componentName'
+ dataIndex: 'styleName'
},
{
+ title:'部件名称',
+ align:"center",
+ dataIndex: 'componentName_dictText'
+ },
+ /*{
title:'描述',
align:"center",
dataIndex: 'descr'
- },
- {
+ },*/
+ /*{
title:'图片',
align:"center",
dataIndex: 'url',
scopedSlots: {customRender: 'imgSlot'}
- },
+ },*/
{
- title:'模块',
+ title:'模块样板',
align:"center",
dataIndex: 'moduleId_dictText'
},
- {
+ /*{
title:'用户',
align:"center",
dataIndex: 'userId'
- },
- {
+ },*/
+ /*{
title:'用户类型',
align:"center",
dataIndex: 'userType'
+ },*/
+ {
+ title: '创建时间',
+ align: "center",
+ dataIndex: 'createTime'
},
{
title: '操作',
@@ -199,6 +236,7 @@
fieldList.push({type:'string',value:'moduleId',text:'模块',dictCode:'zy_module_sample,module_name,id'})
fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
fieldList.push({type:'string',value:'userType',text:'用户类型',dictCode:''})
+ fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue b/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue
index e2e4f44d..8c6c6875 100644
--- a/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue
@@ -3,41 +3,61 @@
+
+
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
@@ -75,6 +95,25 @@
},
confirmLoading: false,
validatorRules: {
+ styleName: [
+ {required: true, message: '款式不能为空'},
+ ],
+ moduleId: [
+ {required: true, message: '不能为空'},
+ ],
+ componentName: [
+ {required: true, message: '不能为空'},
+ ],
+ nums: [
+ { required:true, message: '编号不能为空'},
+ { pattern: /^[0-9A-Za-z]{0,10}$/, message: '编号太长'},
+ ],
+ descr: [
+ {pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,200}$/, message: '文本长度过长'},
+ ],
+ userId:[
+ {required: true, message: '不能为空'},
+ ]
},
url: {
add: "/sample/zyComponentSample/add",
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java
index ce710f4b..e309078b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java
@@ -39,9 +39,14 @@ public class ZyComponentSample implements Serializable {
@Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号")
private String nums;
+ /**款式名称*/
+ @Excel(name = "款式名称", width = 15)
+ @ApiModelProperty(value = "款式名称")
+ private String styleName;
/**部件名称*/
@Excel(name = "部件名称", width = 15)
@ApiModelProperty(value = "部件名称")
+ @Dict(dictTable = "zy_cloths_component", dicText = "parts_name", dicCode = "id")
private String componentName;
/**描述*/
@Excel(name = "描述", width = 15)
@@ -65,8 +70,8 @@ public class ZyComponentSample implements Serializable {
@ApiModelProperty(value = "用户类型")
private String userType;
/**创建时间*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
}