!276 进粉统计导出修复

Merge pull request !276 from 德仔/develop

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

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)"

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){