From a5b4cc6c182d33b830822fe151d2658a408faca4 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Thu, 3 Dec 2020 09:39:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E5=91=A8?=
 =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E7=BF=BB=E9=A1=B5=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/fantang/weekMenu/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/fantang/weekMenu/index.vue b/ruoyi-ui/src/views/fantang/weekMenu/index.vue
index aa478dec1..cd2e2ae0b 100644
--- a/ruoyi-ui/src/views/fantang/weekMenu/index.vue
+++ b/ruoyi-ui/src/views/fantang/weekMenu/index.vue
@@ -78,13 +78,13 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+<!--    <pagination-->
+<!--      v-show="total>0"-->
+<!--      :total="total"-->
+<!--      :page.sync="queryParams.pageNum"-->
+<!--      :limit.sync="queryParams.pageSize"-->
+<!--      @pagination="getList"-->
+<!--    />-->
 
     <!-- 添加或修改每周菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -214,7 +214,7 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize: 9,
+          pageSize: 50,
           dinnerType: '',
           weekday: '',
           flag: null

From 5a2a31c552a8389639c90510c626a696bd125deb Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 4 Dec 2020 15:43:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A5=E8=B4=B4=E5=8F=91=E6=94=BE=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E5=B1=82=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=99=84?=
 =?UTF-8?q?=E5=B8=A6=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                           |  7 --
 .../controller/FtFoodDemandDaoController.java | 42 +++++-----
 .../controller/FtStaffInfoDaoController.java  |  6 ++
 .../system/fantang/domain/FtStaffInfoDao.java |  8 +-
 .../fantang/mapper/FtStaffInfoDaoMapper.java  |  5 ++
 .../service/IFtStaffInfoDaoService.java       |  4 +
 .../impl/FtStaffInfoDaoServiceImpl.java       |  7 ++
 .../system/fantang/vo/FtStaffInfoVo.java      | 12 +++
 .../src/views/fantang/foodDemand/index.vue    | 84 +++++++++++++++----
 ruoyi-ui/src/views/fantang/settle/index.vue   | 13 ++-
 ruoyi-ui/src/views/fantang/subsidy/index.vue  | 47 +++++++++--
 ruoyi-ui/vue.config.js                        |  2 +-
 12 files changed, 172 insertions(+), 65 deletions(-)
 create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 4d3a41b1e..adda3d705 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -17,13 +17,6 @@
 
     <dependencies>
 
