汉王 核销记录展示code_b

sales/views.py

@@ -6130,7 +6130,7 @@ def do_hexiao_accept(request):
 @login_required
 def hexiao_record(request):
     data = {'data': [], 'clmns': [], 'e': [], 'subtt': ['营销活动', '奖品核销'], 'murl': '', 'dt': False, 'add': True}
-    data['clmns'] = ['核销单位', '核销人', '活动信息', '奖品名称', '消费者信息', '状态', '备注', '标签序号', '时间',
+    data['clmns'] = ['核销单位', '核销人', '活动信息', '奖品名称', '消费者信息', '状态', '备注', '标签序号', '物流码', '时间',
                      '审核', '操作']
     data['show_add'] = True
     data['murl'] = '/company/news/edit/'
@@ -6163,7 +6163,8 @@ def hexiao_record(request):
                 tm,
                 is_permit,
                 coalesce((select username from company_user where id = applyer_id),''),
-                coalesce((select label_code from sales_consumerwinner where id = winner_id),'')
+                coalesce((select label_code from sales_consumerwinner where id = winner_id),''),
+                coalesce((select code_b from label.lbl_abcode where code_a = (select label_code from sales_consumerwinner where id = winner_id)),'')
                 FROM sales_hexiao_record WHERE 
                 company_id = """ + company_id + """ and
                 (tm BETWEEN '""" + dt_fr + """' and '""" + dt_to + """') order by id desc""")
@@ -6216,6 +6217,7 @@ def hexiao_record(request):
         # consumer = t.consumer
         # wx_headimgurl = consumer.wx_headimgurl
         # wx_nickname = consumer.wx_nickname
+        
 
         data['data'].append([
             agent_name,
@@ -6227,6 +6229,7 @@ def hexiao_record(request):
             dispatch_status,
             remark,
             r[14],
+            r[15],
             tm.strftime("%Y-%m-%d %H:%M:%S"),
             flag,
             "<a class='btn btn-default btn-xs' href='/sales/hexiao_record/detail/" + str(id) + "/'>详情</a>"