From 422431c77d3cf614873f39be6b3d3a33f25cfcf7 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 4 Jun 2021 11:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E7=B2=89=E7=BB=9F=E8=AE=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/custom/SysWxFanStatisticsMapper.xml  | 2 +-
 stdiet-ui/src/components/RecipesPlanDrawer/index.vue      | 7 +++----
 stdiet-ui/src/views/custom/customer/index.vue             | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
index 0e8f7664e..ce3a124cf 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
@@ -67,7 +67,7 @@
             </if>
         ) AS wfs ON wd.wechat_account = wfs.wx_id
         LEFT JOIN (SELECT id, wx_account, wx_phone FROM sys_wx_sale_account) AS wsa ON wd.wechat_account = wsa.id
-        LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS cn ON cn.dict_value = wd.account_id
+        LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS cn ON cn.dict_value = wd.account_id
         LEFT JOIN sys_user AS su ON su.user_id = wd.user_id
         WHERE wd.del_flag = 0
         ORDER BY wd.sale_group_id, wd.user_id, wd.wechat_account ASC
diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
index 66535901b..60e7b60b1 100644
--- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
+++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
@@ -75,14 +75,14 @@
             {{ `${scope.row.startDate} 至 ${scope.row.endDate}` }}
           </template>
         </el-table-column>
-        <el-table-column label="订阅情况" align="center">
+        <el-table-column label="订阅情况" align="center" width="80">
           <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">
+        <el-table-column label="发送" align="center" width="60">
           <template slot-scope="scope">
             <el-switch
               v-model="!!scope.row.sendFlag"
@@ -90,7 +90,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center" width="140">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -102,7 +102,6 @@
               {{ `${scope.row.recipesId ? "编辑" : "制作"}` }}
             </el-button>
             <el-button
-              v-if="scope.row.reviewStatus === 1"
               type="text"
               icon="el-icon-delete"
               @click="handleOnDelete(scope.row)"
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index 9b3e48b51..48f628f07 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -246,7 +246,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="外食热量统计"
+        label="外食热量"
         align="center"
         v-hasPermi="['custom:foodHeatStatistics:list']"
       >
@@ -413,8 +413,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
-          
+
+
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -798,7 +798,7 @@ export default {
         if(this.form.fansTime == undefined || this.form.fansTime == null){
             this.form.mainDietitian = null;
             return;
-        }      
+        }
         this.autoSelectNutritionist();
     },
     fanTimeAutoSelectNutritionist(fansTime){