From 1cadc3e777264846a9bb918f1789964e2d974f14 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 18 May 2021 16:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E9=98=85=E6=83=85?=
=?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/custom/SysRecipesPlanMapper.xml | 2 +-
stdiet-ui/src/components/RecipesPlanDrawer/index.vue | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
index dae2693d4..a80028fa0 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
@@ -40,7 +40,7 @@
<sql id="selectSysRecipesPlanVo">
- select id, order_id, cus_id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, send_flag, send_time, pause_date, create_time, create_by, update_time, update_by, del_flag, review_status, sub_send, sms_send from sys_recipes_plan
+ select id, order_id, cus_id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, send_flag, send_time, pause_date, create_time, create_by, update_time, update_by, del_flag, review_status, sub_send, sms_send, subscribed from sys_recipes_plan
</sql>
<select id="selectSysRecipesPlanList" parameterType="SysRecipesPlan" resultMap="SysRecipesPlanResult">
diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
index cc8976eb9..682a58ccd 100644
--- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
+++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
@@ -75,6 +75,13 @@
{{ `${scope.row.startDate} 至 ${scope.row.endDate}` }}
</template>
</el-table-column>
+ <el-table-column label="订阅情况" align="center">
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.subscribed ? 'success' : 'danger'">
+ {{ scope.row.subscribed ? "已订阅" : "未订阅" }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="发送" align="center" width="80">
<template slot-scope="scope">
<el-switch