终端店注册审核 增加业务联系人

company/views.py

@@ -1857,14 +1857,15 @@ def list_terminal_register(request):
         sWhere = sWhere + group_id_filter
     
     
-    data['clmns']=[_('终端店名称'),_('联系人'),_('手机号码'),_('详细地址'),_('营业执照编号'),_('父级公司'),_('业务员'),_('产品系列'),_('申请注册时间'),_('审核通过时间')]
+    data['clmns']=[_('终端店名称'),_('联系人'),_('手机号码'),_('详细地址'),_('营业执照编号'),_('父级公司'),_('业务员'),_('业务联系人'),_('产品系列'),_('申请注册时间'),_('审核通过时间')]
     s="select id,name,contacts,cell_phone,address,coalesce(license_number,''),"+\
         "(select name from company_company where id=a.parent_id),"+\
         "to_char(tm,'yyyy-mm-dd HH24:MI'),case when tm_aprv is null then '' else "+\
             "to_char(tm_aprv,'yyyy-mm-dd HH24:MI')||' ('||(select username  from company_user where id=user_aprv_id)||')' end, "+\
             "coalesce((select last_name from company_user where id = salesman_id),''),"+\
             "array_to_string(array(select name from product_series where id in (select unnest(product_series))),','),"+\
-            "next_aprv_company_id "+\
+            "next_aprv_company_id,"+\
+            "coalesce((select CONCAT(last_name,userName) as name from company_user where id = parent_user_id),'')"+\
         "FROM company_terminalregister a "+sWhere+" ORDER BY tm_aprv desc"   
     cur.execute(s)
     for r in cur.fetchall():   
@@ -1880,7 +1881,7 @@ def list_terminal_register(request):
                     "<a reg_id='"+str(r[0])+"' class='btn btn-xs btn-danger  btn-reject'  href='/company/register/approve/"+str(r[0])+"/?rejected=1'>驳回注册</a>"
             else:
                 prv=_("'未审核'")
-        data['data'].append([ r[1],r[2],r[3],r[4],r[5],r[6],r[9],r[10],r[7],prv ]) 
+        data['data'].append([ r[1],r[2],r[3],r[4],r[5],r[6],r[9],r[12],r[10],r[7],prv ]) 
     return render(request, 'company/list_terminal_register.html', data)