diff --git a/ruoyi-ui/src/views/benyi_train/video/index.vue b/ruoyi-ui/src/views/benyi_train/video/index.vue index 5eb93b147..018b6e6b5 100644 --- a/ruoyi-ui/src/views/benyi_train/video/index.vue +++ b/ruoyi-ui/src/views/benyi_train/video/index.vue @@ -407,7 +407,7 @@ export default { if (this.queryParams.type == null) { this.queryParams.type = ""; } else { - this.queryParams.type = this.queryParams.type.toString() + ","; + this.queryParams.type = this.queryParams.type.toString(); } this.queryParams.pageNum = 1; this.getList(); diff --git a/ruoyi-ui/src/views/benyi_train/video_study/index.vue b/ruoyi-ui/src/views/benyi_train/video_study/index.vue index 5af981e4b..ca45c5d47 100644 --- a/ruoyi-ui/src/views/benyi_train/video_study/index.vue +++ b/ruoyi-ui/src/views/benyi_train/video_study/index.vue @@ -171,7 +171,7 @@ export default { if (this.queryParams.type == null) { this.queryParams.type = ""; } else { - this.queryParams.type = this.queryParams.type.toString()+","; + this.queryParams.type = this.queryParams.type.toString(); } //console.log(this.queryParams.type); this.queryParams.pageNum = 1; diff --git a/ruoyi-ui/src/views/system/school/index.vue b/ruoyi-ui/src/views/system/school/index.vue index cc6f60a26..48c69c02b 100644 --- a/ruoyi-ui/src/views/system/school/index.vue +++ b/ruoyi-ui/src/views/system/school/index.vue @@ -145,106 +145,156 @@ /> - - - - - - - - - - - {{dict.dictLabel}} - - - - - - - - - - - - - - - - - - - - - - - - - - {{dict.dictLabel}} - - - - - - - - - - - - - - - - - - - - - - - - - - - {{dict.dictLabel}} - - - - - - + + + + + + + + + + + + + + + + + {{dict.dictLabel}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.dictLabel}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.dictLabel}} + + + + + + + + + +
确 定 取 消 @@ -269,6 +319,16 @@ export default { name: "School", data() { return { + placeholders: { + province: "请选择省", + city: "请选择市", + area: "请选择区" + }, + diglogForm: { + province: null, + city: null, + area: null + }, //显示集团属性的标志 flag1: false, // 遮罩层 @@ -297,6 +357,8 @@ export default { isDemonstrOptions: [], //幼儿园规模选项 scaleOptions: [], + //幼儿园列表 + schoolOptions: [], // 查询参数 queryParams: { pageNum: 1, @@ -350,6 +412,48 @@ export default { message: "请输入正确的手机号码", trigger: "blur" } + ], + provincename: [ + { + required: true, + message: "省市区不能为空", + trigger: "blur" + } + ], + address: [ + { + required: true, + message: "详细地址不能为空", + trigger: "blur" + } + ], + mastername: [ + { + required: true, + message: "联系人不能为空", + trigger: "blur" + } + ], + emMan: [ + { + required: true, + message: "紧急联系人不能为空", + trigger: "blur" + } + ], + emTel: [ + { + required: true, + message: "紧急联系人电话不能为空", + trigger: "blur" + } + ], + openDeadline: [ + { + required: true, + message: "开通截止日期不能为空", + trigger: "blur" + } ] } }; @@ -376,6 +480,9 @@ export default { this.getDicts("sys_yeyjfzt").then(response => { this.feeStatusOptions = response.data; }); + listSchool(null).then(response => { + this.schoolOptions = response.rows; + }); }, components: { //省市区三级联动全局组件 @@ -415,10 +522,10 @@ export default { parentId: undefined, province: undefined, provincename: undefined, - // regionid: undefined, - // regionname: undefined, - // area: undefined, - // areaname: undefined, + regionid: undefined, + regionname: undefined, + area: undefined, + areaname: undefined, address: undefined, mastername: undefined, tel: undefined, @@ -440,6 +547,12 @@ export default { dqxn: undefined, dqxq: undefined }; + + this.diglogForm.province = ""; + this.diglogForm.city = ""; + this.diglogForm.area = ""; + this.flag1 = false; + this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -470,6 +583,13 @@ export default { const id = row.id || this.ids; getSchool(id).then(response => { this.form = response.data; + this.diglogForm.province = response.data.provincename; + this.diglogForm.city = response.data.regionname; + this.diglogForm.area = response.data.areaname; + //判断是否下属园 + if (response.data.type == "3") { + this.flag1 = true; + } this.open = true; this.title = "修改幼儿园机构"; }); @@ -549,10 +669,22 @@ export default { }, //所在省市区触发联动方法 onSelected(data) { - this.form.provincename = data.province.value; - this.form.regionname = data.city.value; - this.form.areaname = data.area.value; + //console.log(data); + if ( + data.province.code == undefined || + data.city.code == undefined || + data.area.code == undefined + ) { + this.form.provincename = undefined; + } else { + this.form.provincename = data.province.value; + this.form.province = data.province.code; + this.form.regionname = data.city.value; + this.form.regionid = data.city.code; + this.form.areaname = data.area.value; + this.form.area = data.area.code; + } } } }; - \ No newline at end of file + diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java index 4b7a72886..bfec3419c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.project.common.CommonController; +import com.ruoyi.project.common.SchoolCommon; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,6 +38,8 @@ public class ByTrainVideoController extends BaseController { private IByTrainVideoService byTrainVideoService; @Autowired private CommonController commonController; + @Autowired + private SchoolCommon schoolCommon; /** @@ -46,6 +49,10 @@ public class ByTrainVideoController extends BaseController { @GetMapping("/list") public TableDataInfo list(ByTrainVideo byTrainVideo) { startPage(); + //判断type是否为空 + if (!schoolCommon.isStringEmpty(byTrainVideo.getType())) { + byTrainVideo.setType(byTrainVideo.getType() + ","); + } List list = byTrainVideoService.selectByTrainVideoList(byTrainVideo); if (list != null && list.size() > 0) { diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java index 965806cb6..1047a6923 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java @@ -38,7 +38,7 @@ public class BySchool extends BaseEntity /** 幼儿园类型1、独立2、集团3、集团下属 */ @Excel(name = "幼儿园类型1、独立2、集团3、集团下属") - private Long type; + private String type; /** 集团下属有parentid */ @Excel(name = "集团下属有parentid") @@ -94,7 +94,7 @@ public class BySchool extends BaseEntity /** 幼儿园规模 */ @Excel(name = "幼儿园规模") - private Long scale; + private String scale; /** 创建人ID */ @Excel(name = "创建人ID") @@ -114,7 +114,7 @@ public class BySchool extends BaseEntity /** 园所会员性质 */ @Excel(name = "园所会员性质") - private Long isDemonstr; + private String isDemonstr; /** 营业执照图片 */ @Excel(name = "营业执照图片") @@ -126,7 +126,7 @@ public class BySchool extends BaseEntity /** 幼儿园缴费状态（0未缴费，1已缴费，2已到期） */ @Excel(name = "幼儿园缴费状态", readConverterExp = "0=未缴费，1已缴费，2已到期") - private Long feeStatus; + private String feeStatus; /** 开通截至日期 */ @Excel(name = "开通截至日期", width = 30, dateFormat = "yyyy-MM-dd") @@ -184,12 +184,12 @@ public class BySchool extends BaseEntity { return nameShort; } - public void setType(Long type) + public void setType(String type) { this.type = type; } - public Long getType() + public String getType() { return type; } @@ -310,12 +310,12 @@ public class BySchool extends BaseEntity { return status; } - public void setScale(Long scale) + public void setScale(String scale) { this.scale = scale; } - public Long getScale() + public String getScale() { return scale; } @@ -355,12 +355,12 @@ public class BySchool extends BaseEntity { return location; } - public void setIsDemonstr(Long isDemonstr) + public void setIsDemonstr(String isDemonstr) { this.isDemonstr = isDemonstr; } - public Long getIsDemonstr() + public String getIsDemonstr() { return isDemonstr; } @@ -382,12 +382,12 @@ public class BySchool extends BaseEntity { return openBook; } - public void setFeeStatus(Long feeStatus) + public void setFeeStatus(String feeStatus) { this.feeStatus = feeStatus; } - public Long getFeeStatus() + public String getFeeStatus() { return feeStatus; }