-        <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
-
         <!-- swagger2-->
         <dependency>
             <groupId>io.springfox</groupId>
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 455ed4bf7..c5af0953b 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
@@ -21,13 +21,13 @@ import java.util.List;
 
 /**
  * 病人报餐Controller
- * 
+ *
  * @author ft
  * @date 2020-12-03
  */
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/fantang/foodDemand" )
+@RequestMapping("/fantang/foodDemand")
 public class FtFoodDemandDaoController extends BaseController {
 
     private final IFtFoodDemandDaoService iFtFoodDemandDaoService;
@@ -37,12 +37,11 @@ public class FtFoodDemandDaoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('fantang:foodDemand:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao)
-    {
+    public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) {
         startPage();
         LambdaQueryWrapper<FtFoodDemandDao> lqw = Wrappers.lambdaQuery(ftFoodDemandDao);
-        if (ftFoodDemandDao.getFlag() != null){
-            lqw.eq(FtFoodDemandDao::getFlag ,ftFoodDemandDao.getFlag());
+        if (ftFoodDemandDao.getFlag() != null) {
+            lqw.eq(FtFoodDemandDao::getFlag, ftFoodDemandDao.getFlag());
         }
         List<FtFoodDemandDao> list = iFtFoodDemandDaoService.list(lqw);
         return getDataTable(list);
@@ -51,40 +50,41 @@ public class FtFoodDemandDaoController extends BaseController {
     /**
      * 导出病人报餐列表
      */
-    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:export')" )
-    @Log(title = "病人报餐" , businessType = BusinessType.EXPORT)
-    @GetMapping("/export" )
+    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:export')")
+    @Log(title = "病人报餐", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
     public AjaxResult export(FtFoodDemandDao ftFoodDemandDao) {
         LambdaQueryWrapper<FtFoodDemandDao> lqw = new LambdaQueryWrapper<FtFoodDemandDao>(ftFoodDemandDao);
         List<FtFoodDemandDao> list = iFtFoodDemandDaoService.list(lqw);
-        ExcelUtil<FtFoodDemandDao> util = new ExcelUtil<FtFoodDemandDao>(FtFoodDemandDao. class);
-        return util.exportExcel(list, "foodDemand" );
+        ExcelUtil<FtFoodDemandDao> util = new ExcelUtil<FtFoodDemandDao>(FtFoodDemandDao.class);
+        return util.exportExcel(list, "foodDemand");
     }
 
     /**
      * 获取病人报餐详细信息
      */
-    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')" )
-    @GetMapping(value = "/{id}" )
-    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(iFtFoodDemandDaoService.getById(id));
     }
 
     /**
      * 新增病人报餐
      */
-    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:add')" )
-    @Log(title = "病人报餐" , businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:add')")
+    @Log(title = "病人报餐", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FtFoodDemandDao ftFoodDemandDao) {
+        ftFoodDemandDao.setFlag(true);
         return toAjax(iFtFoodDemandDaoService.save(ftFoodDemandDao) ? 1 : 0);
     }
 
     /**
      * 修改病人报餐
      */
-    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:edit')" )
-    @Log(title = "病人报餐" , businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:edit')")
+    @Log(title = "病人报餐", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FtFoodDemandDao ftFoodDemandDao) {
         ftFoodDemandDao.setUpdateAt(new Date());
@@ -94,9 +94,9 @@ public class FtFoodDemandDaoController extends BaseController {
     /**
      * 删除病人报餐
      */
-    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:remove')" )
-    @Log(title = "病人报餐" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}" )
+    @PreAuthorize("@ss.hasPermi('fantang:foodDemand:remove')")
+    @Log(title = "病人报餐", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(iFtFoodDemandDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
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 4584c34c2..7fb2851c5 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
@@ -57,6 +57,12 @@ public class FtStaffInfoDaoController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/staffListWithDepart")
+    public AjaxResult staffListWithDepart() {
+
+        return AjaxResult.success(null);
+    }
+
     /**
      * 查询护工管理列表
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java
index 99cb7c665..f598a5855 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java
@@ -1,16 +1,16 @@
 package com.ruoyi.system.fantang.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.system.fantang.vo.FtStaffInfoVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -22,11 +22,11 @@ import java.util.Date;
  */
 @Data
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("ft_staff_info")
-public class FtStaffInfoDao  {
+public class FtStaffInfoDao extends FtStaffInfoVo {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
index b21637c2b..f9fb108cd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
@@ -2,6 +2,9 @@ package com.ruoyi.system.fantang.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.fantang.domain.FtStaffInfoDao;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 员工管理Mapper接口
@@ -11,4 +14,6 @@ import com.ruoyi.system.fantang.domain.FtStaffInfoDao;
  */
 public interface FtStaffInfoDaoMapper extends BaseMapper<FtStaffInfoDao> {
 
+    @Select("")
+    List<FtStaffInfoDao> selectStaffInfoWithDepart();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java
index c8a6174bd..f2b47f49a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffInfoDaoService.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.fantang.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.fantang.domain.FtStaffInfoDao;
 
+import java.util.List;
+
 /**
  * 员工管理Service接口
  *
@@ -11,4 +13,6 @@ import com.ruoyi.system.fantang.domain.FtStaffInfoDao;
  */
 public interface IFtStaffInfoDaoService extends IService<FtStaffInfoDao> {
 
+    List<FtStaffInfoDao> selectStaffInfoWithDepart();
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java
index ed334de7d..a86bd22f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java
@@ -6,6 +6,8 @@ import com.ruoyi.system.fantang.mapper.FtStaffInfoDaoMapper;
 import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 员工管理Service业务层处理
  *
@@ -15,4 +17,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class FtStaffInfoDaoServiceImpl extends ServiceImpl<FtStaffInfoDaoMapper, FtStaffInfoDao> implements IFtStaffInfoDaoService {
 
+    @Override
+    public List<FtStaffInfoDao> selectStaffInfoWithDepart() {
+
+        return this.baseMapper.selectStaffInfoWithDepart();
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java
new file mode 100644
index 000000000..e4ebe7be9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.fantang.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FtStaffInfoVo {
+    private String departName;
+}
diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
index 3c6b6619b..922d7911b 100644
--- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
@@ -84,23 +84,23 @@
     <el-table v-loading="loading" :data="foodDemandList" @selection-change="handleSelectionChange" border>
       <!--      <el-table-column type="selection" width="55" align="center"/>-->
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
-<!--      <el-table-column label="住院号" align="center" prop="hospitalId"/>-->
+      <!--      <el-table-column label="住院号" align="center" prop="hospitalId"/>-->
       <el-table-column label="姓名" align="center" prop="name" width="100px"/>
-<!--      <el-table-column label="科室" align="center" prop="departName"/>-->
+      <!--      <el-table-column label="科室" align="center" prop="departName"/>-->
       <el-table-column label="床号" align="center" prop="bedId" width="100px"/>
       <el-table-column label="正餐" align="center" prop="type" :formatter="typeFormat" width="100px"/>
       <el-table-column label="正餐清单" align="center" prop="foods" :formatter="formatFoods"/>
       <el-table-column label="加菜" align="center" prop="vegetables" width="80px" :formatter="formatVegetables"/>
-      <el-table-column label="加肉" align="center" prop="meat"  width="80px" :formatter="formatMeat"/>
+      <el-table-column label="加肉" align="center" prop="meat" width="80px" :formatter="formatMeat"/>
       <el-table-column label="加饭" align="center" prop="rice" width="80px" :formatter="formatRice"/>
-      <el-table-column label="加蛋" align="center" prop="egg" width="80px" :formatter="formatEgg"/>
-      <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="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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -126,8 +126,50 @@
     <!-- 添加或修改病人报餐对话框 -->
     <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="姓名">
-          <el-input label="姓名"></el-input>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="床号" prop="bedId">
+          <el-input v-model="form.bedId" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="正餐" prop="type">
+          <el-input v-model="form.type" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="正餐清单" prop="foods">
+          <el-input v-model="form.foods"/>
+        </el-form-item>
+        <el-form-item label="加菜" prop="vegetables">
+          <el-select v-model="form.vegetables" placeholder="是否加菜">
+            <el-option
+              v-for="item in vegetablesOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加肉" prop="meat">
+          <el-select v-model="form.meat" placeholder="是否加肉">
+            <el-option
+              v-for="item in vegetablesOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加饭" prop="rice">
+          <el-select v-model="form.rice" placeholder="是否加饭">
+            <el-option
+              v-for="item in vegetablesOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加蛋" prop="egg">
+          <el-input-number v-model="form.egg" :min="0"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -141,24 +183,30 @@
 <script>
 import {
   addFoodDemand,
-  delFoodDemand,
   exportFoodDemand,
   getFoodDemand,
   listFoodDemand,
   updateFoodDemand
 } from "@/api/fantang/foodDemand";
-import {listFood} from "../../../api/fantang/food";
+import {listFood} from "@/api/fantang/food";
 
 export default {
   name: "FoodDemand",
   components: {},
   data() {
     return {
+      vegetablesOptions: [{
+        value: 1,
+        label: '是'
+      }, {
+        value: 0,
+        label: '否'
+      }],
       flagOptions: [{
         value: 1,
         label: '启用'
       }, {
-        value: 2,
+        value: 0,
         label: '禁用'
       }],
       // 遮罩层
@@ -221,7 +269,7 @@ export default {
     formatFoods(row) {
       const _this = this;
       let arr = row.foods.split(",").map(Number);
-      let ret = arr.map(item =>{
+      let ret = arr.map(item => {
         let obj = _this.foodList.find((value => {
           return value.foodId === item;
         }));
@@ -229,7 +277,7 @@ export default {
       });
       return ret.toString();
     },
-    formatVegetables(row){
+    formatVegetables(row) {
       if (row.vegetables === null || row.vegetables === 0)
         return "否";
       return "是";
diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue
index a9a19044d..38ae3e681 100644
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@@ -259,10 +259,9 @@
 <script>
 import {addSettle, delSettle, exportSettle, getSettle, listSettle, updateSettle} from "@/api/fantang/settle";
 import {listAll, listNoPay, listPayoff} from "@/api/fantang/meals";
-import {getUserProfile} from "../../../api/system/user";
-import {getPrepaymentByPatientId} from "../../../api/fantang/prepayment";
-import {getLastSettlementDate} from "../../../api/fantang/meals";
-import { dateFormat } from 'vux'
+import {getUserProfile} from "@/api/system/user";
+import {getPrepaymentByPatientId} from "@/api/fantang/prepayment";
+import {getLastSettlementDate} from "@/api/fantang/meals";
 
 export default {
   name: "Settle",
@@ -410,11 +409,11 @@ export default {
   methods: {
     // 变更结算日期计算
     changeBillingDate(value) {
-      var dateSpan,  iDays;
+      var dateSpan, iDays;
       let sDate1 = Date.parse(this.formAddNewSettlement.lastBillingDate);
       let sDate2 = Date.parse(value);
       dateSpan = sDate2 - sDate1;
-      if(dateSpan <=0){
+      if (dateSpan <= 0) {
         this.msgError("你现在的结算日期小于上一次结算日期！！");
       } else {
         dateSpan = Math.abs(dateSpan);
@@ -433,7 +432,7 @@ export default {
 
     // 日常伙食费结算操作按钮
     clickAddNewSettlement(row) {
-      getLastSettlementDate(row.patientId).then(response =>{
+      getLastSettlementDate(row.patientId).then(response => {
         console.log("getLastBillingDateByPatientId-->", response);
         this.formAddNewSettlement.lastBillingDate = response.data.settlementAt;
         this.formAddNewSettlement.settlementDays = response.data.days;
diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue
index 48b29fc74..35b8f4247 100644
--- a/ruoyi-ui/src/views/fantang/subsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" v-if="false">
       <el-form-item label="补贴类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择补贴类型" clearable size="small">
           <el-option
@@ -54,7 +54,7 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="false">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -65,7 +65,7 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="false">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -76,7 +76,7 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="false">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -86,11 +86,11 @@
         >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" v-if="false"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="subsidyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+    <el-table v-loading="loading" :data="subsidyList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="center" v-if="false"/>
       <el-table-column label="补贴 id" align="center" prop="subsidyId" v-if="false"/>
       <el-table-column label="补贴类型" align="center" prop="type" :formatter="typeFormat"/>
       <el-table-column label="金额" align="center" prop="price"/>
@@ -102,6 +102,14 @@
       <el-table-column label="启用标志" align="center" prop="flag" :formatter="formatFlag"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-money"
+            @click="clickSubsidyGiveOut(scope.row)"
+            v-hasPermi="['fantang:subsidy:edit']"
+          >发放
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -130,6 +138,18 @@
       @pagination="getList"
     />
 
+
+    <!--    补贴发放弹出层-->
+    <el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="500px" align="center">
+      <el-table :data="staffData">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column property="departId" label="科室" width="200"></el-table-column>
+        <el-table-column property="name" label="姓名" width="150"></el-table-column>
+      </el-table>
+      <br>
+      <el-button type="primary">发放</el-button>
+    </el-dialog>
+
     <!-- 添加或修改补贴管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -166,12 +186,16 @@
 
 <script>
 import {addSubsidy, delSubsidy, exportSubsidy, getSubsidy, listSubsidy, updateSubsidy} from "@/api/fantang/subsidy";
+import {listStaffInfo} from "@/api/fantang/staffInfo";
 
 export default {
   name: "Subsidy",
   components: {},
   data() {
     return {
+      staffData: [],
+      // 发放弹出层
+      showPopupSubsidyGiveOut: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -224,6 +248,15 @@ export default {
     });
   },
   methods: {
+
+    //  响应发放补贴按钮
+    clickSubsidyGiveOut(row) {
+      listStaffInfo().then(response => {
+        this.staffData = response.rows;
+        this.showPopupSubsidyGiveOut = true;
+      })
+
+    },
     // 控制补贴列表启用状态的回显
     formatFlag(row) {
       if (row.flag)
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 43ef3ff80..de6327f5f 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const name = defaultSettings.title || '食堂管理系统' // 标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 9001 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions

From e94a6eeec259544f25ae7e9f6cbc86724bc38dd8 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 4 Dec 2020 16:01:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=99=84=E5=B8=A6=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E4=BF=A1=E6=81=AF=E4=BC=A0=E5=85=A5=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/FtStaffInfoDaoController.java     | 3 +--
 .../system/fantang/mapper/FtStaffInfoDaoMapper.java      | 2 +-
 ruoyi-ui/src/api/fantang/staffInfo.js                    | 7 +++++++
 ruoyi-ui/src/views/fantang/subsidy/index.vue             | 9 +++++----
 4 files changed, 14 insertions(+), 7 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 7fb2851c5..8065976ca 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
@@ -59,8 +59,7 @@ public class FtStaffInfoDaoController extends BaseController {
 
     @GetMapping("/staffListWithDepart")
     public AjaxResult staffListWithDepart() {
-
-        return AjaxResult.success(null);
+        return AjaxResult.success(iFtStaffInfoDaoService.selectStaffInfoWithDepart());
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
index f9fb108cd..c14f2cb70 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
@@ -14,6 +14,6 @@ import java.util.List;
  */
 public interface FtStaffInfoDaoMapper extends BaseMapper<FtStaffInfoDao> {
 
-    @Select("")
+    @Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1")
     List<FtStaffInfoDao> selectStaffInfoWithDepart();
 }
diff --git a/ruoyi-ui/src/api/fantang/staffInfo.js b/ruoyi-ui/src/api/fantang/staffInfo.js
index 3fb5e4839..b8c30e23e 100644
--- a/ruoyi-ui/src/api/fantang/staffInfo.js
+++ b/ruoyi-ui/src/api/fantang/staffInfo.js
@@ -9,6 +9,13 @@ export function listStaffInfo(query) {
   })
 }
 
+export function staffListWithDepart() {
+  return request({
+    url: '/fantang/staffInfo/staffListWithDepart',
+    method: 'get',
+  })
+}
+
 // 查询护工管理列表
 export function careStaffList(query) {
   return request({
diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue
index 35b8f4247..9ad156ad6 100644
--- a/ruoyi-ui/src/views/fantang/subsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue
@@ -143,7 +143,7 @@
     <el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="500px" align="center">
       <el-table :data="staffData">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column property="departId" label="科室" width="200"></el-table-column>
+        <el-table-column property="departName" label="科室" width="200"></el-table-column>
         <el-table-column property="name" label="姓名" width="150"></el-table-column>
       </el-table>
       <br>
@@ -186,7 +186,7 @@
 
 <script>
 import {addSubsidy, delSubsidy, exportSubsidy, getSubsidy, listSubsidy, updateSubsidy} from "@/api/fantang/subsidy";
-import {listStaffInfo} from "@/api/fantang/staffInfo";
+import {staffListWithDepart} from "@/api/fantang/staffInfo";
 
 export default {
   name: "Subsidy",
@@ -251,8 +251,9 @@ export default {
 
     //  响应发放补贴按钮
     clickSubsidyGiveOut(row) {
-      listStaffInfo().then(response => {
-        this.staffData = response.rows;
+      staffListWithDepart().then(response => {
+        console.log(response);
+        this.staffData = response.data;
         this.showPopupSubsidyGiveOut = true;
       })
 

From 4e447e3e390076a61bb748b1f4890b5714a545a2 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Fri, 4 Dec 2020 17:41:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=97=85=E6=82=A3?=
 =?UTF-8?q?=E9=85=8D=E9=A4=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/domain/FtFoodDemandDao.java       |  6 +-
 .../src/views/fantang/foodDemand/index.vue    | 94 ++++++++++---------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
index d39f28d9e..bf56e3372 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
@@ -74,7 +74,7 @@ public class FtFoodDemandDao implements Serializable {
      * 加菜
      */
     @Excel(name = "加菜")
-    private Integer vegetables;
+    private Boolean vegetables;
 
     /**
      * 更新操作人 id
@@ -85,7 +85,7 @@ public class FtFoodDemandDao implements Serializable {
      * 加肉
      */
     @Excel(name = "加肉")
-    private Integer meat;
+    private Boolean meat;
 
     /**
      * 更新来源
@@ -96,7 +96,7 @@ public class FtFoodDemandDao implements Serializable {
      * 加饭
      */
     @Excel(name = "加饭")
-    private Integer rice;
+    private Boolean rice;
 
     /**
      * 加蛋
diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
index 922d7911b..8f530b7d1 100644
--- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
@@ -136,40 +136,42 @@
           <el-input v-model="form.type" :disabled="true"/>
         </el-form-item>
         <el-form-item label="正餐清单" prop="foods">
-          <el-input v-model="form.foods"/>
+          <el-select v-model="form.foods"
+                     multiple style="width: 380px">
+            <el-option
+              v-for="item in foodList"
+              :key="item.foodId"
+              :label="item.name"
+              :value="item.foodId">
+              <span style="float: left; width:40px">{{ item.name }}</span>
+              <el-divider direction="vertical"></el-divider>
+              <span style="color: #8492a6; font-size: 13px">{{ item.price }} 元</span>
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="加菜" prop="vegetables">
-          <el-select v-model="form.vegetables" placeholder="是否加菜">
-            <el-option
-              v-for="item in vegetablesOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-switch
+            v-model="form.vegetables"
+            active-text="是"
+            inactive-text="否">
+          </el-switch>
         </el-form-item>
         <el-form-item label="加肉" prop="meat">
-          <el-select v-model="form.meat" placeholder="是否加肉">
-            <el-option
-              v-for="item in vegetablesOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-switch
+            v-model="form.meat"
+            active-text="是"
+            inactive-text="否">
+          </el-switch>
         </el-form-item>
         <el-form-item label="加饭" prop="rice">
-          <el-select v-model="form.rice" placeholder="是否加饭">
-            <el-option
-              v-for="item in vegetablesOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-switch
+            v-model="form.rice"
+            active-text="是"
+            inactive-text="否">
+          </el-switch>
         </el-form-item>
         <el-form-item label="加蛋" prop="egg">
-          <el-input-number v-model="form.egg" :min="0"/>
+          <el-input-number v-model="form.egg" :min="0" :max="5"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -195,13 +197,6 @@ export default {
   components: {},
   data() {
     return {
-      vegetablesOptions: [{
-        value: 1,
-        label: '是'
-      }, {
-        value: 0,
-        label: '否'
-      }],
       flagOptions: [{
         value: 1,
         label: '启用'
@@ -275,23 +270,32 @@ export default {
         }));
         return obj.name;
       });
-      return ret.toString();
+      let str = ret.toString();
+      if (row.vegetables > 0)
+        str += ",加菜";
+      if (row.rice > 0)
+        str += ",加饭"
+      if (row.meat > 0)
+        str += ",加肉"
+      if (row.egg > 0)
+        str += ",加蛋" + row.egg;
+      return str;
     },
     formatVegetables(row) {
-      if (row.vegetables === null || row.vegetables === 0)
-        return "否";
-      return "是";
+      if (row.vegetables)
+        return "是";
+      return "否";
     },
     formatMeat(row) {
-      if (row.meat === null || row.meat === 0)
-        return "否";
-      return "是";
+      if (row.meat)
+        return "是";
+      return "否";
     },
 
     formatRice(row) {
-      if (row.rice === null || row.rice === 0)
-        return "否";
-      return "是";
+      if (row.rice)
+        return "是";
+      return "否";
     },
     formatEgg(row) {
       if (row.egg === null || row.egg === 0)
@@ -304,6 +308,7 @@ export default {
       listFoodDemand(this.queryParams).then(response => {
         this.foodDemandList = response.rows;
         this.total = response.total;
+
         this.loading = false;
       });
     },
@@ -369,6 +374,8 @@ export default {
       const id = row.id || this.ids
       getFoodDemand(id).then(response => {
         this.form = response.data;
+        this.form.foods = this.form.foods.split(",").map(Number);
+
         this.open = true;
         this.title = "修改病人报餐";
       });
@@ -378,6 +385,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.foods = this.form.foods.toString();
             updateFoodDemand(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;

From 0b289f2abf54c8f7ba38527bbced31582b94b112 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 4 Dec 2020 17:42:59 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E5=B1=82=E7=A7=91=E5=AE=A4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fantang/vo/FtStaffInfoVo.java      |  1 +
 ruoyi-ui/src/views/fantang/subsidy/index.vue  | 44 ++++++++++++++-----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java
index e4ebe7be9..92d122312 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java
@@ -9,4 +9,5 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class FtStaffInfoVo {
     private String departName;
+    private Boolean giveOutFlag;
 }
diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue
index 9ad156ad6..88df62f3c 100644
--- a/ruoyi-ui/src/views/fantang/subsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue
@@ -140,14 +140,30 @@
 
 
     <!--    补贴发放弹出层-->
-    <el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="500px" align="center">
+    <el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="1000px" align="center">
       <el-table :data="staffData">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column property="departName" label="科室" width="200"></el-table-column>
-        <el-table-column property="name" label="姓名" width="150"></el-table-column>
+        <el-table-column prop="departName" label="科室" width="200" align="center"
+                         :filters="[{ text: '家', value: '家' }, { text: '公司', value: '公司' }]"
+                         :filter-method="filterDepart">
+          <template slot-scope="scope">
+
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="姓名" width="150" align="center"></el-table-column>
+        <el-table-column prop="giveOutFlag" label="是否发放补贴" width="300" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.giveOutFlag"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="是"
+              inactive-text="否">
+            </el-switch>
+          </template>
+        </el-table-column>
       </el-table>
       <br>
-      <el-button type="primary">发放</el-button>
+      <el-button type="primary">发放补贴</el-button>
     </el-dialog>
 
     <!-- 添加或修改补贴管理对话框 -->
@@ -249,14 +265,13 @@ export default {
   },
   methods: {
 
+    filterDepart() {
+      return row.tag === value;
+    },
+
     //  响应发放补贴按钮
     clickSubsidyGiveOut(row) {
-      staffListWithDepart().then(response => {
-        console.log(response);
-        this.staffData = response.data;
-        this.showPopupSubsidyGiveOut = true;
-      })
-
+      this.showPopupSubsidyGiveOut = true;
     },
     // 控制补贴列表启用状态的回显
     formatFlag(row) {
@@ -274,6 +289,13 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      staffListWithDepart().then(response => {
+        this.staffData = response.data;
+        for (let i = 0; i < this.staffData.length; i++) {
+          this.staffData[i].giveOutFlag = true;
+        }
+        console.log(this.staffData);
+      })
     },
     // 补贴类型字典翻译
     typeFormat(row, column) {