Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0e967310
authored
Nov 13, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
兼容-调整列表搜索
parent
c1b12d13
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
18 deletions
app/Http/Controllers/OrderController.php
public/css/detail.css
resources/views/erpOrder/content.blade.php
resources/views/orderlist/content.blade.php
resources/views/selfOrder/content.blade.php
app/Http/Controllers/OrderController.php
View file @
0e967310
...
...
@@ -573,17 +573,7 @@ Class OrderController extends Controller
public
function
templateData
(
Request
$request
,
$id
,
$view_id
)
{
$info
=
$this
->
orderDetail
(
$request
,
$id
);
$info
[
'title'
]
=
'订单详情'
;
$param
=
$request
->
only
(
'tags'
);
if
(
!
$param
[
'tags'
])
{
$info
[
'paths'
]
=
[[
"title"
=>
'联营订单'
,
"href"
=>
'#'
],
[
"title"
=>
'平台订单'
,
"href"
=>
'/list'
],
[
"title"
=>
'订单明细'
,
"href"
=>
'#'
]];
}
else
if
(
$param
[
'tags'
]
&&
$param
[
'tags'
]
==
'erp'
)
{
$info
[
'paths'
]
=
[[
"title"
=>
'联营订单'
,
"href"
=>
'#'
],
[
"title"
=>
'ERP订单'
,
"href"
=>
'/erp_order'
],
[
"title"
=>
'订单明细'
,
"href"
=>
'#'
]];
}
else
if
(
$param
[
'tags'
]
&&
$param
[
'tags'
]
==
'self'
)
{
$info
[
'paths'
]
=
[[
"title"
=>
'自营订单'
,
"href"
=>
'#'
],
[
"title"
=>
'自营订单'
,
"href"
=>
'/self_order'
],
[
"title"
=>
'订单明细'
,
"href"
=>
'#'
]];
}
$this
->
pageHeader
(
$request
,
$info
,
'订单详情'
);
if
(
$info
[
'order_info'
][
'order_goods_type'
]
==
2
&&
in_array
(
$info
[
'order_info'
][
'order_type'
],
[
1
,
3
]))
{
// 平台自营订单
if
(
$request
->
input
(
'tags'
)
!=
'self'
)
{
...
...
public/css/detail.css
View file @
0e967310
...
...
@@ -222,7 +222,7 @@ li {
.test-order
{
width
:
130px
!important
;
}
.Wdate
{
width
:
11
0px
!important
;
}
.Wdate
{
width
:
9
0px
!important
;
}
.btn-group
{
width
:
220px
;
}
...
...
@@ -233,3 +233,7 @@ li {
.payment-status
{
width
:
220px
;
}
}
@media
screen
and
(
max-width
:
460px
)
{
.order_contain
{
margin-left
:
80px
!important
;
}
}
resources/views/erpOrder/content.blade.php
View file @
0e967310
...
...
@@ -23,14 +23,14 @@
</ul>
</div>
</dd>
<dd><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
<dd
class=
"order_contain"
><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
</dl>
<dl>
<dt>
创建日期:
</dt>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_start"
value=
"{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"开始时间"
autocomplete=
"off"
/>
</dd>
<dd>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_end"
value=
"{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"结束时间"
autocomplete=
"off"
/>
</dd>
</dl>
...
...
resources/views/orderlist/content.blade.php
View file @
0e967310
...
...
@@ -23,14 +23,14 @@
</ul>
</div>
</dd>
<dd><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
<dd
class=
"order_contain"
><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
</dl>
<dl>
<dt>
创建日期:
</dt>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_start"
value=
"{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"开始时间"
autocomplete=
"off"
/>
</dd>
<dd>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_end"
value=
"{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"结束时间"
autocomplete=
"off"
/>
</dd>
</dl>
...
...
resources/views/selfOrder/content.blade.php
View file @
0e967310
...
...
@@ -24,14 +24,14 @@
</ul>
</div>
</dd>
<dd><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
<dd
class=
"order_contain"
><input
type=
"text"
name=
"order_contain"
value=
"{{$condition['order_contain']}}"
placeholder=
"请输入内容"
></dd>
</dl>
<dl>
<dt>
创建日期:
</dt>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_start"
value=
"{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"开始时间"
autocomplete=
"off"
/>
</dd>
<dd>
<dd
style=
"width:auto !important;"
>
<input
type=
"text"
name=
"time_end"
value=
"{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}"
class=
"Wdate "
onfocus=
"WdatePicker({dateFmt:'yyyy/MM/dd'})"
placeholder=
"结束时间"
autocomplete=
"off"
/>
</dd>
</dl>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment