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
bac54290
authored
Nov 13, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
竞调账号添加公司搜索
parent
743b47ce
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
app/Http/Controllers/OrderController.php
public/js/list.js
resources/views/orderlist/content.blade.php
app/Http/Controllers/OrderController.php
View file @
bac54290
...
@@ -442,6 +442,7 @@ Class OrderController extends Controller
...
@@ -442,6 +442,7 @@ Class OrderController extends Controller
$map
[
'order_type_extend'
]
=
$request
->
input
(
'order_type_extend'
,
''
);
$map
[
'order_type_extend'
]
=
$request
->
input
(
'order_type_extend'
,
''
);
$map
[
'status_extend'
]
=
$request
->
input
(
'status_extend'
,
''
);
$map
[
'status_extend'
]
=
$request
->
input
(
'status_extend'
,
''
);
$map
[
'is_manager_audit'
]
=
$request
->
input
(
'is_manager_audit'
,
''
);
$map
[
'is_manager_audit'
]
=
$request
->
input
(
'is_manager_audit'
,
''
);
$map
[
'order_remark'
]
=
$request
->
input
(
'order_remark'
,
''
);
$perm
=
new
PermController
;
$perm
=
new
PermController
;
...
...
public/js/list.js
View file @
bac54290
...
@@ -97,6 +97,7 @@
...
@@ -97,6 +97,7 @@
order_type_extend
=
$
(
'#order_type_extend'
).
val
()
?
$
(
'#order_type_extend'
).
val
()
:
''
,
order_type_extend
=
$
(
'#order_type_extend'
).
val
()
?
$
(
'#order_type_extend'
).
val
()
:
''
,
status_extend
=
$
(
'#status_extend'
).
val
()
?
$
(
'#status_extend'
).
val
()
:
''
,
status_extend
=
$
(
'#status_extend'
).
val
()
?
$
(
'#status_extend'
).
val
()
:
''
,
is_manager_audit
=
$
(
'#is_manager_audit'
).
val
()
?
$
(
'#is_manager_audit'
).
val
()
:
''
;
is_manager_audit
=
$
(
'#is_manager_audit'
).
val
()
?
$
(
'#is_manager_audit'
).
val
()
:
''
;
order_remark
=
$
(
'#order_remark'
).
val
()
?
$
(
'#order_remark'
).
val
()
:
''
;
if
(
url
==
'/export'
)
{
if
(
url
==
'/export'
)
{
if
(
type
==
1
)
{
// 联营
if
(
type
==
1
)
{
// 联营
...
@@ -238,6 +239,10 @@
...
@@ -238,6 +239,10 @@
listUrl
+=
'&test_order='
+
1
;
listUrl
+=
'&test_order='
+
1
;
}
}
if
(
order_remark
)
{
listUrl
+=
'&order_remark='
+
order_remark
;
}
if
(
url
==
'/export'
)
{
if
(
url
==
'/export'
)
{
listUrl
+=
'&order_goods_type='
+
type
;
listUrl
+=
'&order_goods_type='
+
type
;
}
}
...
...
resources/views/orderlist/content.blade.php
View file @
bac54290
...
@@ -78,9 +78,7 @@
...
@@ -78,9 +78,7 @@
@endif
@endif
</select>
</select>
</dd>
</dd>
</dl>
</dl>
<dl>
<dl>
<dt>
付款类型:
</dt>
<dt>
付款类型:
</dt>
...
@@ -229,6 +227,14 @@
...
@@ -229,6 +227,14 @@
</select>
</select>
</dd>
</dd>
</dl>
</dl>
@if ($username == 'vpadmin@ichunt.com')
<dl>
<dt>
公司名称:
</dt>
<dd>
<input
type=
"text"
id=
"order_remark"
name=
"order_remark"
value=
"{{$condition['order_remark']}}"
placeholder=
"请输入公司名称"
>
</dd>
</dl>
@endif
@if (in_array('check_test_order', $userPerms))
@if (in_array('check_test_order', $userPerms))
<dl>
<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