From a9092c13255ef2fd6cb35fccfafd38f24c2ea2f8 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 1 Feb 2021 17:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BC=E5=84=BF=E5=9B=AD=E4=B8=80=E6=97=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benyi/dayflowassessmentplan/index.vue     | 122 +++++++++++++++---
 .../ByDayflowassessmentplanController.java    |   3 +
 2 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
index 3fc3dc393..252ddd7d8 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
@@ -7,13 +7,19 @@
       label-width="70px"
     >
       <el-form-item label="学年学期" prop="xnxq">
-        <el-input
+        <el-select
           v-model="queryParams.xnxq"
-          placeholder="请输入评估学年学期"
+          placeholder="请选择学年学期"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="dict in xnxqOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="评估月份" prop="month">
         <el-date-picker
@@ -21,20 +27,26 @@
           size="small"
           style="width: 200px"
           v-model="queryParams.month"
-          type="date"
+          type="month"
           value-format="yyyy-MM-dd"
           placeholder="选择评估月份"
         >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="评估班级" prop="classid">
-        <el-input
+        <el-select
           v-model="queryParams.classid"
-          placeholder="请输入评估班级"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择班级"
+        >
+          <el-option
+            v-for="dict in classOptions"
+            :key="dict.bjbh"
+            :label="dict.bjmc"
+            :value="dict.bjbh"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -92,12 +104,12 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
-      <el-table-column label="评估学校" align="center" prop="deptId" />
-      <el-table-column label="评估月份" align="center" prop="month" width="180">
+      <!-- <el-table-column label="评估学校" align="center" prop="deptId" /> -->
+      <!-- <el-table-column label="评估月份" align="center" prop="month" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.month, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="评估学年学期" align="center" prop="xnxq" />
       <el-table-column label="评估班级" align="center" prop="classid" />
       <el-table-column label="评估内容" align="center" prop="connent" />
@@ -105,13 +117,12 @@
         label="评估时间"
         align="center"
         prop="starttime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.starttime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createUserid" />
+      <!-- <el-table-column label="创建人" align="center" prop="createUserid" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -150,22 +161,36 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="学年学期" prop="xnxq">
-          <el-input v-model="form.xnxq" placeholder="请输入评估学年学期" />
+          <el-select v-model="form.xnxq" placeholder="请选择学年学期">
+            <el-option
+              v-for="dict in xnxqOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="评估月份" prop="month">
+        <!-- <el-form-item label="评估月份" prop="month">
           <el-date-picker
             clearable
             size="small"
             style="width: 200px"
             v-model="form.month"
-            type="date"
+            type="month"
             value-format="yyyy-MM-dd"
             placeholder="选择评估月份"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="评估班级" prop="classid">
-          <el-input v-model="form.classid" placeholder="请输入评估班级" />
+          <el-select v-model="form.classid" placeholder="请选择班级">
+            <el-option
+              v-for="dict in classOptions"
+              :key="dict.bjbh"
+              :label="dict.bjmc"
+              :value="dict.bjbh"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="评估内容" prop="connent">
           <el-input v-model="form.connent" placeholder="请输入评估内容" />
@@ -174,7 +199,7 @@
           <el-date-picker
             clearable
             size="small"
-            style="width: 200px"
+            class="my-date-picker"
             v-model="form.starttime"
             type="date"
             value-format="yyyy-MM-dd"
@@ -199,6 +224,7 @@ import {
   addDayflowassessmentplan,
   updateDayflowassessmentplan,
 } from "@/api/benyi/dayflowassessmentplan";
+import { listClass } from "@/api/system/class";
 
 export default {
   name: "Dayflowassessmentplan",
@@ -220,6 +246,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 学年学期
+      xnxqOptions: [],
+      // 班级
+      classOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -235,13 +265,46 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+          xnxq: [{ required: true, message: "学年学期不能为空", trigger: "blur" }],
+          classid: [{ required: true, message: "班级不能为空", trigger: "blur" }],
+          connent: [{ required: true, message: "评估内容不能为空", trigger: "blur" }],
+          starttime: [{ required: true, message: "评估时间不能为空", trigger: "blur" }],
+      },
     };
   },
   created() {
     this.getList();
+    this.getClassList();
+    this.getDicts("sys_xnxq").then((response) => {
+      this.xnxqOptions = response.data;
+    });
   },
   methods: {
+    // 字典翻译
+    classFormat(row, column) {
+      // return this.selectDictLabel(this.classOptions, row.classid);
+      var actions = [];
+      var datas = this.classOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].bjbh == "" + row.classid) {
+          actions.push(datas[key].bjmc);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    getClassList() {
+      listClass(null).then((response) => {
+        this.classOptions = response.rows;
+        // console.log(response.rows[0].bjbh);
+        // this.form.classid = response.rows[0].bjbh;
+      });
+    },
+    // 学年学期类型--字典状态字典翻译
+    xnxqFormat(row, column) {
+      return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+    },
     /** 查询幼儿园一日流程评估计划列表 */
     getList() {
       this.loading = true;
@@ -351,3 +414,20 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.el-select {
+  width: 100%;
+}
+.my-date-picker {
+  width: 100%;
+}
+.edit-btns {
+  .el-button {
+    display: block;
+    margin: 0 auto;
+  }
+}
+.no-margin ::v-deep.el-form-item__content {
+  margin: 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
index e40b4b559..fde02c40e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
@@ -2,6 +2,7 @@ package com.ruoyi.project.benyi.controller;
 
 import java.util.List;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -72,6 +73,8 @@ public class ByDayflowassessmentplanController extends BaseController {
     @Log(title = "幼儿园一日流程评估计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ByDayflowassessmentplan byDayflowassessmentplan) {
+        byDayflowassessmentplan.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        byDayflowassessmentplan.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
         return toAjax(byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan));
     }