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
810c077c
authored
Dec 30, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
temp
parent
d7884a9a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
10 deletions
app/Http/Controllers/OrderController.php
public/js/add_order.js
public/js/goods.js
public/js/order.js
resources/views/selfOrder/content.blade.php
app/Http/Controllers/OrderController.php
View file @
810c077c
...
@@ -405,6 +405,7 @@ Class OrderController extends Controller
...
@@ -405,6 +405,7 @@ Class OrderController extends Controller
$map
[
'order_sn'
]
=
$request
->
input
(
'order_sn'
,
''
);
$map
[
'order_sn'
]
=
$request
->
input
(
'order_sn'
,
''
);
$map
[
'erp_sn'
]
=
$request
->
input
(
'erp_sn'
,
''
);
$map
[
'erp_sn'
]
=
$request
->
input
(
'erp_sn'
,
''
);
$map
[
'goods_name'
]
=
$request
->
input
(
'goods_name'
,
''
);
$map
[
'goods_name'
]
=
$request
->
input
(
'goods_name'
,
''
);
$map
[
'select_time_type'
]
=
$request
->
input
(
'select_time_type'
,
''
);
$map
[
'time_start'
]
=
$request
->
input
(
'time_start'
,
''
);
$map
[
'time_start'
]
=
$request
->
input
(
'time_start'
,
''
);
$map
[
'time_end'
]
=
$request
->
input
(
'time_end'
,
''
);
$map
[
'time_end'
]
=
$request
->
input
(
'time_end'
,
''
);
$map
[
'order_status'
]
=
$request
->
input
(
'order_status'
,
''
);
$map
[
'order_status'
]
=
$request
->
input
(
'order_status'
,
''
);
...
...
public/js/add_order.js
View file @
810c077c
...
@@ -325,7 +325,7 @@
...
@@ -325,7 +325,7 @@
html
+=
'<tr><th>阶梯</th><th>RMB价格</th>'
;
html
+=
'<tr><th>阶梯</th><th>RMB价格</th>'
;
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
// ac_type = 5 为新客价，目前后台不展示新客价
switch
(
data
.
ac_type
)
{
switch
(
data
.
ac_type
)
{
case
1
:
html
+=
'<th>限时限量</th>'
;
break
;
case
1
:
html
+=
'<th>限时限量</th>'
;
break
;
case
2
:
html
+=
'<th>活动价</th>'
;
break
;
case
2
:
html
+=
'<th>活动价</th>'
;
break
;
...
@@ -344,7 +344,7 @@
...
@@ -344,7 +344,7 @@
html
+=
'<tr>'
;
html
+=
'<tr>'
;
if
(
i
==
0
)
{
if
(
i
==
0
)
{
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
}
else
{
}
else
{
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
...
@@ -354,7 +354,7 @@
...
@@ -354,7 +354,7 @@
html
+=
'<td>$<span class="goods-min-price-us">'
+
data
.
tiered
[
i
][
'price_us'
]
+
'</span></td>'
;
html
+=
'<td>$<span class="goods-min-price-us">'
+
data
.
tiered
[
i
][
'price_us'
]
+
'</span></td>'
;
}
}
}
else
{
}
else
{
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
}
else
{
}
else
{
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
...
...
public/js/goods.js
View file @
810c077c
...
@@ -243,7 +243,7 @@
...
@@ -243,7 +243,7 @@
html
+=
'<tr><th>阶梯</th><th>RMB价格</th>'
;
html
+=
'<tr><th>阶梯</th><th>RMB价格</th>'
;
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
// ac_type = 5 为新客价，目前后台不展示新客价
switch
(
data
.
ac_type
)
{
switch
(
data
.
ac_type
)
{
case
1
:
html
+=
'<th>限时限量</th>'
;
break
;
case
1
:
html
+=
'<th>限时限量</th>'
;
break
;
case
2
:
html
+=
'<th>活动价</th>'
;
break
;
case
2
:
html
+=
'<th>活动价</th>'
;
break
;
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
html
+=
'<tr>'
;
html
+=
'<tr>'
;
if
(
i
==
0
)
{
if
(
i
==
0
)
{
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
}
else
{
}
else
{
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
html
+=
'<td><span class="goods-min-num">'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="goods-min-price">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
...
@@ -272,7 +272,7 @@
...
@@ -272,7 +272,7 @@
html
+=
'<td>$<span class="goods-min-price-us">'
+
data
.
tiered
[
i
][
'price_us'
]
+
'</span></td>'
;
html
+=
'<td>$<span class="goods-min-price-us">'
+
data
.
tiered
[
i
][
'price_us'
]
+
'</span></td>'
;
}
}
}
else
{
}
else
{
if
(
data
.
ac_type
)
{
if
(
data
.
ac_type
&&
data
.
ac_type
!=
5
)
{
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span class="price-line">'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_ac'
]
+
'</span></td>'
;
}
else
{
}
else
{
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
html
+=
'<td><span>'
+
data
.
tiered
[
i
][
'purchases'
]
+
'</span></td><td>￥<span>'
+
data
.
tiered
[
i
][
'price_cn'
]
+
'</span></td>'
;
...
...
public/js/order.js
View file @
810c077c
...
@@ -77,6 +77,7 @@
...
@@ -77,6 +77,7 @@
order_sn
=
$
(
'input[name=order_sn]'
).
val
(),
order_sn
=
$
(
'input[name=order_sn]'
).
val
(),
erp_sn
=
$
(
'input[name=erp_sn]'
).
val
(),
erp_sn
=
$
(
'input[name=erp_sn]'
).
val
(),
goods_name
=
$
(
'input[name=goods_name]'
).
val
(),
goods_name
=
$
(
'input[name=goods_name]'
).
val
(),
select_time_type
=
$
(
'#select_time_type'
).
data
(
'default'
),
time_start
=
$
(
'input[name="time_start"]'
).
val
(),
time_start
=
$
(
'input[name="time_start"]'
).
val
(),
time_end
=
$
(
'input[name="time_end"]'
).
val
(),
time_end
=
$
(
'input[name="time_end"]'
).
val
(),
// order_type_a = $('#order_type_a').data('default'),
// order_type_a = $('#order_type_a').data('default'),
...
@@ -144,6 +145,10 @@
...
@@ -144,6 +145,10 @@
listUrl
+=
'&goods_name='
+
specialStr
(
goods_name
);
listUrl
+=
'&goods_name='
+
specialStr
(
goods_name
);
}
}
if
(
select_time_type
)
{
listUrl
+=
'&select_time_type='
+
select_time_type
;
}
if
(
time_start
){
if
(
time_start
){
time_start
=
Date
.
parse
(
time_start
)
/
1000
;
time_start
=
Date
.
parse
(
time_start
)
/
1000
;
...
...
resources/views/selfOrder/content.blade.php
View file @
810c077c
...
@@ -44,11 +44,22 @@
...
@@ -44,11 +44,22 @@
</dd>
</dd>
</dl>
</dl>
<dl>
<dl>
<dt>
创建日期：
</dt>
<dd
style=
"width: 110px;"
>
<dd
style=
"width:auto !important;"
>
<div
class=
"droplist"
data-default=
"{{$condition['select_time_type']}}"
id=
"select_time_type"
name=
"select_time_type"
>
<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"
/>
<ul
class=
"dropdown-menu"
>
<li
class=
"select_time_type_tab active"
data-val=
""
>
创建日期
</li>
<li
class=
"select_time_type_tab"
data-val=
"1"
>
审核日期
</li>
<li
class=
"select_time_type_tab"
data-val=
"2"
>
收款日期
</li>
<li
class=
"select_time_type_tab"
data-val=
"3"
>
发货日期
</li>
<li
class=
"select_time_type_tab"
data-val=
"4"
>
订单完成
</li>
</ul>
</div>
</dd>
</dd>
<dd
style=
"width:auto !important;"
>
<!-- <dt>创建日期： </dt> -->
<dd
style=
"width: 120px;"
>
<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"
style=
"width: 140px;"
/>
</dd>
<dd
style=
"width: 120px; margin-left: 20px;"
>
<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"
/>
<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>
</dd>
</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
