diff --git a/app/Http/Controllers/Account/PayController.php b/app/Http/Controllers/Account/PayController.php index a7fa6e4b..21bcc4e4 100644 --- a/app/Http/Controllers/Account/PayController.php +++ b/app/Http/Controllers/Account/PayController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Account; use App\Http\Controllers\Controller; +use App\Models\Order; use App\Models\OrderPay; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -68,4 +69,18 @@ class PayController extends Controller return View::make('account.pay.check',compact('model')); } + + public function show(Request $request) + { + $order = Order::query()->where('id',$request->input('order_id'))->first(); + if ($request->ajax()){ + $res = OrderPay::query() + ->where('order_id',$order->id) + ->orderByDesc('id') + ->paginate($request->input('limit')); + return $this->success('ok',$res->items(),$res->total()); + } + return View::make('account.pay.show',compact('order')); + } + } diff --git a/app/Http/Controllers/Order/OrderController.php b/app/Http/Controllers/Order/OrderController.php index 5d6ec086..9587fcad 100644 --- a/app/Http/Controllers/Order/OrderController.php +++ b/app/Http/Controllers/Order/OrderController.php @@ -28,8 +28,14 @@ class OrderController extends Controller 'num', ]); $res = Order::query() - ->where(function ($q) use ($user){ - return $q->where('frontend_user_id',$user->id)->orWhere('backend_user_id',$user->id); + ->where(function ($q) use($user){ + if ($user->hasPermissionTo('order.order.list_all')) { + + }elseif ($user->hasPermissionTo('order.order.list_department')) { + return $q->where('frontend_department_id',$user->department_id)->orWhere('backend_department_id',$user->department_id); + }else{ + return $q->where('frontend_user_id',$user->department_id)->orWhere('backend_user_id',$user->department_id); + } }) //订单号 ->when($data['num'], function ($query) use ($data) { @@ -79,6 +85,9 @@ class OrderController extends Controller return $this->error('订单金额比例不正确'); } $user = User::query()->where('id',$data['user_id'])->first(); + if ($user == null){ + return $this->error('请选择接单人'); + } if ($customer->is_end!=1){ $customer->update(['is_end'=>1]); } @@ -120,9 +129,9 @@ class OrderController extends Controller if ($request->ajax()){ $data = $request->all(['node_id','content','next_follow_time']); $old_node_id = $model->node_id; - $old_node_name = null; + $old_node_name = ''; $new_node_id = $data['node_id']??0; - $new_node_name = null; + $new_node_name = ''; foreach ($nodes as $node){ if ($node->id == $old_node_id){ $old_node_name = $node->name; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 9e60c917..62a18e08 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -38,6 +38,6 @@ class CreateUsersTable extends Migration */ public function down() { - Schema::dropIfExists('users'); + Schema::dropIfExists('user'); } } diff --git a/database/migrations/2021_03_15_101152_dialplan.php b/database/migrations/2021_03_15_101152_dialplan.php index 917baca2..af3150f0 100644 --- a/database/migrations/2021_03_15_101152_dialplan.php +++ b/database/migrations/2021_03_15_101152_dialplan.php @@ -52,6 +52,8 @@ class Dialplan extends Migration */ public function down() { + Schema::dropIfExists('action'); + Schema::dropIfExists('condition'); Schema::dropIfExists('extension'); } } diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php index 4e8e2d6e..dc28abd2 100644 --- a/database/seeds/UserTableSeeder.php +++ b/database/seeds/UserTableSeeder.php @@ -243,6 +243,8 @@ class UserTableSeeder extends Seeder ['name' => 'order.order.pay', 'display_name' => '付款'], ['name' => 'order.order.remark', 'display_name' => '跟进'], ['name' => 'order.order.destroy', 'display_name' => '删除'], + ['name' => 'order.order.list_all', 'display_name' => '查看所有订单'], + ['name' => 'order.order.list_department', 'display_name' => '查看本部门订单'], ] ], ], @@ -256,6 +258,7 @@ class UserTableSeeder extends Seeder 'display_name' => '订单付款', 'child' => [ ['name' => 'account.pay.check', 'display_name' => '审核'], + ['name' => 'account.pay.show', 'display_name' => '详情'], ] ], ], diff --git a/resources/views/account/pay/index.blade.php b/resources/views/account/pay/index.blade.php index e4a0858e..f89b613a 100644 --- a/resources/views/account/pay/index.blade.php +++ b/resources/views/account/pay/index.blade.php @@ -28,6 +28,9 @@ @{{ d.status_name }} @{{# } }} + @endsection @@ -50,7 +53,7 @@ ,cols: [[ //表头 {checkbox: true} ,{field: 'num', title: '订单号',templet:function (d) { - return d.order.num + return ''+ d.order.num+ '' }} ,{field: 'total_money', title: '总金额',templet:function (d) { return d.order.total_money @@ -79,6 +82,14 @@ area: ["600px","400px"], content: '/account/pay/check?id='+data.id, }) + } else if(layEvent == 'show'){ + layer.open({ + type: 2, + title: "付款申请记录", + shadeClose: true, + area: ["90%","90%"], + content: '/account/pay/show?order_id='+data.order_id, + }) } }); diff --git a/resources/views/account/pay/show.blade.php b/resources/views/account/pay/show.blade.php new file mode 100644 index 00000000..b62c7917 --- /dev/null +++ b/resources/views/account/pay/show.blade.php @@ -0,0 +1,87 @@ +@extends('base') + +@section('content') +
+
+
+
+
+
订单信息
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
订单号：{{$order->num}}总金额：{{$order->total_money}}已付金额：{{$order->payed_money}}
前期款：{{$order->first_money}}中期款：{{$order->mid_money}}尾款：{{$order->last_money}}
客户名称：{{$order->name}}联系人：{{$order->contact_name}}联系电话：{{$order->contact_phone}}
+
+
+
+
+
+
+
+
付款申请记录
+
+
+
+
+
+
+
+
+@endsection + +@section('script') + +@endsection + diff --git a/routes/web.php b/routes/web.php index 040c0492..49c2f9bd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -367,6 +367,8 @@ Route::group(['prefix'=>'account','namespace'=>'Account','middleware'=>['auth',' Route::get('pay','PayController@index')->name('account.pay')->middleware('permission:account.pay'); //审核 Route::match(['get','post'],'pay/check','PayController@check')->name('account.pay.check')->middleware('permission:account.pay.check'); + //详情 + Route::get('pay/show','PayController@show')->name('account.pay.show')->middleware('permission:account.pay.show'); });