From dcf2cb811b2e97f553267f1eba0956600984c268 Mon Sep 17 00:00:00 2001 From: "HDM58\\hdm58" Date: Tue, 27 Jun 2023 23:53:01 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E9=A2=86=E5=8F=96=E3=80=81=E5=88=86=E9=85=8D=E3=80=81?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E6=93=8D=E4=BD=9C=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=202?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=A0=E9=99=A4=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=90=8E=EF=BC=8C=E5=85=B3=E8=81=94=E7=9A=84=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E9=94=80=E5=94=AE?= =?UTF-8?q?=E6=9C=BA=E4=BC=9A=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/customer/controller/Index.php | 4 ++++ app/customer/view/index/index.html | 15 ++------------- app/customer/view/index/rush.html | 2 +- app/customer/view/index/sea.html | 16 +++++----------- app/customer/view/index/trash.html | 14 ++++---------- public/index.php | 2 +- 6 files changed, 17 insertions(+), 36 deletions(-) diff --git a/app/customer/controller/Index.php b/app/customer/controller/Index.php index 8a3f602..1d02945 100644 --- a/app/customer/controller/Index.php +++ b/app/customer/controller/Index.php @@ -579,6 +579,10 @@ class Index extends BaseController 'create_time' => time() ); if (Db::name('Customer')->update($data) !== false) { + //删除客户联系人 + Db::name('CustomerContact')->where(['cid' => $params['id']])->update(['delete_time'=>time()]); + //删除客户机会 + Db::name('CustomerChance')->where(['cid' => $params['id']])->update(['delete_time'=>time()]); add_log('delete', $params['id']); Db::name('CustomerLog')->strict(false)->field(true)->insert($log_data); return to_assign(); diff --git a/app/customer/view/index/index.html b/app/customer/view/index/index.html index f3b218c..af1476e 100644 --- a/app/customer/view/index/index.html +++ b/app/customer/view/index/index.html @@ -240,7 +240,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.post("/customer/index/to_sea", {id: data.id}, callback); @@ -367,23 +367,12 @@ } }); } - - $('[lay-filter="clear"]').on('click',function(){ - //$('.layui-table-sort').attr('lay-sort',''); - //console.log($('.layui-table-sort').attr('lay-sort')); - setTimeout(function(){ - $('[lay-filter="webform"]').click(); - },10) - }) - //监听搜索提交 form.on('submit(webform)', function(data) { layui.pageTable.reload({ where: data.field, - page: { - curr: 1 - } + page: {curr: 1} }); return false; }); diff --git a/app/customer/view/index/rush.html b/app/customer/view/index/rush.html index 259751a..1587ef1 100644 --- a/app/customer/view/index/rush.html +++ b/app/customer/view/index/rush.html @@ -96,7 +96,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); let count =$('#count').text(); $('#count').html(++count); } diff --git a/app/customer/view/index/sea.html b/app/customer/view/index/sea.html index 0d79d06..1964bbc 100644 --- a/app/customer/view/index/sea.html +++ b/app/customer/view/index/sea.html @@ -255,7 +255,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.post("/customer/api/distribute", {id: data.id,uid:ids,did:dids}, callback); @@ -272,7 +272,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.post("/customer/index/get", {id: data.id}, callback); @@ -287,7 +287,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.delete("/customer/index/to_trash", {id: data.id,type:1}, callback); @@ -300,14 +300,8 @@ //监听搜索提交 form.on('submit(webform)', function(data) { layui.pageTable.reload({ - where: { - keywords: data.field.keywords, - industry_id: data.field.industry_id, - source_id: data.field.source_id - }, - page: { - curr: 1 - } + where: data.field, + page: {curr: 1} }); return false; }); diff --git a/app/customer/view/index/trash.html b/app/customer/view/index/trash.html index 7078006..b6667b6 100644 --- a/app/customer/view/index/trash.html +++ b/app/customer/view/index/trash.html @@ -129,7 +129,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.post("/customer/index/revert", {id: data.id}, callback); @@ -144,7 +144,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - obj.del(); + layui.pageTable.reload(); } } tool.delete("/customer/index/delete", {id: data.id}, callback); @@ -157,14 +157,8 @@ //监听搜索提交 form.on('submit(webform)', function(data) { layui.pageTable.reload({ - where: { - keywords: data.field.keywords, - industry_id: data.field.industry_id, - source_id: data.field.source_id - }, - page: { - curr: 1 - } + where: data.field, + page: {curr: 1} }); return false; }); diff --git a/public/index.php b/public/index.php index f93d4b3..5c58973 100644 --- a/public/index.php +++ b/public/index.php @@ -15,7 +15,7 @@ if (empty(file_exists(__DIR__ . '/../vendor/autoload.php'))) { require __DIR__ . '/../vendor/autoload.php'; // 定义当前版本号 -define('CMS_VERSION','4.50.31'); +define('CMS_VERSION','4.60.28'); // 定义Layui版本号 define('LAYUI_VERSION','2.8.8');