zhc4dev
Gitea 2 years ago
parent 410881b015
commit bb351907f0
  1. 13
      ant-design-vue-jeecg/src/views/system/Depart3List.vue
  2. 13
      ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
  3. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  4. 28
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@ -121,6 +121,13 @@
label="排序">
<a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
</a-form-item>
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsPicture">
<j-image-upload isMultiple v-model="model.goodsPicture" ></j-image-upload>
</a-form-model-item>
<a-form-model-item label="视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsVideo">
<j-upload v-model="model.goodsVideo" ></j-upload>
<video v-if="model.goodsVideo" :src="video" style="border:1px solid #d9d9d9;width:100%;" :autoplay="autoplay"/>
</a-form-model-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@ -266,6 +273,7 @@
},
data() {
return {
autoplay:true,
iExpandedKeys: [],
loading: false,
autoExpandParent: true,
@ -328,7 +336,10 @@
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
video(){
return `${window._CONFIG['domianURL']}/sys/common/static/${this.model.goodsVideo}`
},
},
methods: {
loadData() {

@ -43,6 +43,13 @@
label="缩写">
<a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr ]"/>
</a-form-item>
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsPicture">
<j-image-upload isMultiple v-model="model.goodsPicture" ></j-image-upload>
</a-form-model-item>
<a-form-model-item label="视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsVideo">
<j-upload v-model="model.goodsVideo" ></j-upload>
<video v-if="model.goodsVideo" :src="video" style="border:1px solid #d9d9d9;width:100%;" :autoplay="autoplay"/>
</a-form-model-item>
<template v-if="orgCategoryDisabled">
<a-form-item
@ -124,6 +131,7 @@
components: {ATextarea},
data() {
return {
autoplay:true,
departTree: [],
orgTypeData: [],
phoneWarning: '',
@ -163,6 +171,11 @@
},
created() {
},
computed: {
video(){
return `${window._CONFIG['domianURL']}/sys/common/static/${this.model.goodsVideo}`
},
},
methods: {
loadTreeData() {
var that = this;

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
@ -86,6 +87,16 @@ public class SysDepart implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**图片*/
@Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片")
private java.lang.String goodsPicture;
/**视频*/
@Excel(name = "视频", width = 15)
@ApiModelProperty(value = "视频")
private java.lang.String goodsVideo;
/**
* 重写equals方法
*/
@ -120,7 +131,9 @@ public class SysDepart implements Serializable {
Objects.equals(createBy, depart.createBy) &&
Objects.equals(createTime, depart.createTime) &&
Objects.equals(updateBy, depart.updateBy) &&
Objects.equals(updateTime, depart.updateTime);
Objects.equals(updateTime, depart.updateTime) &&
Objects.equals(goodsPicture, depart.goodsPicture) &&
Objects.equals(goodsVideo, depart.goodsVideo);
}
/**
@ -132,6 +145,6 @@ public class SysDepart implements Serializable {
return Objects.hash(super.hashCode(), id, parentId, departName,
departNameEn, departNameAbbr, departOrder, description,orgCategory,
orgType, orgCode, mobile, fax, address, memo, status,
delFlag, createBy, createTime, updateBy, updateTime);
delFlag, createBy, createTime, updateBy, updateTime,goodsPicture,goodsVideo);
}
}

@ -77,6 +77,10 @@ public class SysDepartTreeModel implements Serializable{
private Date updateTime;
private java.lang.String goodsPicture;
private java.lang.String goodsVideo;
private List<SysDepartTreeModel> children = new ArrayList<>();
@ -109,6 +113,8 @@ public class SysDepartTreeModel implements Serializable{
this.createTime = sysDepart.getCreateTime();
this.updateBy = sysDepart.getUpdateBy();
this.updateTime = sysDepart.getUpdateTime();
this.goodsPicture = sysDepart.getGoodsPicture();
this.goodsVideo = sysDepart.getGoodsVideo();
}
public boolean getIsLeaf() {
@ -176,6 +182,22 @@ public class SysDepartTreeModel implements Serializable{
this.parentId = parentId;
}
public String getGoodsPicture() {
return goodsPicture;
}
public void setGoodsPicture(String goodsPicture) {
this.goodsPicture = goodsPicture;
}
public String getGoodsVideo() {
return goodsVideo;
}
public void setGoodsVideo(String goodsVideo) {
this.goodsVideo = goodsVideo;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
@ -367,7 +389,9 @@ public class SysDepartTreeModel implements Serializable{
Objects.equals(createTime, model.createTime) &&
Objects.equals(updateBy, model.updateBy) &&
Objects.equals(updateTime, model.updateTime) &&
Objects.equals(children, model.children);
Objects.equals(children, model.children)&&
Objects.equals(goodsPicture, model.goodsPicture)&&
Objects.equals(goodsVideo, model.goodsVideo);
}
/**
@ -379,7 +403,7 @@ public class SysDepartTreeModel implements Serializable{
return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
children);
children,goodsPicture,goodsVideo);
}
}

Loading…
Cancel
Save