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
eb921fa4
authored
Sep 18, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整样片审核
parent
b079a68d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
public/js/change_order.js
resources/views/changeOrder/content.blade.php
public/js/change_order.js
View file @
eb921fa4
...
@@ -514,7 +514,8 @@
...
@@ -514,7 +514,8 @@
}
}
}
}
if
(
!
is_manager
&&
order_goods_type
!=
1
)
{
// 非管理员或经理权限和非联营订单需要判断商品价格是否低于80%以下
// 非管理员或经理权限、非联营订单、非样片单 需要判断商品价格是否低于80%以下
if
(
!
is_manager
&&
order_goods_type
!=
1
&&
business_type
!=
1
)
{
// 设置默认值false
// 设置默认值false
$
(
'input[name=check_failed]'
).
val
(
0
);
$
(
'input[name=check_failed]'
).
val
(
0
);
$
(
'input[name=change_pay_type]'
).
val
(
0
);
$
(
'input[name=change_pay_type]'
).
val
(
0
);
...
...
resources/views/changeOrder/content.blade.php
View file @
eb921fa4
...
@@ -557,7 +557,6 @@
...
@@ -557,7 +557,6 @@
<script>
<script>
var
is_manager
=
"{{ in_array($role, [1, 2, 5]) ? true : false }}"
;
var
is_manager
=
"{{ in_array($role, [1, 2, 5]) ? true : false }}"
;
var
isNewClient
=
"{{isset($isNewClient) ? $isNewClient : 0}}"
;
var
isNewClient
=
"{{isset($isNewClient) ? $isNewClient : 0}}"
;
// var order_amount = "{{$order_info['order_amount']}}";
// var order_amount = "{{$order_info['order_amount']}}";
var
currency
=
"{{$order_info['currency']}}"
;
// 币种
var
currency
=
"{{$order_info['currency']}}"
;
// 币种
...
@@ -566,6 +565,7 @@
...
@@ -566,6 +565,7 @@
var
pay_preferential
=
"{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"
;
// 支付优惠(钱包)
var
pay_preferential
=
"{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"
;
// 支付优惠(钱包)
var
new_client_price
=
"{{ $order_price_info['new_client_price'] }}"
;
var
new_client_price
=
"{{ $order_price_info['new_client_price'] }}"
;
var
buyers
=
eval
(
'{!! isset($buyers) ? json_encode($buyers) : '' !!}'
);
// 采购员集合
var
buyers
=
eval
(
'{!! isset($buyers) ? json_encode($buyers) : '' !!}'
);
// 采购员集合
var
business_type
=
"{{$order_temp_info['business_type']}}"
;
// 明细数目
// 明细数目
var
item_count
=
"{{ count($order_items_info) }}"
;
var
item_count
=
"{{ count($order_items_info) }}"
;
...
...
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