From 06f199f3c3c53c0a20d6087ab9ce7dd8b25bf2bb Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Mon, 11 Jan 2021 15:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=97=85=E4=BA=BA=E9=85=8D?=
 =?UTF-8?q?=E9=A4=90=E8=AE=BE=E7=BD=AE=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtFoodDemandDaoController.java |  3 +-
 .../src/views/fantang/foodDemand/index.vue    | 29 ++++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
index 66219a906..835ac98d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
@@ -39,8 +39,7 @@ public class FtFoodDemandDaoController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) {
         startPage();
-//        LambdaQueryWrapper<FtFoodDemandDao> lqw = Wrappers.lambdaQuery(ftFoodDemandDao);
-//        List<FtFoodDemandDao> list = iFtFoodDemandDaoService.list(lqw);
+
         List<FtFoodDemandDao> list = iFtFoodDemandDaoService.listNewFormatter(ftFoodDemandDao);
         return getDataTable(list);
     }
diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
index 22e838178..1321778ed 100644
--- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
@@ -96,12 +96,7 @@
       <el-table-column label="加饭" align="center" prop="rice" width="80px" :formatter="formatRice"/>
       <el-table-column label="加蛋" align="center" prop="egg" width="80px"/>
       <el-table-column label="营养配餐" align="center" prop="nutritionFood" width="120px"/>
-      <!--      <el-table-column label="更新日期" align="center" prop="updateAt" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.updateAt, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-      <el-table-column label="启用状态" align="center" prop="flag" width="80px"/>
+      <el-table-column label="启用状态" align="center" prop="flag" width="80px" :formatter="formatFlag"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -174,6 +169,15 @@
         <el-form-item label="加蛋" prop="egg">
           <el-input-number v-model="form.egg" :min="0" :max="5"/>
         </el-form-item>
+        <el-form-item label="启用状态" prop="meat">
+          <el-switch
+            v-model="form.flag"
+            active-text="是"
+            inactive-text="否"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -271,10 +275,19 @@ export default {
     });
   },
   methods: {
+    formatFlag(row) {
+      if (row.flag === true) {
+        return "启用";
+      } else if (row.flag === false) {
+        return "禁用";
+      } else {
+        return "";
+      }
+    },
     // 格式化菜单回显文字
     formatFoods(row) {
       const _this = this;
-      if (row.foods!=null){
+      if (row.foods != null) {
         let arr = row.foods.split(",").map(Number);
         let ret = arr.map(item => {
           let obj = _this.foodList.find((value => {
@@ -387,7 +400,7 @@ export default {
       const id = row.id || this.ids
       getFoodDemand(id).then(response => {
         this.form = response.data;
-        if (this.form.foods!=null){
+        if (this.form.foods != null) {
           this.form.foods = this.form.foods.split(",").map(Number);
         }
         this.form.type = this.selectDictLabel(this.typeOptions, row.type);