提交 71a87e2f authored 作者: zhang wei's avatar zhang wei

fix:诗仙太白页面报表: 积分报表

上级 8344fb50
......@@ -7559,3 +7559,39 @@ def bonusPoints_edit_list(request, cid, type=None):
for i in r :
data['data'].append([ i[1],i[0],i[3],i[2]])
return JsonResponse(data)
#积分报表
@login_required
def bonusPoints_list(request):
data = {'data': [], 'clmns': [], 'e': [],
'subtt': ['渠道促销', '积分报表'], 'murl': '', 'dt': False, 'add': True}
data['clmns'] = ['区域', '兑换终端', '联系人', '兑换积分', '领取金额', '兑换时间','剩余可使用积分','终端累计总积分','备注']
data['show_add'] = False
# data['murl'] = '/company/bonusPoints/edit/'
cur = connection.cursor()
company_id = request.user.company_id
ancestor_id = request.user.ancestor_id
if ancestor_id == company_id:
bps = PointsRedeemed.objects.filter(ancestor_id=ancestor_id)
else:
bps = PointsRedeemed.objects.filter(company_id=company_id)
for t in bps:
remark = t.remark
if not t.remark:
remark = ""
s=f"""
select (select name from company_salesdivision where id=(select division_id from company_company where '{t.company_id}'=id limit 1),
(select username,lastname from company_user where {t.user_id}=id),
points from company_bonuspoints where {t.company_id}=id
"""
cur.execute(s)
r = cur.fetchone()
a=str(r[3]) + str(t.points)
data['data'].append([r[0]
,r[1],r[2],t.points,t.amount,t.tm,r[3],a,remark
])
return render(request, 'obj/list_points.html', data)
......@@ -1218,6 +1218,8 @@ urlpatterns = [
url(r'^company/bonusPoints/edit/$', company_views.bonusPoints_edit),
url(r'^company/bonusPoints/edit/(?P<id>\d+)/$', company_views.bonusPoints_edit),
url(r'^company/bonusPoints/edit_list/(?P<cid>\d+)/$', company_views.bonusPoints_edit_list),
url(r'^company/bonusPoints_list/$', company_views.bonusPoints_list),
]
if settings.DEBUG:
......
......@@ -821,6 +821,7 @@
{% ifequal user.company.level_id 1 %}
<li><a class="l-a" href="/sales/channelretate/period/redeem/">{% trans '奖励结算与核销' %}</a></li>
{% else %}
{% if user.company.is_expense_account %}
<li><a class="l-a" href="/sales/channelretate/period/redeem/">{% trans '奖励结算与核销' %}</a></li>
......@@ -835,6 +836,9 @@
{% ifequal user.company.cfg_company.rebateinvoicecheck 1 %}
<li><a class="l-a" href="/obj/list/rebateinvoice/">{% trans '发票信息录入' %}</a></li>
{% endifequal %}
<li><a class="l-a" href="/company/bonusPoints/">{% trans '积分信息' %}</a></li>
<li><a class="l-a" href="/company/bonusPoints_list/">{% trans '积分报表' %}</a></li>
</ul>
</li>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论