Leadfyy.co
/
hainan
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工单fix默认值和无数据情况

develop
shuixiang 4 years ago
parent
ae55036ea4
commit
db608471fe
6 changed files with 110 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      app/AdminAgent/Controllers/WorkorderController.php
  2. 6
      app/AdminGuide/Controllers/WorkorderController.php
  3. 5
      app/AdminSupplier/Controllers/WorkorderController.php
  4. 5
      app/Models/Agent.php
  5. 5
      app/Models/Guide.php
  6. 162
      resources/views/admin/pages/index.blade.php

5
app/AdminAgent/Controllers/WorkorderController.php
View File

@ -41,6 +41,11 @@ class WorkorderController extends AdminController
->orderByDesc('updated_at')
->get();
// 先这么处理吧
if ($workorderId == 0 && !empty($workorder)) {
return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
}
foreach ($workorder as $v) {
$item = WorkorderItem::query()->where('workorder_id',$v->id)->orderByDesc('updated_at')->first();
$arr = [

6
app/AdminGuide/Controllers/WorkorderController.php
View File

@ -41,6 +41,12 @@ class WorkorderController extends AdminController
})
->orderByDesc('updated_at')
->get();
// 先这么处理吧
if ($workorderId == 0 && !empty($workorder)) {
return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
}
foreach ($workorder as $v) {
$item = WorkorderItem::query()->where('workorder_id',$v->id)->orderByDesc('updated_at')->first();
$arr = [

5
app/AdminSupplier/Controllers/WorkorderController.php
View File

@ -41,6 +41,11 @@ class WorkorderController extends AdminController
->orderByDesc('updated_at')
->get();
// 先这么处理吧
if ($workorderId == 0 && !empty($workorder)) {
return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id);
}
foreach ($workorder as $v) {
$item = WorkorderItem::query()->where('workorder_id',$v->id)->orderByDesc('updated_at')->first();
$arr = [

5
app/Models/Agent.php
View File

@ -44,6 +44,11 @@ class Agent extends BaseModel
return $this->morphOne('App\Models\DemandBidding', 'biddingUser');
}
public function workoorder()
{
return $this->morphOne('App\Models\Workorder', 'publisher');
}
public function workoorderitem()
{
return $this->morphOne('App\Models\WorkorderItem', 'publisher');

5
app/Models/Guide.php
View File

@ -32,6 +32,11 @@ class Guide extends BaseModel
return $this->morphOne('App\Models\DemandBidding', 'biddingUser');
}
public function workoorder()
{
return $this->morphOne('App\Models\Workorder', 'publisher');
}
public function workoorderitem()
{
return $this->morphOne('App\Models\WorkorderItem', 'publisher');

162
resources/views/admin/pages/index.blade.php
View File

@ -37,103 +37,109 @@
<div class="row chat-container">
<div class="col-lg-3 col-md-4 msg-list">
@foreach($user_list as $key => $item)
@if($workorder['workorder_id']==$item['workorder_id'])
<div class="msg-list-item active" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
@else
<div class="msg-list-item" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
@endif
<div class="msg-user">
<div class="msg-avatar">
<img src="{{$item['avatar']}}" alt="头像" title="头像" />
</div>
<div class="msg-name">
{{$item['name']}}
</div>
</div>
<div class="msg-list-title">
{{$item['content']}}
</div>
<div class="msg-list-content">
{{$item['last_message']}}
</div>
<div class="msg-time">
{{$item['last_message_time']}}
</div>
{{--@if($item['unread'] == true)--}}
{{--<div class="msg-list-badge background-red"></div>--}}
{{--@else--}}
{{--<div class="msg-list-badge background-gray"></div>--}}
{{--@endif--}}
</div>
@endforeach
</div>
<div class="col-lg-9 col-md-8 msg-chat">
<div class="input-group input-group-lg msg-send">
<input name="msg-input" type="text" class="form-control" style="border-radius: 0; border-color: #dbe3e6; text-align: center;">
<div class="input-group-addon msg-image"><span class="fa fa-picture-o"></span></div>
<div class="input-group-addon msg-text">发送</div>
<input type="file" class="hidden image" name="image">
</div>
<div class="msg-chat-list">
@foreach($msg_list as $key => $item)
@if($item['type'] == 'op')
<div class="row">
<div class="col-lg-11 text-left">
@if(empty($user_list))
<div class="text-center">暂无工单数据</div>
@else
@foreach($user_list as $key => $item)
@if($workorder['workorder_id']==$item['workorder_id'])
<div class="msg-list-item active" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
@else
<div class="msg-list-item" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
@endif
<div class="msg-user">
<div class="msg-avatar">
<img src="{{$item['avatar']}}" alt="头像" title="头像" />
</div>
<div class="msg-name">
{{$item['name']}}
</div>
</div>
<div class="msg-content">
@if($item['it_type'] == 1)
{{$item['content']}}
@elseif($item['it_type'] == 2)
<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
@endif
<div class="msg-list-title">
{{$item['content']}}
</div>
<div class="msg-list-content">
{{$item['last_message']}}
</div>
<div class="msg-time">
{{$item['created_at_text']}}
{{$item['last_message_time']}}
</div>
{{--@if($item['unread'] == true)--}}
{{--<div class="msg-list-badge background-red"></div>--}}
{{--@else--}}
{{--<div class="msg-list-badge background-gray"></div>--}}
{{--@endif--}}
</div>
</div>
@elseif($item['type'] == 'my')
<div class="row">
<div class="col-lg-11 offset-1 text-right">
<div class="msg-user">
<div class="msg-name">
{{$item['name']}}
@endforeach
@endif
</div>
<div class="col-lg-9 col-md-8 msg-chat">
@if(empty($msg_list))
<div class="text-center">暂无工单数据</div>
@else
<div class="input-group input-group-lg msg-send">
<input name="msg-input" type="text" class="form-control" style="border-radius: 0; border-color: #dbe3e6; text-align: center;">
<div class="input-group-addon msg-image"><span class="fa fa-picture-o"></span></div>
<div class="input-group-addon msg-text">发送</div>
<input type="file" class="hidden image" name="image">
</div>
<div class="msg-chat-list">
@foreach($msg_list as $key => $item)
@if($item['type'] == 'op')
<div class="row">
<div class="col-lg-11 text-left">
<div class="msg-user">
<div class="msg-avatar">
<img src="{{$item['avatar']}}" alt="头像" title="头像" />
</div>
<div class="msg-name">
{{$item['name']}}
</div>
</div>
<div class="msg-avatar">
<img src="{{$item['avatar']}}" alt="头像" title="头像" />
<div class="msg-content">
@if($item['it_type'] == 1)
{{$item['content']}}
@elseif($item['it_type'] == 2)
<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
@endif
</div>
</div>
<div class="msg-content text-left">
@if($item['it_type'] == 1)
{{$item['content']}}
@elseif($item['it_type'] == 2)
<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
@endif
<div class="msg-time">
{{$item['created_at_text']}}
</div>
</div>
</div>
@elseif($item['type'] == 'my')
<div class="row">
<div class="col-lg-11 offset-1 text-right">
<div class="msg-user">
<div class="msg-name">
{{$item['name']}}
</div>
<div class="msg-avatar">
<img src="{{$item['avatar']}}" alt="头像" title="头像" />
</div>
</div>
<div class="msg-time">
{{$item['created_at_text']}}
<div class="msg-content text-left">
@if($item['it_type'] == 1)
{{$item['content']}}
@elseif($item['it_type'] == 2)
<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
@endif
</div>
<div class="msg-time">
{{$item['created_at_text']}}
</div>
</div>
</div>
</div>
@endif
@endforeach
</div>
@endif
@endforeach
</div>
@endif
</div>
<div class="hidden-forms">

Write Preview
Loading…
Cancel
Save