From 416ed161189852b631bdb60a0176a13a4c39b238 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 31 Dec 2020 17:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=82=A3=E8=90=A5=E5=85=BB=E9=85=8D?=
 =?UTF-8?q?=E9=A4=90=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/fantang/FtCateringDaoMapper.xml    | 17 +++++++++--
 ruoyi-ui/src/views/fantang/catering/index.vue | 30 +++++++++++++------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
index 9960af70b..ca04665cb 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
@@ -21,15 +21,28 @@
     </resultMap>
 
     <select id="listNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">
-        select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id, d.name as food_name from ft_catering a
+        SELECT
+        a.*,
+        b.`name`,
+        b.bed_id,
+        c.depart_name,
+        b.hospital_id,
+        d.`name` AS food_name
+        FROM
+        ft_catering a
         LEFT JOIN ft_nutrition_food d ON d.id = a.number
         LEFT JOIN ft_patient b
-        LEFT JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id where b.off_flag = 0
+        LEFT JOIN ft_depart c ON b.depart_id = c.depart_id ON a.patient_id = b.patient_id
+        WHERE
+        b.off_flag = 0
         <if test="name != null and name !=''">and b.name = #{name}</if>
         <if test="bedId != null">and b.bed_id = #{bedId}</if>
         <if test="departId != null">and b.depart_id = #{departId}</if>
         <if test="hospitalId != null">and b.hospital_id = #{hospitalId}</if>
         <if test="flag != null">and a.flag = #{flag}</if>
+        ORDER BY
+        b.patient_id,
+        `type` ASC
     </select>
 
     <select id="getByIdNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">
diff --git a/ruoyi-ui/src/views/fantang/catering/index.vue b/ruoyi-ui/src/views/fantang/catering/index.vue
index ff6747498..eb82ad4b2 100644
--- a/ruoyi-ui/src/views/fantang/catering/index.vue
+++ b/ruoyi-ui/src/views/fantang/catering/index.vue
@@ -224,6 +224,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page-sizes="[12, 24]"
       @pagination="getList"
     />
 
@@ -307,7 +308,7 @@
               <!--                  :value="item.label"-->
               <!--                ></el-option>-->
               <!--              </el-select>-->
-              <el-input v-model="form.frequency" placeholder="频次" :disabled="true"/>
+              <el-input v-model="form.frequency" placeholder="频次"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -469,7 +470,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 12,
         flag: null,
         hospitalId: null,
         name: null,
@@ -500,9 +501,9 @@ export default {
     // 控制合并列
     objectSpanMethod({row, column, rowIndex, columnIndex}) {
       if (columnIndex === 1) {
-        if (rowIndex % 3 === 0) {
+        if (rowIndex % 4 === 0) {
           return {
-            rowspan: 3,
+            rowspan: 4,
             colspan: 1
           };
         } else {
@@ -512,9 +513,9 @@ export default {
           };
         }
       } else if (columnIndex === 2) {
-        if (rowIndex % 3 === 0) {
+        if (rowIndex % 4 === 0) {
           return {
-            rowspan: 3,
+            rowspan: 4,
             colspan: 1
           };
         } else {
@@ -525,9 +526,21 @@ export default {
         }
 
       } else if (columnIndex === 3) {
-        if (rowIndex % 3 === 0) {
+        if (rowIndex % 4 === 0) {
           return {
-            rowspan: 3,
+            rowspan: 4,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }else if (columnIndex === 4) {
+        if (rowIndex % 4 === 0) {
+          return {
+            rowspan: 4,
             colspan: 1
           };
         } else {
@@ -536,7 +549,6 @@ export default {
             colspan: 0
           };
         }
-
       }
     },