diff --git a/ruoyi-ui/src/views/system/school/index.vue b/ruoyi-ui/src/views/system/school/index.vue
index 317229388..af8a88b06 100644
--- a/ruoyi-ui/src/views/system/school/index.vue
+++ b/ruoyi-ui/src/views/system/school/index.vue
@@ -47,17 +47,6 @@
-
-
搜索
重置
@@ -119,39 +107,16 @@
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
+
-
+
- 请选择字典生成
+ {{dict.dictLabel}}
@@ -330,6 +303,7 @@ export default {
data() {
return {
//显示集团属性的标志
+ flag1: false,
// 遮罩层
loading: true,
// 选中数组
@@ -346,6 +320,16 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ //幼儿园类型开关
+ typeOptions: [],
+ //幼儿园状态开关数组
+ statusOptions: [],
+ //幼儿园缴费状态
+ feeStatusOptions: [],
+ //幼儿园会员性质
+ isDemonstrOptions: [],
+ //幼儿园规模选项
+ scaleOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -353,8 +337,6 @@ export default {
schoolName: undefined,
nameShort: undefined,
type: undefined,
- //幼儿园类型开关
- typeOptions: [],
parentId: undefined,
province: undefined,
provincename: undefined,
@@ -368,16 +350,12 @@ export default {
emMan: undefined,
emTel: undefined,
status: undefined,
- //幼儿园状态开关数组
- statusOptions: [],
scale: undefined,
- //幼儿园规模选项
- scaleOptions: [],
createUser: undefined,
createTime: undefined,
approvalUser: undefined,
approvalTime: undefined,
- location: undefined,
+ // location: undefined,
isDemonstr: undefined,
businesslicenseimg: undefined,
openBook: undefined,
@@ -406,9 +384,18 @@ export default {
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
+ //幼儿园规模选项
this.getDicts("sys_yeygm").then(response => {
this.scaleOptions = response.data;
});
+ //幼儿园园所会员性质选项
+ this.getDicts("sys_yeyysxz").then(response => {
+ this.isDemonstrOptions = response.data;
+ });
+ //幼儿园缴费状态
+ this.getDicts("sys_yeyjfzt").then(response => {
+ this.feeStatusOptions = response.data;
+ });
},
components: {
//省市区三级联动全局组件
@@ -424,6 +411,14 @@ export default {
this.loading = false;
});
},
+ // 状态字典翻译
+ statusFormat(row, column) {
+ return this.selectDictLabel(this.statusOptions, row.status);
+ },
+ // 幼儿园类型字典翻译
+ typeFormat(row, column) {
+ return this.selectDictLabel(this.typeOptions, row.type);
+ },
// 取消按钮
cancel() {
this.open = false;
@@ -435,7 +430,7 @@ export default {
id: undefined,
schoolName: undefined,
nameShort: undefined,
- type: undefined,
+ type: "1",
parentId: undefined,
province: undefined,
provincename: undefined,
@@ -449,17 +444,17 @@ export default {
emMan: undefined,
emTel: undefined,
status: "0",
- scale: undefined,
+ scale: "1",
createTime: undefined,
createUser: undefined,
approvalUser: undefined,
approvalTime: undefined,
remark: undefined,
- location: undefined,
- isDemonstr: undefined,
+ // location: undefined,
+ isDemonstr: "1",
businesslicenseimg: undefined,
openBook: undefined,
- feeStatus: "0",
+ feeStatus: "1",
openDeadline: undefined,
dqxn: undefined,
dqxq: undefined
@@ -572,10 +567,10 @@ export default {
}
},
//所在省市区触发联动方法
- onSelected(date) {
- this.form.province = date.province.value;
- this.form.regionname = date.regionname.value;
- this.form.areaname = date.areaname.value;
+ onSelected(data) {
+ this.form.provincename = data.province.value;
+ this.form.regionname = data.city.value;
+ this.form.areaname = data.area.value;
}
}
};
diff --git a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
index af398e6d4..3b48047ec 100644
--- a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -16,8 +16,16 @@ public class RuoYiApplication
{
System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
- System.out.println("-------^&^-------" +
+ System.out.println(
+ "-------^&^-------" +
"BenYi Startup success" +
- "-------^&^-------");
+ "-------^&^-------\n" +
+ "-------^&^-------" +
+ "BenYi Startup success" +
+ "-------^&^-------\n" +
+ "-------^&^-------" +
+ "BenYi Startup success" +
+ "-------^&^-------\n"
+ );
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
index 1a2a5b450..13d6413f4 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
@@ -80,6 +80,7 @@ public class BySchoolController extends BaseController
public AjaxResult add(@RequestBody BySchool bySchool)
{
bySchool.setCreateUser(SecurityUtils.getLoginUser().getUser().getUserId());
+ bySchool.setApprovalUser(SecurityUtils.getLoginUser().getUser().getUserId());
bySchool.setCreateTime(new Date());
return toAjax(bySchoolService.insertBySchool(bySchool));
}