zhc4dev
wangjiadong 2 years ago
parent c10f3b3c02
commit fa557c4895
  1. 15
      ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue
  2. 18
      ant-design-vue-jeecg/src/views/collecttype/admin/modules/CollectTypeModal.vue
  3. 38
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/collecttype/entity/CollectType.java

@ -4,6 +4,21 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="收藏分类名">
<a-input placeholder="请输入收藏分类名" v-model="queryParam.collectTypeName"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>

@ -11,21 +11,21 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item label="收藏分类名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeName">
<a-input v-model="model.collectTypeName" placeholder="请输入收藏分类名" ></a-input>
<a-input v-model="model.collectTypeName" placeholder="请输入顶级收藏夹" ></a-input>
</a-form-model-item>
<a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
<a-form-model-item label="上级收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
<j-tree-select
ref="treeSelect"
placeholder="请选择父级节点"
placeholder="请选择上级收藏夹"
v-model="model.pid"
dict="collect_type,collect_type_name,id"
pidField="pid"
pidValue="0"
hasChildField="has_child"
>
>
</j-tree-select>
</a-form-model-item>
</a-form-model>
</a-spin>
</j-modal>
@ -37,7 +37,7 @@
import { validateDuplicateValue } from '@/utils/util'
export default {
name: "CollectTypeModal",
components: {
components: {
},
data () {
return {
@ -64,7 +64,7 @@
},
expandedRowKeys:[],
pidField:"pid"
}
},
created () {
@ -146,8 +146,8 @@
}
}
}
}
}
</script>

@ -27,44 +27,44 @@ import java.io.UnsupportedEncodingException;
public class CollectType implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15)
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**收藏分类名*/
@Excel(name = "收藏分类名", width = 15)
/**收藏分类名*/
@Excel(name = "收藏分类名", width = 15)
@ApiModelProperty(value = "收藏分类名")
private java.lang.String collectTypeName;
/**父级节点*/
@Excel(name = "父级节点", width = 15)
@ApiModelProperty(value = "父级节点")
/**上级收藏夹*/
@Excel(name = "上级收藏夹", width = 15)
@ApiModelProperty(value = "上级收藏夹")
private java.lang.String pid;
/**是否有子节点*/
@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
/**是否有子节点*/
@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "是否有子节点")
private java.lang.String hasChild;
}

Loading…
Cancel
Save