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

进粉统计导出修复

Browse Source
This commit is contained in:
huangdeliang 2021-06-04 11:57:17 +08:00
parent 8a9a55ff8e
commit 422431c77d
3 changed files with 8 additions and 9 deletions
stdiet-custom/src/main/resources/mapper/custom
SysWxFanStatisticsMapper.xml
stdiet-ui/src
components/RecipesPlanDrawer
index.vue
views/custom/customer
index.vue

2
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

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

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