From 38cf0af13a483e5b45ad8b94807c31255a3d26c3 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Tue, 8 Dec 2020 18:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=90=A5=E5=85=BB=E9=85=8D?=
 =?UTF-8?q?=E9=A4=90=E5=90=88=E5=B9=B6=E5=88=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/fantang/catering/index.vue | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/fantang/catering/index.vue b/ruoyi-ui/src/views/fantang/catering/index.vue
index d4f3b888b..97fbce93d 100644
--- a/ruoyi-ui/src/views/fantang/catering/index.vue
+++ b/ruoyi-ui/src/views/fantang/catering/index.vue
@@ -175,13 +175,17 @@
     </el-row>
 
     <!--    数据列表栏-->
-    <el-table v-loading="loading" :data="cateringList" @selection-change="handleSelectionChange" broder>
+    <el-table v-loading="loading"
+              :data="cateringList"
+              border
+              :span-method="objectSpanMethod"
+              @selection-change="handleSelectionChange">
       <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="departName"/>
       <el-table-column label="姓名" align="center" prop="name"/>
       <el-table-column label="床号" align="center" prop="bedId"/>
-      <el-table-column label="正餐类型" align="center" prop="type" :formatter="typeFormat" v-if="false"/>
+      <el-table-column label="正餐类型" align="center" prop="type" :formatter="typeFormat"/>
       <el-table-column label="营养配餐" align="center" prop="foodName"/>
       <el-table-column label="配餐频次" align="center" prop="frequency"/>
       <el-table-column label="用法" align="center" prop="cateringUsage"/>
@@ -492,6 +496,50 @@ export default {
     })
   },
   methods: {
+
+    // 控制合并列
+    objectSpanMethod({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 1) {
+        if (rowIndex % 3 === 0) {
+          return {
+            rowspan: 3,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      } else if (columnIndex === 2) {
+        if (rowIndex % 3 === 0) {
+          return {
+            rowspan: 3,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+
+      } else if (columnIndex === 3) {
+        if (rowIndex % 3 === 0) {
+          return {
+            rowspan: 3,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+
+      }
+    },
+
     // 响应营养配餐用餐安排多选列表
     changeDinnerType(value) {
       console.log(value)