Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
5fc2c845
Commit
5fc2c845
authored
Nov 10, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复两个bug
parent
b2b50e77
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
batchSingleApplication.vue
src/views/ecw/order/batchSingleApplication.vue
+1
-0
Commission.vue
src/views/ecw/order/special/Commission.vue
+9
-1
No files found.
src/views/ecw/order/batchSingleApplication.vue
View file @
5fc2c845
...
@@ -119,6 +119,7 @@
...
@@ -119,6 +119,7 @@
</div>
</div>
<div
style=
"text-align: center"
v-else
>
<div
style=
"text-align: center"
v-else
>
<el-button
@
click=
"()=>{
<el-button
@
click=
"()=>{
$emit('update:dialogVisible',false)
$router.push({path:'/bpm/process-instance/detail',query:{id:this.applyStatus.orderWarehouseApprovalBackVO.formId}})
$router.push({path:'/bpm/process-instance/detail',query:{id:this.applyStatus.orderWarehouseApprovalBackVO.formId}})
}"
>
{{$t('审核中')}}
</el-button>
}"
>
{{$t('审核中')}}
</el-button>
<el-button
@
click=
"cancellationOfOrder"
>
{{$t('取消审核')}}
</el-button>
<el-button
@
click=
"cancellationOfOrder"
>
{{$t('取消审核')}}
</el-button>
...
...
src/views/ecw/order/special/Commission.vue
View file @
5fc2c845
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
<
/el-form-item
>
<
/el-form-item
>
<!--
明佣
+
暗佣才显示
-->
<!--
明佣
+
暗佣才显示
-->
<
el
-
form
-
item
label
=
"
暗佣佣金
"
v
-
if
=
"
form.commissionType == 3
"
prop
=
"
shadeCommissionAmount
"
:
rules
=
"
{
type: 'number', max: originPrice.toNumber()
, message: '暗佣设置错误', trigger: 'blur'
}
"
>
<
el
-
form
-
item
label
=
"
暗佣佣金
"
v
-
if
=
"
form.commissionType == 3
"
prop
=
"
shadeCommissionAmount
"
:
rules
=
"
{
validator: shadeCommissionValidator
, message: '暗佣设置错误', trigger: 'blur'
}
"
>
<
el
-
input
v
-
model
=
"
form.shadeCommissionAmount
"
placeholder
=
""
type
=
"
number
"
class
=
"
w-100
"
><
/el-input
>
<
el
-
input
v
-
model
=
"
form.shadeCommissionAmount
"
placeholder
=
""
type
=
"
number
"
class
=
"
w-100
"
><
/el-input
>
{{
currencyMap
[
orderItem
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
orderItem
.
seaFreightVolume
]
}}
{{
currencyMap
[
orderItem
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
orderItem
.
seaFreightVolume
]
}}
<
/el-form-item
>
<
/el-form-item
>
...
@@ -124,7 +124,15 @@ export default {
...
@@ -124,7 +124,15 @@ export default {
WorkFlow
WorkFlow
}
,
}
,
data
()
{
data
()
{
let
shadeCommissionValidator
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
Number
(
value
))
return
callback
(
new
Error
(
'
请输入有效数字
'
))
let
reg
=
/
((
^
[
1-9
]\d
*
)
|^0
)(\.\d
*
)
{0,1
}
$/
;
if
(
!
reg
.
test
(
value
))
return
callback
(
new
Error
(
'
请输入有效数字
'
));
if
(
Number
(
value
)
>
this
.
originPrice
)
return
callback
(
new
Error
(
'
暗佣不能超过运费
'
))
callback
();
}
return
{
return
{
shadeCommissionValidator
,
applyType
:
3
,
// 1是优惠申请2是管理折扣3是佣金设置4是重货优惠5是泡货优惠
applyType
:
3
,
// 1是优惠申请2是管理折扣3是佣金设置4是重货优惠5是泡货优惠
unitList
:[],
unitList
:[],
currencyList
:[],
currencyList
:[],
...
...
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