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
6844c718
authored
Jun 03, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整详情页样式
parent
3ca14ee6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
276 additions
and
148 deletions
app/Http/Controllers/OrderController.php
public/js/change_order.js
public/js/order_send_email.js
resources/views/changeOrder/content.blade.php
resources/views/detail/content.blade.php
resources/views/detail/detail_address_info.php
resources/views/detail/detail_base_info.blade.php
resources/views/detail/detail_invoice_address_info.php
resources/views/detail/detail_multi_info.php
resources/views/detail/js.blade.php
resources/views/orderlist/content.blade.php
resources/views/orderlist/js.blade.php
app/Http/Controllers/OrderController.php
View file @
6844c718
...
@@ -493,7 +493,11 @@ Class OrderController extends Controller
...
@@ -493,7 +493,11 @@ Class OrderController extends Controller
$perm
=
new
PermController
;
$perm
=
new
PermController
;
$sale_list
=
$perm
->
getUserByDepartmentId
(
Config
(
'perm_args.sales_department_id'
));
// 获取所有的销售
$sale_list
=
$perm
->
getUserByDepartmentId
(
Config
(
'perm_args.sales_department_id'
));
// 获取所有的销售
if
(
$tid
==
2
)
{
if
(
$tid
==
1
)
{
$info
[
'buyers'
]
=
$perm
->
getUserByCondition
(
''
,
39
);
// 获取采购员, ID - 39
$all_sales
=
$perm
->
getUserByDepartmentId
(
Config
(
'perm_args.sales_department_id'
),
0
);
// 获取所有在职的销售
$info
[
'cc_sales'
]
=
$all_sales
?
array_merge
(
$info
[
'buyers'
],
$all_sales
)
:
$info
[
'buyers'
];
}
else
{
$admin
=
(
object
)
array
(
'userId'
=>
1000
,
'name'
=>
'admin'
,
'status'
=>
0
);
$admin
=
(
object
)
array
(
'userId'
=>
1000
,
'name'
=>
'admin'
,
'status'
=>
0
);
array_unshift
(
$sale_list
,
$admin
);
array_unshift
(
$sale_list
,
$admin
);
}
}
...
@@ -684,7 +688,7 @@ Class OrderController extends Controller
...
@@ -684,7 +688,7 @@ Class OrderController extends Controller
public
function
templateData
(
Request
$request
,
$id
,
$view_id
)
public
function
templateData
(
Request
$request
,
$id
,
$view_id
)
{
{
$info
=
$this
->
orderDetail
(
$request
,
$id
);
$info
=
$this
->
orderDetail
(
$request
,
$id
);
$this
->
pageHeader
(
$request
,
$info
,
'订单详情'
);
$this
->
pageHeader
(
$request
,
$info
,
'订单详情'
);
if
(
$info
[
'order_info'
][
'order_goods_type'
]
==
2
&&
in_array
(
$info
[
'order_info'
][
'order_type'
],
[
1
,
3
]))
{
// 平台自营订单
if
(
$info
[
'order_info'
][
'order_goods_type'
]
==
2
&&
in_array
(
$info
[
'order_info'
][
'order_type'
],
[
1
,
3
]))
{
// 平台自营订单
...
...
public/js/change_order.js
View file @
6844c718
...
@@ -593,7 +593,8 @@
...
@@ -593,7 +593,8 @@
// 临时保存
// 临时保存
$
(
'.tempSave'
).
click
(
function
()
{
$
(
'.tempSave'
).
click
(
function
()
{
var
datax
=
$
(
'#checkOrderForm'
).
serialize
()
+
'&is_temp_save=1'
;
var
order_id
=
$
(
'input[name=order_id]'
).
val
();
var
datax
=
$
(
'#checkOrderForm'
).
serialize
()
+
'&is_temp_save=1'
;
// 弹出提示
// 弹出提示
layer
.
open
({
layer
.
open
({
...
@@ -611,7 +612,7 @@
...
@@ -611,7 +612,7 @@
if
(
resp
.
errcode
===
0
){
if
(
resp
.
errcode
===
0
){
layer
.
msg
(
resp
.
errmsg
||
'操作成功'
);
layer
.
msg
(
resp
.
errmsg
||
'操作成功'
);
setTimeout
(
function
(){
setTimeout
(
function
(){
location
.
reload
()
;
location
.
href
=
'/details/'
+
order_id
;
;
},
1000
);
},
1000
);
}
else
{
}
else
{
layer
.
alert
(
resp
.
errmsg
||
'网络异常'
,
function
()
{
layer
.
alert
(
resp
.
errmsg
||
'网络异常'
,
function
()
{
...
...
public/js/order_send_email.js
0 → 100644
View file @
6844c718
+
(
function
(
$
){
$
.
lie
=
$
.
lie
||
{
version
:
"v1.0.0"
};
$
.
extend
(
$
.
lie
,
{
send_mail
:
{
index
:
function
()
{
// 发送邮件
$
(
document
).
on
(
'click'
,
'.send_mail'
,
function
(
data
){
var
order_id
=
$
(
this
).
data
(
'id'
);
var
cc_sales_count
=
cc_sales
.
length
;
var
html
=
''
;
for
(
var
i
=
0
;
i
<
cc_sales_count
;
i
++
)
{
html
+=
'<option value="'
+
cc_sales
[
i
].
userId
+
'">'
+
cc_sales
[
i
].
name
+
'</option>'
;
}
var
content
=
'<div class="form-group">\
<label class="col-sm-4 control-label">是否有额外的抄送人员?</label>\
<div class="col-sm-8">\
<select id="cc_email" name="cc_email" class="form-control cc_email selectpicker" data-live-search="true" data-size="7" title="全部" multiple>\
'
+
html
+
'\
</select>\
</div>\
</div>\
<p style="padding-top: 50px;"><i class="error"> * </i>若无额外抄送人,直接点击‘确认’按钮即可</p>'
;
layer
.
open
({
area
:
[
'600px'
,
'200px'
],
title
:
'邮件抄送'
,
content
:
content
,
btn
:[
'确认'
,
'取消'
],
//提交事件
btn1
:
function
(){
var
cc_email
=
$
(
'#cc_email'
).
val
();
$
.
ajax
({
url
:
'/send_mail'
,
data
:
{
id
:
order_id
,
cc_email
:
cc_email
},
type
:
'post'
,
dataType
:
'json'
,
success
:
function
(
resp
){
if
(
resp
.
errcode
==
0
){
layer
.
msg
(
resp
.
errmsg
||
'操作成功'
);
setTimeout
(
function
(){
location
.
reload
();
},
1000
);
return
false
;
}
else
{
layer
.
alert
(
resp
.
errmsg
||
'网络异常'
);
}
},
error
:
function
(){
layer
.
alert
(
'网络异常'
);
}
});
},
btn2
:
function
(
index
){
layer
.
close
(
index
);
}
});
$
(
".cc_email"
).
selectpicker
({
actionsBox
:
true
,
//在下拉选项添加选中所有和取消选中的按钮
countSelectedText
:
"已选中{0}项"
,
selectedTextFormat
:
"count > 5"
,
selectAllText
:
'全选'
,
deselectAllText
:
'取消全选'
,
})
$
(
'.layui-layer-content'
).
css
(
'overflow'
,
'visible'
);
})
},
}
})
})(
jQuery
)
\ No newline at end of file
resources/views/changeOrder/content.blade.php
View file @
6844c718
...
@@ -128,33 +128,7 @@
...
@@ -128,33 +128,7 @@
@if ($order_info['order_goods_type'] == 1)
@if ($order_info['order_goods_type'] == 1)
<a
class=
"btn btn-primary add_goods_no_skuid"
data-type=
"{{ $order_info['order_goods_type'] }}"
style=
"float: right; margin-bottom: 5px; margin-right: 5px;"
>
新增无SKUID
</a>
<a
class=
"btn btn-primary add_goods_no_skuid"
data-type=
"{{ $order_info['order_goods_type'] }}"
style=
"float: right; margin-bottom: 5px; margin-right: 5px;"
>
新增无SKUID
</a>
@endif
@endif
</div>
</div>
<!-- 审核 -->
<table
class=
"table table-bordered table-hover check-table"
>
@if ($order_info['order_goods_type'] == 1)
<tr>
<td
class=
"check-table-title"
width=
"20%"
>
付款类型:
</td>
<td
class=
"check-select"
>
<label><input
class=
"order_all_pay"
type=
"radio"
name=
"order_pay_type"
value=
"1"
>
全额付款
</label>
<!-- 销售类型为现卖时展示 -->
@if ($order_info['sale_type'] == 1)
<label><input
class=
"order_advance_pay"
type=
"radio"
name=
"order_pay_type"
value=
"2"
>
预付首款
</label>
<label><input
class=
"order_account_period"
type=
"radio"
name=
"order_pay_type"
value=
"3"
>
账期
</label>
<!-- <label><input class="order_cod" type="radio" name="order_pay_type" value="4">货到猎芯付款</label> -->
@endif
</td>
</tr>
@else
<tr>
<td
class=
"check-table-title"
width=
"20%"
>
付款类型:
</td>
<td
class=
"check-select"
>
<label><input
class=
"order_all_pay"
type=
"radio"
name=
"order_pay_type"
value=
"1"
>
全额付款
</label>
<label><input
class=
"order_account_period"
type=
"radio"
name=
"order_pay_type"
value=
"3"
>
账期
</label>
</td>
</tr>
@endif
</table>
<!-- 调价 -->
<!-- 调价 -->
<table
class=
"table table-bordered table-hover order-change-table"
>
<table
class=
"table table-bordered table-hover order-change-table"
>
...
@@ -294,6 +268,31 @@
...
@@ -294,6 +268,31 @@
@endif
@endif
<hr/>
<hr/>
<table
class=
"table table-bordered table-hover check-table"
>
@if ($order_info['order_goods_type'] == 1)
<tr>
<td
class=
"check-table-title"
width=
"20%"
>
付款类型:
</td>
<td
class=
"check-select"
>
<label><input
class=
"order_all_pay"
type=
"radio"
name=
"order_pay_type"
value=
"1"
>
全额付款
</label>
<!-- 销售类型为现卖时展示 -->
@if ($order_info['sale_type'] == 1)
<label><input
class=
"order_advance_pay"
type=
"radio"
name=
"order_pay_type"
value=
"2"
>
预付首款
</label>
<label><input
class=
"order_account_period"
type=
"radio"
name=
"order_pay_type"
value=
"3"
>
账期
</label>
<!-- <label><input class="order_cod" type="radio" name="order_pay_type" value="4">货到猎芯付款</label> -->
@endif
</td>
</tr>
@else
<tr>
<td
class=
"check-table-title"
width=
"20%"
>
付款类型:
</td>
<td
class=
"check-select"
>
<label><input
class=
"order_all_pay"
type=
"radio"
name=
"order_pay_type"
value=
"1"
>
全额付款
</label>
<label><input
class=
"order_account_period"
type=
"radio"
name=
"order_pay_type"
value=
"3"
>
账期
</label>
</td>
</tr>
@endif
</table>
<table
class=
"table table-bordered table-hover"
>
<table
class=
"table table-bordered table-hover"
>
<tr>
<tr>
<th
width=
"20%"
>
商品总金额
</th>
<th
width=
"20%"
>
商品总金额
</th>
...
@@ -381,11 +380,11 @@
...
@@ -381,11 +380,11 @@
<div
class=
"text-center"
style=
"margin-top: 20px;"
>
<div
class=
"text-center"
style=
"margin-top: 20px;"
>
@if ($order_temp_info['temp_save_info'])
@if ($order_temp_info['temp_save_info'])
<a
class=
"btn btn-primary viewTempSave"
style=
"margin-right: 20px;"
>
查看临时保存
</a>
<a
class=
"btn btn-primary viewTempSave"
style=
"margin-right: 20px;"
>
变更历史
</a>
@endif
@endif
@if ($order_info['order_goods_type'] == 1)
@if ($order_info['order_goods_type'] == 1)
<a
class=
"btn btn-info tempSave"
style=
"margin-right: 20px;"
>
临时
保存
</a>
<a
class=
"btn btn-info tempSave"
style=
"margin-right: 20px;"
>
保存
</a>
@endif
@endif
@if ($order_info['order_goods_type'] == 2
&&
$order_temp_info['status'] == 1)
@if ($order_info['order_goods_type'] == 2
&&
$order_temp_info['status'] == 1)
...
...
resources/views/detail/content.blade.php
View file @
6844c718
...
@@ -19,6 +19,17 @@
...
@@ -19,6 +19,17 @@
<div
class=
"tabs-box table-responsive"
>
<div
class=
"tabs-box table-responsive"
>
@include('detail.detail_base_info')
@include('detail.detail_base_info')
</div>
</div>
<div>
<div
class=
"tabs-box table-responsive"
style=
"float:left; width: 50%;"
>
@include('detail.detail_address_info')
</div>
<div
class=
"tabs-box table-responsive"
style=
"float:right; width: 50%;"
>
@include('detail.detail_invoice_address_info')
</div>
</div>
<?php
<?php
if
(
$order_temp_info
[
'contract_com_name'
])
{
if
(
$order_temp_info
[
'contract_com_name'
])
{
...
@@ -160,7 +171,7 @@
...
@@ -160,7 +171,7 @@
<!-- 判断邮件发送时机 -->
<!-- 判断邮件发送时机 -->
@if (!empty($order_temp_info['erp_sn']) )
@if (!empty($order_temp_info['erp_sn']) )
<a
class=
"btn btn-primary send_mail"
>
发送邮件
</a>
<a
class=
"btn btn-primary send_mail"
data-id=
"{{ $order_info['order_id'] }}"
>
发送邮件
</a>
@endif
@endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
@if (in_array($order_info['status'], [2, 3])
&&
in_array('check_account', $userPerms))
@if (in_array($order_info['status'], [2, 3])
&&
in_array('check_account', $userPerms))
...
@@ -353,76 +364,13 @@
...
@@ -353,76 +364,13 @@
$
(
'.order_refund'
).
hide
();
$
(
'.order_refund'
).
hide
();
}
}
var
buyers
=
eval
(
'{!! isset($buyers) ? json_encode($buyers) : '' !!}'
);
// 采购员集合
var
buyers
=
eval
(
'{!! isset($buyers) ? json_encode($buyers) : '' !!}'
);
// 采购员集合
var
cc_sales
=
eval
(
'{!! isset($cc_sales) ? json_encode($cc_sales) : '' !!}'
);
// 抄送人集合
var
cc_sales
=
eval
(
'{!! isset($cc_sales) ? json_encode($cc_sales) : '' !!}'
);
// 抄送人集合
var
URL_api
=
'{{ Config("website.api_domain") }}'
;
var
URL_api
=
'{{ Config("website.api_domain") }}'
;
$
.
lie
.
order
.
details
();
$
.
lie
.
order
.
details
();
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
audit
.
index
();
$
.
lie
.
audit
.
index
();
$
.
lie
.
send_mail
.
index
();
// 发送邮件
$
(
document
).
on
(
'click'
,
'.send_mail'
,
function
(
data
){
var
cc_sales_count
=
cc_sales
.
length
;
var
html
=
''
;
for
(
var
i
=
0
;
i
<
cc_sales_count
;
i
++
)
{
html
+=
'
<
option
value
=
"'+cc_sales[i].userId+'"
>
'+cc_sales[i].name+'
<
/option>'
;
}
var
content
=
'
<
div
class
=
"form-group"
>\
<
label
class
=
"col-sm-4 control-label"
>
是否有额外的抄送人员?
<
/label>
\
<
div
class
=
"col-sm-8"
>\
<
select
id
=
"cc_email"
name
=
"cc_email"
class
=
"form-control cc_email selectpicker"
data
-
live
-
search
=
"true"
data
-
size
=
"7"
title
=
"全部"
multiple
>\
'+html+'
\
<
/select>
\
<
/div>
\
<
/div>
\
<
p
style
=
"padding-top: 50px;"
><
i
class
=
"error"
>
*
<
/i>若无额外抄送人,直接点击‘确认’按钮即可</
p
>
';
layer.open({
area: ['
600
px
', '
200
px
'],
title:'
邮件抄送
',
content: content,
btn:['
确认
', '
取消
'],
//提交事件
btn1:function(){
var id = "{{$order_info['
order_id
']}}";
var cc_email = $('
#
cc_email
').val();
$.ajax({
url: '
/
send_mail
',
data: {id: id, cc_email: cc_email},
type:'
post
',
dataType: '
json
',
success:function(resp){
if(resp.errcode == 0){
layer.msg(resp.errmsg || '
操作成功
');
setTimeout(function(){
location.reload();
}, 1000);
return false;
} else {
layer.alert(resp.errmsg || '
网络异常
');
}
},
error:function(){
layer.alert('
网络异常
');
}
});
},
btn2:function(index){
layer.close(index);
}
});
$(".cc_email").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
countSelectedText:"已选中{0}项",
selectedTextFormat:"count > 5",
selectAllText: '
全选
',
deselectAllText: '
取消全选
',
})
$('
.
layui
-
layer
-
content
').css('
overflow
', '
visible
'
);
})
</script>
</script>
\ No newline at end of file
resources/views/detail/detail_address_info.php
0 → 100644
View file @
6844c718
<div
style=
"width: 100%; height: 40px;"
>
<h3
style=
"float: left; width: 100px;"
>
收货信息
</h3>
<?php
// <!-- 订单状态小于5 且 更新地址权限存在 显示按钮 -->
if
(
!
$tags
)
{
if
(
in_array
(
$order_info
[
'status'
],
array
(
1
,
2
,
3
,
4
))
&&
in_array
(
'update_address'
,
$userPerms
))
{
echo
'<a href="/changeShipping/'
.
$order_info
[
'order_id'
]
.
'" class="btn btn-success btn-sm changeBtn">更改收货地址</a>'
;
}
}
elseif
(
isset
(
$tags
)
&&
$tags
==
'self'
)
{
if
(
in_array
(
$order_info
[
'status'
],
array
(
1
,
2
,
4
))
&&
in_array
(
'self_order_update_address'
,
$userPerms
))
{
echo
'<a href="/changeShipping/'
.
$order_info
[
'order_id'
]
.
'?tags='
.
$tags
.
'" class="btn btn-success btn-sm changeBtn">更改收货地址</a>'
;
}
}
?>
</div>
<table
class=
"table table-bordered"
>
<tr>
<th
width=
"15%"
>
收货人
</th>
<th
width=
"15%"
>
联系电话/手机
</th>
<th
width=
"10%"
>
配送方式
</th>
<?php
if
(
$order_info
[
'order_shipping_type'
]
==
2
)
{
?>
<th>
自提地址
</th>
<?php
}
else
{
?>
<th>
收货地址
</th>
<?php
}
?>
</tr>
<tr>
<td>
<?=
$order_address_info
[
'consignee'
]
?>
</td>
<td>
<?=
$order_address_info
[
'mobile'
]
?>
</td>
<?php
if
(
$order_info
[
'order_shipping_type'
]
==
2
)
{
?>
<td>
客户自提
</td>
<td>
<?=
$order_address_info
[
'address'
]
?>
</td>
<?php
}
else
{
?>
<td>
快递送货
</td>
<td>
<?=
$order_address_info
[
'province_val'
]
?>
<?=
$order_address_info
[
'city_val'
]
?>
<?=
$order_address_info
[
'district_val'
]
?>
<?=
$order_address_info
[
'address'
]
?>
</td>
<?php
}
?>
</tr>
</table>
resources/views/detail/detail_base_info.blade.php
View file @
6844c718
<table
class=
"table table-bordered order-express"
>
<table
class=
"table table-bordered order-express"
>
<tr>
<tr>
@if ($order_info['order_type_extend'])
<!--
@if ($order_info['order_type_extend'])
<th>订单类型</th>
<th>订单类型</th>
@endif
@endif
...
@@ -15,43 +15,24 @@
...
@@ -15,43 +15,24 @@
@if ($order_info['order_pay_type'] == 2)
@if ($order_info['order_pay_type'] == 2)
<th>预付款</th>
<th>预付款</th>
<th>尾款</th>
<th>尾款</th>
@endif
@endif
-->
<th>
交易状态
</th>
<th
width=
"5%"
>
订单编号
</th>
<th>
订单状态
</th>
<th>
用户账号
</th>
<th>
支付方式
</th>
<th>
支付方式
</th>
<th>
支付类型
</th>
<th>
支付状态
</th>
<th>
支付状态
</th>
<th>
支付时间
</th>
<th>
支付类型
</th>
<th>
发货状态
</th>
<th>
物流单号
</th>
<th>
京东订单编号
</th>
<th
width=
"8%"
>
自动确认收货时间
</th>
</tr>
</tr>
<tr>
<tr>
@if ($order_info['order_type_extend'])
<td>
{{ $order_info['order_sn'] }}
</td>
<td>
<?php
switch
(
$order_info
[
'order_type_extend'
])
{
case
1
:
echo
'团购订单'
;
break
;
}
?>
</td>
@endif
@if ($order_info['order_goods_type'] == 2)
<td>
{{ $order_info['sale_type'] == 1 ? '现卖' : '预售' }}
</td>
@endif
@if ($order_temp_info['business_type'])
<td>
{{ Config('params.business_type')[$order_temp_info['business_type']] }}
</td>
@endif
@if ($order_info['order_pay_type'] == 2)
<td>
{{$currency.$order_info['advance_amount']}}
</td>
<td>
{{$currency.number_format($order_info['order_amount'] - $order_info['advance_amount'], 2, '.', '')}}
</td>
@endif
<td>
{{ $order_temp_info['is_manager_audit'] ? '待主管审核' : Config('params.order_status')[$order_info['status']] }}
</td>
<td>
{{ $order_temp_info['is_manager_audit'] ? '待主管审核' : Config('params.order_status')[$order_info['status']] }}
</td>
<td>
{{ $user_info['mobile'] ? $user_info['mobile'] : $user_info['email'] }}
</td>
<td>
<td>
<?php
<?php
if
(
$order_info
[
'order_pay_type'
]
==
2
)
{
// 预付款
if
(
$order_info
[
'order_pay_type'
]
==
2
)
{
// 预付款
...
@@ -71,7 +52,25 @@
...
@@ -71,7 +52,25 @@
}
}
?>
?>
</td>
</td>
<td>
<?php
if
(
$order_info
[
'order_pay_type'
]
==
2
)
{
if
(
isset
(
$order_pay_log
[
1
])
&&
$order_pay_log
[
1
][
'is_paid'
]
!=
''
)
{
echo
$order_pay_log
[
1
][
'is_paid'
]
==
1
?
'尾款已支付'
:
'未支付'
;
}
else
if
(
!
empty
(
$order_pay_log
)
&&
$order_pay_log
[
0
][
'is_paid'
]
!=
''
)
{
echo
$order_pay_log
[
0
][
'is_paid'
]
==
1
?
'首款已支付'
:
'未支付'
;
}
else
{
echo
'--'
;
}
}
else
{
if
(
!
empty
(
$order_pay_log
)
&&
$order_pay_log
[
0
][
'is_paid'
]
!=
''
)
{
echo
$order_pay_log
[
0
][
'is_paid'
]
==
1
?
'已支付'
:
'未支付'
;
}
else
{
echo
'--'
;
}
}
?>
</td>
<td>
<td>
<?php
<?php
if
(
$order_info
[
'order_pay_type'
]
==
1
)
{
if
(
$order_info
[
'order_pay_type'
]
==
1
)
{
...
@@ -97,27 +96,53 @@
...
@@ -97,27 +96,53 @@
}
}
?>
?>
</td>
</td>
<td>
<td>
<?php
<?php
if
(
$order_info
[
'order_pay_type'
]
==
2
)
{
if
(
$order_shipping_info
)
{
if
(
isset
(
$order_pay_log
[
1
])
&&
$order_pay_log
[
1
][
'is_paid'
]
!=
''
)
{
switch
(
$order_shipping_info
[
'status'
])
{
echo
$order_pay_log
[
1
][
'is_paid'
]
==
1
?
'尾款已支付'
:
'未支付'
;
case
-
1
:
echo
'未配送'
;
break
;
}
else
if
(
!
empty
(
$order_pay_log
)
&&
$order_pay_log
[
0
][
'is_paid'
]
!=
''
)
{
case
1
:
echo
'配送中'
;
break
;
echo
$order_pay_log
[
0
][
'is_paid'
]
==
1
?
'首款已支付'
:
'未支付'
;
case
2
:
echo
'已签'
;
break
;
}
else
{
default
:
echo
'未知'
;
break
;
echo
'--'
;
}
}
}
else
{
}
else
{
if
(
!
empty
(
$order_pay_log
)
&&
$order_pay_log
[
0
][
'is_paid'
]
!=
''
)
{
echo
'未发货'
;
echo
$order_pay_log
[
0
][
'is_paid'
]
==
1
?
'已支付'
:
'未支付'
;
}
else
{
echo
'--'
;
}
}
}
?>
?>
</td>
</td>
<td>
{{ $order_shipping_info ? $order_shipping_info['shipping_no'] : '无' }}
</td>
<td>
{{ $order_temp_info['jd_order_id'] }}
</td>
<td>
7天
</td>
<!--
@if ($order_info['order_type_extend'])
<td>
<?php
switch
(
$order_info
[
'order_type_extend'
])
{
case
1
:
echo
'团购订单'
;
break
;
}
?>
</td>
@endif
@if ($order_info['order_goods_type'] == 2)
<td>{{ $order_info['sale_type'] == 1 ? '现卖' : '预售' }}</td>
@endif
@if ($order_temp_info['business_type'])
<td>{{ Config('params.business_type')[$order_temp_info['business_type']] }}</td>
@endif
@if ($order_info['order_pay_type'] == 2)
<td>{{$currency.$order_info['advance_amount']}}</td>
<td>
{{$currency.number_format($order_info['order_amount'] - $order_info['advance_amount'], 2, '.', '')}}
</td>
@endif
<td>
{{ $order_info['pay_time'] ? date('Y-m-d H:i:s', $order_info['pay_time']) : '' }}
</td>
<td>{{ $order_info['pay_time'] ? date('Y-m-d H:i:s', $order_info['pay_time']) : '' }}</td>
-->
</tr>
</tr>
</table>
</table>
\ No newline at end of file
resources/views/detail/detail_invoice_address_info.php
0 → 100644
View file @
6844c718
<div
style=
"width: 100%; height: 40px;"
>
<h3
style=
"float: left; width: 100px;"
>
发票收货信息
</h3>
</div>
<table
class=
"table table-bordered"
>
<tr>
<th
width=
"15%"
>
收票人
</th>
<th
width=
"15%"
>
联系电话/手机
</th>
<th>
收票地址
</th>
</tr>
<tr>
<td>
<?=
$order_invoice_address_info
[
'consignee'
]
?>
</td>
<td>
<?=
$order_invoice_address_info
[
'mobile'
]
?>
</td>
<td>
<?=
$order_invoice_address_info
[
'province_val'
]
?>
<?=
$order_invoice_address_info
[
'city_val'
]
?>
<?=
$order_invoice_address_info
[
'district_val'
]
?>
<?=
$order_invoice_address_info
[
'address'
]
?>
</td>
</tr>
</table>
\ No newline at end of file
resources/views/detail/detail_multi_info.php
View file @
6844c718
This diff is collapsed.
Click to expand it.
resources/views/detail/js.blade.php
View file @
6844c718
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<script
src=
"/js/order_audit.js"
></script>
<script
src=
"/js/order_audit.js"
></script>
<script
src=
"/js/order_track.js"
></script>
<script
src=
"/js/order_track.js"
></script>
<script
src=
"/js/order_cancel.js"
></script>
<script
src=
"/js/order_cancel.js"
></script>
<script
src=
"/js/order_send_email.js"
></script>
<script
src=
"/js/refund.js?v=
<?=
time
()
?>
"
></script>
<script
src=
"/js/refund.js?v=
<?=
time
()
?>
"
></script>
resources/views/orderlist/content.blade.php
View file @
6844c718
...
@@ -329,7 +329,7 @@
...
@@ -329,7 +329,7 @@
<td
class=
"show-list"
>
{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}
</td>
<td
class=
"show-list"
>
{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}
</td>
<td>
<td>
<div
class=
"btn-group btn-group-xs"
style=
"width: 2
4
0px;"
>
<div
class=
"btn-group btn-group-xs"
style=
"width: 2
6
0px;"
>
<a
class=
"btn btn-primary"
href=
"{{URL('details', ['order_id'=>$v['order_id']])}}"
target=
"_blank"
>
详情
</a>
<a
class=
"btn btn-primary"
href=
"{{URL('details', ['order_id'=>$v['order_id']])}}"
target=
"_blank"
>
详情
</a>
@if (in_array('check_order', $userPerms)
&&
$v['sale_id'])
@if (in_array('check_order', $userPerms)
&&
$v['sale_id'])
...
@@ -344,6 +344,10 @@
...
@@ -344,6 +344,10 @@
@if ($order_extend->is_manager_audit
&&
in_array($role, [1, 2])
&&
$v['status'] == 1)
@if ($order_extend->is_manager_audit
&&
in_array($role, [1, 2])
&&
$v['status'] == 1)
<a
class=
"btn btn-danger manager-audit"
data-id=
"{{$v['order_id']}}"
>
主管审核
</a>
<a
class=
"btn btn-danger manager-audit"
data-id=
"{{$v['order_id']}}"
>
主管审核
</a>
@endif
@endif
@if (!empty($order_extend->erp_sn))
<a
class=
"btn btn-primary send_mail"
data-id=
"{{ $v['order_id'] }}"
>
发送邮件
</a>
@endif
<!-- 管理员和经理或有推送权限显示 -->
<!-- 管理员和经理或有推送权限显示 -->
@if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))
@if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))
...
@@ -424,6 +428,7 @@
...
@@ -424,6 +428,7 @@
var
erp_order_id
=
"{{$condition['erp_order_id']}}"
;
var
erp_order_id
=
"{{$condition['erp_order_id']}}"
;
var
is_new_order
=
"{{$condition['is_new_order']}}"
;
var
is_new_order
=
"{{$condition['is_new_order']}}"
;
var
manager
=
"{{$role}}"
;
var
manager
=
"{{$role}}"
;
var
cc_sales
=
eval
(
'{!! isset($cc_sales) ? json_encode($cc_sales) : '' !!}'
);
// 抄送人集合
if
(
test_order
)
{
if
(
test_order
)
{
$
(
'input[name=test_order]'
).
attr
(
'checked'
,
true
);
$
(
'input[name=test_order]'
).
attr
(
'checked'
,
true
);
...
@@ -452,6 +457,7 @@
...
@@ -452,6 +457,7 @@
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
track
.
orderTrack
();
$
.
lie
.
cancel
.
cancelorder
();
$
.
lie
.
cancel
.
cancelorder
();
$
.
lie
.
audit
.
index
();
$
.
lie
.
audit
.
index
();
$
.
lie
.
send_mail
.
index
();
// 展开菜单
// 展开菜单
$
(
'#side-menu'
).
children
(
'li'
).
eq
(
1
).
addClass
(
'active'
);
$
(
'#side-menu'
).
children
(
'li'
).
eq
(
1
).
addClass
(
'active'
);
...
...
resources/views/orderlist/js.blade.php
View file @
6844c718
...
@@ -14,5 +14,6 @@
...
@@ -14,5 +14,6 @@
<script
src=
"/js/order_audit.js"
></script>
<script
src=
"/js/order_audit.js"
></script>
<script
src=
"/js/order_track.js"
></script>
<script
src=
"/js/order_track.js"
></script>
<script
src=
"/js/order_cancel.js"
></script>
<script
src=
"/js/order_cancel.js"
></script>
<script
src=
"/js/order_send_email.js"
></script>
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