diff --git a/app/Models/Node.php b/app/Models/Node.php index 2946208b..849c1426 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -3,9 +3,16 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Arr; class Node extends Model { protected $table = 'node'; protected $guarded = ['id']; + protected $appends = ['type_name']; + + public function getTypeNameAttribute() + { + return $this->attributes['type_name'] = Arr::get(config('freeswitch.node_type'),$this->type,'-'); + } } diff --git a/config/freeswitch.php b/config/freeswitch.php index 25645564..f5a92bfa 100644 --- a/config/freeswitch.php +++ b/config/freeswitch.php @@ -46,6 +46,12 @@ return [ 'host' => '192.168.254.216', 'wss_url' => 'testcall.shupian.cn', + 'node_type' => [ + 0 => '公共节点', + 1 => '客户跟进', + 2 => '订单生产', + 3 => '财务付款', + ], //队列响铃模式 'strategy' => [ diff --git a/database/migrations/2021_03_19_164406_node.php b/database/migrations/2021_03_19_164406_node.php index 8166479c..04145e71 100644 --- a/database/migrations/2021_03_19_164406_node.php +++ b/database/migrations/2021_03_19_164406_node.php @@ -17,7 +17,7 @@ class Node extends Migration $table->bigIncrements('id'); $table->string('name')->comment('节点名称'); $table->tinyInteger('sort')->default(10)->comment('排序'); - $table->tinyInteger('type')->default(1)->comment('1客户跟进,2订单生产,3财务付款'); + $table->tinyInteger('type')->default(0)->comment('默认0,0表示公共,1客户跟进,2订单生产,3财务付款'); $table->timestamps(); }); } diff --git a/resources/views/call/cdr/index.blade.php b/resources/views/call/cdr/index.blade.php index b4115a33..a0ea06d9 100644 --- a/resources/views/call/cdr/index.blade.php +++ b/resources/views/call/cdr/index.blade.php @@ -4,7 +4,7 @@
- +
diff --git a/resources/views/call/dialplan/action/index.blade.php b/resources/views/call/dialplan/action/index.blade.php index 565fb336..78b1f81d 100644 --- a/resources/views/call/dialplan/action/index.blade.php +++ b/resources/views/call/dialplan/action/index.blade.php @@ -4,7 +4,7 @@
- + 添 加
@@ -50,18 +50,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.action.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); //删除对应行(tr)的DOM结构 - } - }) - }); - }); + deleteData(obj,"{{ route('call.action.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, @@ -76,33 +65,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = [] - var hasCheck = table.checkStatus('dataTable') - var hasCheckData = hasCheck.data - if (hasCheckData.length>0){ - $.each(hasCheckData,function (index,element) { - ids.push(element.id) - }) - } - if (ids.length>0){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.action.destroy') }}",{_method:'delete',ids:ids},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - dataTable.reload() - } - }) - }); - }) - }else { - layer.msg('请选择删除项',{icon:2}) - } - }) $("#addBtn").click(function () { layer.open({ type: 2, diff --git a/resources/views/call/dialplan/condition/index.blade.php b/resources/views/call/dialplan/condition/index.blade.php index 6c5b2b25..2e1c9ad9 100644 --- a/resources/views/call/dialplan/condition/index.blade.php +++ b/resources/views/call/dialplan/condition/index.blade.php @@ -4,7 +4,7 @@
- + 添加
@@ -52,18 +52,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.condition.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); //删除对应行(tr)的DOM结构 - } - }) - }); - }); + deleteData(obj,"{{ route('call.condition.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, @@ -80,33 +69,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = [] - var hasCheck = table.checkStatus('dataTable') - var hasCheckData = hasCheck.data - if (hasCheckData.length>0){ - $.each(hasCheckData,function (index,element) { - ids.push(element.id) - }) - } - if (ids.length>0){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.condition.destroy') }}",{_method:'delete',ids:ids},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - dataTable.reload() - } - }) - }); - }) - }else { - layer.msg('请选择删除项',{icon:2}) - } - }) $("#addBtn").click(function () { layer.open({ type: 2, diff --git a/resources/views/call/dialplan/extension/index.blade.php b/resources/views/call/dialplan/extension/index.blade.php index 4357f0de..c16db5a7 100644 --- a/resources/views/call/dialplan/extension/index.blade.php +++ b/resources/views/call/dialplan/extension/index.blade.php @@ -5,7 +5,7 @@
@can('call.extension.destroy') - + @endcan @can('call.extension.create') 添加 @@ -67,18 +67,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.extension.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); //删除对应行(tr)的DOM结构 - } - }) - }); - }); + deleteData(obj,"{{ route('call.extension.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, @@ -97,33 +86,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = [] - var hasCheck = table.checkStatus('dataTable') - var hasCheckData = hasCheck.data - if (hasCheckData.length>0){ - $.each(hasCheckData,function (index,element) { - ids.push(element.id) - }) - } - if (ids.length>0){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.extension.destroy') }}",{_method:'delete',ids:ids},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - dataTable.reload() - } - }) - }); - }) - }else { - layer.msg('请选择删除项',{icon:2}) - } - }) $("#addBtn").click(function () { layer.open({ type: 2, diff --git a/resources/views/call/gateway/index.blade.php b/resources/views/call/gateway/index.blade.php index 14ea2fd3..f2b2f3db 100644 --- a/resources/views/call/gateway/index.blade.php +++ b/resources/views/call/gateway/index.blade.php @@ -5,7 +5,7 @@
@can('call.gateway.destroy') - + @endcan @can('call.gateway.create') 添加 @@ -73,18 +73,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.gateway.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); //删除对应行(tr)的DOM结构 - } - }) - }); - }); + deleteData(obj,"{{ route('call.gateway.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, @@ -96,34 +85,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = [] - var hasCheck = table.checkStatus('dataTable') - var hasCheckData = hasCheck.data - if (hasCheckData.length>0){ - $.each(hasCheckData,function (index,element) { - ids.push(element.id) - }) - } - if (ids.length>0){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.gateway.destroy') }}",{_method:'delete',ids:ids},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - dataTable.reload() - } - }) - }); - }) - }else { - layer.msg('请选择删除项',{icon:2}) - } - }) - //更新配置 $("#updateXml").click(function () { layer.confirm('该操作将重新注册所有网关,确认操作吗?', function(index){ diff --git a/resources/views/call/sip/index.blade.php b/resources/views/call/sip/index.blade.php index e4cc1a02..692efaf7 100644 --- a/resources/views/call/sip/index.blade.php +++ b/resources/views/call/sip/index.blade.php @@ -5,7 +5,7 @@
@can('call.sip.destroy') - + @endcan @can('call.sip.create') 添加 @@ -14,7 +14,7 @@ 批量添加 @endcan @can('call.sip.updateXml') - + @endcan
@@ -66,16 +66,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - $.post("{{ route('call.sip.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(index); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); //删除对应行(tr)的DOM结构 - } - }) - }); - }); + deleteData(obj,"{{ route('call.sip.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, @@ -87,33 +78,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = [] - var hasCheck = table.checkStatus('dataTable') - var hasCheckData = hasCheck.data - if (hasCheckData.length>0){ - $.each(hasCheckData,function (index,element) { - ids.push(element.id) - }) - } - if (ids.length>0){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load() - $.post("{{ route('call.sip.destroy') }}",{_method:'delete',ids:ids},function (res) { - layer.close(load); - layer.msg(res.msg,{time:2000,icon:res.code==0?1:2},function () { - if (res.code==0){ - dataTable.reload() - } - }) - }); - }) - }else { - layer.msg('请选择删除项',{icon:2}) - } - }) //更新配置 $("#updateXml").click(function () { layer.confirm('确认生成所有分机配置吗?', function (index) { diff --git a/resources/views/crm/department/index.blade.php b/resources/views/crm/department/index.blade.php index 7cca5645..ed81c1e1 100644 --- a/resources/views/crm/department/index.blade.php +++ b/resources/views/crm/department/index.blade.php @@ -69,18 +69,7 @@ var data = obj.data //获得当前行数据 ,layEvent = obj.event; //获得 lay-event 对应的值 if(layEvent === 'del'){ - layer.confirm('确认删除吗?', function(index){ - layer.close(index); - var load = layer.load(); - $.post("{{ route('crm.department.destroy') }}",{_method:'delete',ids:[data.id]},function (res) { - layer.close(load); - layer.msg(res.msg,{time:1500,icon:res.code==0?1:2},function () { - if (res.code==0){ - obj.del(); - } - }) - }); - }); + deleteData(obj,"{{ route('crm.department.destroy') }}"); } else if(layEvent === 'edit'){ layer.open({ type: 2, diff --git a/resources/views/crm/node/_form.blade.php b/resources/views/crm/node/_form.blade.php index 52d13f9c..e7925c6c 100644 --- a/resources/views/crm/node/_form.blade.php +++ b/resources/views/crm/node/_form.blade.php @@ -1,32 +1,31 @@ {{csrf_field()}}
-
+
-
+
-
+
- - 返 回 +
diff --git a/resources/views/crm/node/create.blade.php b/resources/views/crm/node/create.blade.php index 5a93bea4..31767eed 100644 --- a/resources/views/crm/node/create.blade.php +++ b/resources/views/crm/node/create.blade.php @@ -1,18 +1,11 @@ -@extends('admin.base') +@extends('base') @section('content')
-
-

添加节点

-
- - @include('admin.node._form') + + @include('crm.node._form')
@endsection - -@section('script') - @include('admin.node._js') -@endsection \ No newline at end of file diff --git a/resources/views/crm/node/edit.blade.php b/resources/views/crm/node/edit.blade.php index bbd384eb..922c6665 100644 --- a/resources/views/crm/node/edit.blade.php +++ b/resources/views/crm/node/edit.blade.php @@ -1,19 +1,12 @@ -@extends('admin.base') +@extends('base') @section('content')
-
-

更新节点

-
-
+ {{method_field('put')}} - @include('admin.node._form') + @include('crm.node._form')
@endsection - -@section('script') - @include('admin.node._js') -@endsection \ No newline at end of file diff --git a/resources/views/crm/node/index.blade.php b/resources/views/crm/node/index.blade.php index 1d161092..6fd37f96 100644 --- a/resources/views/crm/node/index.blade.php +++ b/resources/views/crm/node/index.blade.php @@ -5,8 +5,11 @@
+ @can('crm.node.destroy') + + @endcan @can('crm.node.create') - 添加 + 添加 @endcan
@@ -37,15 +40,15 @@ //用户表格初始化 var dataTable = table.render({ elem: '#dataTable' - ,height: 500 + ,height: 'full-200' ,url: "{{ route('crm.node') }}" //数据接口 ,page: true //开启分页 ,cols: [[ //表头 {checkbox: true} ,{field: 'id', title: 'ID', sort: true,width:80} + ,{field: 'type_name', title: '类型'} ,{field: 'name', title: '名称'} ,{field: 'sort', title: '排序'} - ,{field: 'type_name', title: '类型'} ,{ width: 150, align:'center', toolbar: '#options', title:'操作'} ]] }); @@ -57,11 +60,25 @@ if(layEvent === 'del'){ deleteData(obj,"{{ route('crm.node.destroy') }}"); } else if(layEvent === 'edit'){ - location.href = '/crm/node/'+data.id+'/edit'; + layer.open({ + type: 2, + title: "编辑", + shadeClose: true, + area: ["600px","400px"], + content: '/crm/node/'+data.id+'/edit', + }) } }); - + $("#addBtn").click(function () { + layer.open({ + type: 2, + title: "添加", + shadeClose: true, + area: ["600px","400px"], + content: "{{route("crm.node.create")}}", + }) + }) }) diff --git a/resources/views/system/menu/index.blade.php b/resources/views/system/menu/index.blade.php index afdbf84d..a6bf3780 100644 --- a/resources/views/system/menu/index.blade.php +++ b/resources/views/system/menu/index.blade.php @@ -68,23 +68,7 @@ var data = obj.data //获得当前行数据 , layEvent = obj.event; //获得 lay-event 对应的值 if (layEvent === 'del') { - layer.confirm('确认删除吗?', function (index) { - layer.close(index) - var load = layer.load(); - $.post("{{ route('system.menu.destroy') }}", { - _method: 'delete', - ids: [data.id] - }, function (res) { - layer.close(load); - if (res.code == 0) { - layer.msg(res.msg, {icon: 1}, function () { - obj.del(); - }) - } else { - layer.msg(res.msg, {icon: 2}) - } - }); - }); + deleteData(obj,"{{ route('system.menu.destroy') }}"); } else if (layEvent === 'edit') { layer.open({ type: 2, diff --git a/resources/views/system/permission/index.blade.php b/resources/views/system/permission/index.blade.php index 064e79cb..04210273 100644 --- a/resources/views/system/permission/index.blade.php +++ b/resources/views/system/permission/index.blade.php @@ -68,23 +68,7 @@ var data = obj.data //获得当前行数据 , layEvent = obj.event; //获得 lay-event 对应的值 if (layEvent === 'del') { - layer.confirm('确认删除吗?', function (index) { - layer.close(index) - var load = layer.load(); - $.post("{{ route('system.permission.destroy') }}", { - _method: 'delete', - ids: [data.id] - }, function (res) { - layer.close(load); - if (res.code == 0) { - layer.msg(res.msg, {icon: 1}, function () { - obj.del(); - }) - } else { - layer.msg(res.msg, {icon: 2}) - } - }); - }); + deleteData(obj,"{{ route('system.permission.destroy') }}"); } else if (layEvent === 'edit') { layer.open({ type: 2, diff --git a/resources/views/system/role/index.blade.php b/resources/views/system/role/index.blade.php index abb59a17..7b76ac50 100644 --- a/resources/views/system/role/index.blade.php +++ b/resources/views/system/role/index.blade.php @@ -5,7 +5,7 @@
@can('system.role.destroy') - + @endcan @can('system.role.create') 添加 @@ -57,23 +57,7 @@ var data = obj.data //获得当前行数据 , layEvent = obj.event; //获得 lay-event 对应的值 if (layEvent === 'del') { - layer.confirm('确认删除吗?', function (index) { - layer.close(index) - var load = layer.load(); - $.post("{{ route('system.role.destroy') }}", { - _method: 'delete', - ids: [data.id] - }, function (res) { - layer.close(load); - if (res.code == 0) { - layer.msg(res.msg, {icon: 1}, function () { - obj.del(); - }) - } else { - layer.msg(res.msg, {icon: 2}) - } - }); - }); + deleteData(obj,"{{ route('system.role.destroy') }}"); } else if (layEvent === 'edit') { layer.open({ type: 2, @@ -85,38 +69,6 @@ } }); - //按钮批量删除 - $("#listDelete").click(function () { - var ids = []; - var hasCheck = table.checkStatus('dataTable'); - var hasCheckData = hasCheck.data; - if (hasCheckData.length > 0) { - $.each(hasCheckData, function (index, element) { - ids.push(element.id) - }) - } - if (ids.length > 0) { - layer.confirm('确认删除吗?', function (index) { - layer.close(index); - var load = layer.load(); - $.post("{{ route('system.role.destroy') }}", { - _method: 'delete', - ids: ids - }, function (res) { - layer.close(load); - if (res.code == 0) { - layer.msg(res.msg, {icon: 1}, function () { - dataTable.reload({page: {curr: 1}}); - }) - } else { - layer.msg(res.msg, {icon: 2}) - } - }); - }) - } else { - layer.msg('请选择删除项', {icon: 2}); - } - }) $("#addBtn").click(function () { layer.open({