diff --git a/app/customer/controller/Index.php b/app/customer/controller/Index.php index 965fe8d..37a9c49 100644 --- a/app/customer/controller/Index.php +++ b/app/customer/controller/Index.php @@ -119,10 +119,10 @@ class Index extends BaseController ->join('customer_source s', 'a.source_id = s.id') ->join('customer_grade g', 'a.grade_id = g.id') ->join('industry i', 'a.industry_id = i.id') - ->join('department d', 'a.belong_did = d.id','LEFT') - ->join($ct_sql.' ct', 'ct.cid = a.id','LEFT') + ->join('department d', 'a.belong_did = d.id') + ->join($ct_sql.' ct', 'ct.cid = a.id','left') ->order($orderby) - ->group('ct.follow_time') //去重 + ->group('a.id') //去重 ->paginate($rows, false, ['query' => $param]) ->each(function ($item, $key) { $item->belong_name = Db::name('Admin')->where(['id' => $item->belong_uid])->value('name'); diff --git a/app/customer/view/contact/index.html b/app/customer/view/contact/index.html index fb10e9b..22ef621 100644 --- a/app/customer/view/contact/index.html +++ b/app/customer/view/contact/index.html @@ -52,10 +52,10 @@ ,{field:'email',width:120,title: '电子邮箱', align:'center'} ,{field:'position',width:120,title: '担任职位', align:'center'} ,{field:'department',width:120,title: '部门', align:'center'} - ,{fixed:'right',width:120,title: '操作', align:'center',templet: function(d){ + ,{fixed:'right',width:100,title: '操作', align:'center',templet: function(d){ var html = '
'; }} ]] @@ -74,19 +74,7 @@ layui.pageTable.reload(); } } - tool.post("/customer/contact/contact_delete", { id: obj.data.id,status: 0,title: obj.data.title}, callback); - layer.close(index); - }); - } - if(obj.event === 'open'){ - layer.confirm('确定要设置该联系人为默认该客户的首要联系人吗?', {icon: 3, title:'提示'}, function(index){ - let callback = function (e) { - layer.msg(e.msg); - if (e.code == 0) { - layui.pageTable.reload(); - } - } - tool.post("/customer/contact/contact_check", { id: obj.data.id,status: 1,title: obj.data.title}, callback); + tool.delete("/customer/contact/contact_del", { id: obj.data.id}, callback); layer.close(index); }); } diff --git a/public/static/home/file/勾股OA客户导入模板.xlsx b/public/static/home/file/勾股OA客户导入模板.xlsx index adc1f3a..217b1e8 100644 Binary files a/public/static/home/file/勾股OA客户导入模板.xlsx and b/public/static/home/file/勾股OA客户导入模板.xlsx differ