From b8428b09fecc302721a5dc2ee92cb3d3e4729c07 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 26 Nov 2020 00:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8A=A5=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtStaffInfoDaoController.java   |  3 ---
 .../src/views/fantang/careStaffInfo/index.vue  |  1 +
 .../src/views/fantang/foodDefault/index.vue    | 18 ++++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
index e86c95c0c..4584c34c2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
@@ -13,7 +13,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.fantang.domain.FtStaffInfoDao;
 import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService;
-import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,8 +35,6 @@ public class FtStaffInfoDaoController extends BaseController {
 
     private final IFtStaffInfoDaoService iFtStaffInfoDaoService;
 
-    private final ISysUserService userService;
-
     /**
      * 查询员工管理列表
      */
diff --git a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
index 4803a3d4a..d88233365 100644
--- a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
+++ b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
@@ -323,6 +323,7 @@ export default {
               this.getList();
             });
           } else {
+            console.log(this.form);
             addStaffInfo(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
diff --git a/ruoyi-ui/src/views/fantang/foodDefault/index.vue b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
index a25555a2f..40e1533a7 100644
--- a/ruoyi-ui/src/views/fantang/foodDefault/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
@@ -115,11 +115,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!--        <el-form-item label="菜品列表" prop="foodList">-->
-        <!--          <el-input v-model="form.foodList" placeholder="请输入菜品列表" />-->
-        <!--        </el-form-item>-->
         <el-form-item label="菜品" prop="foodList">
-          <el-select v-model="queryParams.foodList" multiple placeholder="请选择菜品" clearable size="small">
+          <el-select v-model="form.foodList" multiple placeholder="请选择菜品" clearable size="small">
             <el-option
               v-for="item in foodListOptions"
               :key="item.name"
@@ -183,7 +180,14 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        type: [
+          {required: true, message: "报餐类型不能为空", trigger: "blur"}
+        ],
+        foodList: [
+          {required: true, message: "菜品不能为空", trigger: "blur"}
+        ],
+      }
     };
   },
   created() {
@@ -202,7 +206,6 @@ export default {
         this.loading = false;
       });
       listFood(this.queryParams).then(response => {
-        console.log("depart", response);
         this.foodListOptions = response.rows;
       })
     },
@@ -256,12 +259,14 @@ export default {
       const id = row.id || this.ids
       getFoodDefault(id).then(response => {
         this.form = response.data;
+        this.form.foodList = response.data.foodList.split(',').map(Number);
         this.open = true;
         this.title = "修改默认报餐管理";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.foodList = this.form.foodList.toString();
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -271,6 +276,7 @@ export default {
               this.getList();
             });
           } else {
+            console.log(this.form);
             addFoodDefault(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;