20200407-lc-1

ruoyi-ui/src/views/system/school/index.vue

@@ -47,17 +47,6 @@
           <el-option label="请选择字典生成" value />
         </el-select>
       </el-form-item>
-      <!--
-      <el-form-item label="幼儿园规模" prop="scale">
-        <el-input
-          v-model="queryParams.scale"
-          placeholder="请输入幼儿园规模"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      -->
       <el-form-item label="创建时间" prop="approvalTime">
         <el-date-picker
           clearable
@@ -69,7 +58,6 @@
           placeholder="选择创建时间"
         ></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -119,39 +107,16 @@
 
     <el-table v-loading="loading" :data="schoolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="幼儿园ID" align="center" prop="id" />
       <el-table-column label="幼儿园名称" align="center" prop="schoolName" />
-      <el-table-column label="幼儿园类型" align="center" prop="type" />
+      <el-table-column label="幼儿园类型" align="center" prop="type" :formatter="typeFormat" />
       <el-table-column label="所在省" align="center" prop="provincename" />
       <el-table-column label="所在城市" align="center" prop="regionname" />
       <el-table-column label="详细地址" align="center" prop="address" />
       <el-table-column label="联系人" align="center" prop="mastername" />
       <el-table-column label="电话" align="center" prop="tel" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="创建人" align="center" prop="createUser" />
+      <!--<el-table-column label="创建人" align="center" prop="createUser" />-->
-      <!--<el-table-column label="幼儿园规模" align="center" prop="scale" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <!--
-      <el-table-column label="最后审核人ID" align="center" prop="approvalUser" />
-      <el-table-column label="审核时间" align="center" prop="approvalTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.approvalTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核备注" align="center" prop="remark" />
-      <el-table-column label="幼儿园位置" align="center" prop="location" />
-      <el-table-column label="园所会员性质" align="center" prop="isDemonstr" />
-      <el-table-column label="营业执照图片" align="center" prop="businesslicenseimg" />
-      <el-table-column label="家长手册发布状态" align="center" prop="openBook" />
-      <el-table-column label="幼儿园缴费状态" align="center" prop="feeStatus" />
-      <el-table-column label="开通截至日期" align="center" prop="openDeadline" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.openDeadline) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前学年" align="center" prop="dqxn" />
-      <el-table-column label="当前学期" align="center" prop="dqxq" />
-      -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -189,8 +154,8 @@
         <el-form-item label="幼儿园简称" prop="nameShort">
           <el-input v-model="form.nameShort" placeholder="请输入幼儿园简称" />
         </el-form-item>
-        <el-form-item label="幼儿园类型">
+        <el-form-item label="幼儿园类型" props="type">
-          <el-radio-group v-model="form.type" placeholder="请选择类型" @change="changeHandle">
+          <el-radio-group v-model="form.type" @change="changeHandle">
             <el-radio
               v-for="dict in typeOptions"
               :key="dict.dictValue"
@@ -201,11 +166,8 @@
         <el-form-item label="集团下属ID" prop="parentId" v-show="flag1">
           <el-input v-model="form.parentId" placeholder="请输入集团下属id" />
         </el-form-item>
-        <!--<el-form-item label="所在省" prop="province">
-          <el-input v-model="form.province" placeholder="请输入所在省" />
-        </el-form-item>-->
         <el-form-item label="所在省" prop="provincename">
-          <v-distpicker v-model="form.province" @selected="onSelected"></v-distpicker>
+          <v-distpicker v-model="form.provincename" @selected="onSelected"></v-distpicker>
         </el-form-item>
         <!--<el-form-item label="所在城市" prop="regionid">
           <el-input v-model="form.regionid" placeholder="请输入所在城市" />
@@ -234,7 +196,7 @@
         <el-form-item label="紧急联系电话" prop="emTel">
           <el-input v-model="form.emTel" placeholder="请输入紧急联系电话" />
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态" props="status">
           <el-radio-group v-model="form.status">
             <el-radio
               v-for="dict in statusOptions"
@@ -253,12 +215,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!--<el-form-item label="创建人ID" prop="createUser">-->
+        <el-form-item label="创建人ID" prop="createUser" v-show="false">
-        <el-input v-model="form.createUser" placeholder="请输入创建人ID" type="hidden" />
+          <el-input v-model="form.createUser" placeholder="请输入创建人ID" />
-        <!--</el-form-item>-->
+        </el-form-item>
-        <el-form-item label="最后审核人ID" prop="approvalUser">
+        <el-form-item label="最后审核人ID" prop="approvalUser" v-show="false">
           <el-input v-model="form.approvalUser" placeholder="请输入最后审核人ID" />
         </el-form-item>
+        <el-form-item label="创建时间" prop="createTime" v-show="false">
+          <el-input v-model="form.createTime"></el-input>
+        </el-form-item>
         <el-form-item label="审核时间" prop="approvalTime">
           <el-date-picker
             clearable
@@ -270,21 +235,29 @@
             placeholder="选择审核时间"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="幼儿园位置" prop="location">
-          <el-input v-model="form.location" placeholder="请输入幼儿园位置" />
-        </el-form-item>
         <el-form-item label="园所会员性质" prop="isDemonstr">
-          <el-input v-model="form.isDemonstr" placeholder="请输入园所会员性质" />
+          <el-select v-model="form.isDemonstr" placeholder="请选择">
+            <el-option
+              v-for="dict in isDemonstrOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="营业执照图片" prop="businesslicenseimg">
           <el-input v-model="form.businesslicenseimg" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="家长手册发布状态" prop="openBook">
+        <el-form-item label="家长手册发布状态" prop="openBook" v-show="false">
           <el-input v-model="form.openBook" placeholder="请输入家长手册发布状态" />
         </el-form-item>
-        <el-form-item label="幼儿园缴费状态">
+        <el-form-item label="幼儿园缴费状态" prop="feeStatus">
           <el-radio-group v-model="form.feeStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
+            <el-radio
+              v-for="dict in feeStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="开通截至日期" prop="openDeadline">
@@ -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,
+        // location: undefined,
-        isDemonstr: 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) {
+    onSelected(data) {
-      this.form.province = date.province.value;
+      this.form.provincename = data.province.value;
-      this.form.regionname = date.regionname.value;
+      this.form.regionname = data.city.value;
-      this.form.areaname = date.areaname.value;
+      this.form.areaname = data.area.value;
     }
   }
 };

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"
+        );
     }
 }

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));
     }