Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!276 进粉统计导出修复

Browse Source 
Merge pull request !276 from 德仔/develop
This commit is contained in:
德仔 2021-06-04 11:58:47 +08:00 committed by Gitee
commit 1f0b60311c
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
View File

@ -67,7 +67,7 @@
</if> </if>
) AS wfs ON wd.wechat_account = wfs.wx_id ) 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 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 LEFT JOIN sys_user AS su ON su.user_id = wd.user_id
WHERE wd.del_flag = 0 WHERE wd.del_flag = 0
ORDER BY wd.sale_group_id, wd.user_id, wd.wechat_account ASC ORDER BY wd.sale_group_id, wd.user_id, wd.wechat_account ASC

7
stdiet-ui/src/components/RecipesPlanDrawer/index.vue
View File

@ -75,14 +75,14 @@
{{ `${scope.row.startDate} 至 ${scope.row.endDate}` }} {{ `${scope.row.startDate} 至 ${scope.row.endDate}` }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订阅情况" align="center"> <el-table-column label="订阅情况" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.subscribed ? 'success' : 'danger'"> <el-tag :type="scope.row.subscribed ? 'success' : 'danger'">
{{ scope.row.subscribed ? "已订阅" : "未订阅" }} {{ scope.row.subscribed ? "已订阅" : "未订阅" }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发送" align="center" width="80"> <el-table-column label="发送" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="!!scope.row.sendFlag" v-model="!!scope.row.sendFlag"
@ -90,7 +90,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -102,7 +102,6 @@
{{ `${scope.row.recipesId ? "编辑" : "制作"}` }} {{ `${scope.row.recipesId ? "编辑" : "制作"}` }}
</el-button> </el-button>
<el-button <el-button
v-if="scope.row.reviewStatus === 1"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleOnDelete(scope.row)" @click="handleOnDelete(scope.row)"

2
stdiet-ui/src/views/custom/customer/index.vue
View File

@ -246,7 +246,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="外食热量统计" label="外食热量"
align="center" align="center"
v-hasPermi="['custom:foodHeatStatistics:list']" v-hasPermi="['custom:foodHeatStatistics:list']"
> >