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
aaaf5c4f
Commit
aaaf5c4f
authored
Nov 07, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复报价单佣金申请参数错误,打开后立即查询未读数
parent
cfdb8007
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
Navbar.vue
src/layout/components/Navbar.vue
+8
-5
Commossion.vue
src/views/ecw/offer/components/Commossion.vue
+5
-5
Discount.vue
src/views/ecw/order/special/Discount.vue
+1
-1
No files found.
src/layout/components/Navbar.vue
View file @
aaaf5c4f
...
@@ -87,10 +87,10 @@ export default {
...
@@ -87,10 +87,10 @@ export default {
}
}
},
},
created
()
{
created
()
{
setInterval
(()
=>
{
this
.
updateMessage
()
this
.
$store
.
dispatch
(
'
getNotMessage
'
);
setInterval
(()
=>
{
this
.
$store
.
dispatch
(
'
getToDoList
'
);
this
.
updateMessage
()
},
10000
)
},
10000
)
},
},
components
:
{
components
:
{
Breadcrumb
,
Breadcrumb
,
...
@@ -139,7 +139,10 @@ export default {
...
@@ -139,7 +139,10 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
updateMessage
(){
this
.
$store
.
dispatch
(
'
getNotMessage
'
);
this
.
$store
.
dispatch
(
'
getToDoList
'
);
},
toggleSideBar
()
{
toggleSideBar
()
{
this
.
$store
.
dispatch
(
'
app/toggleSideBar
'
)
this
.
$store
.
dispatch
(
'
app/toggleSideBar
'
)
},
},
...
...
src/views/ecw/offer/components/Commossion.vue
View file @
aaaf5c4f
...
@@ -96,7 +96,7 @@ import { getProductTypeList } from '@/api/ecw/productType'
...
@@ -96,7 +96,7 @@ import { getProductTypeList } from '@/api/ecw/productType'
import
WorkFlow
from
'
@/components/WorkFlow
'
import
WorkFlow
from
'
@/components/WorkFlow
'
import
{
getDarkReturnCommission
}
from
'
@/api/ecw/customerCommission
'
import
{
getDarkReturnCommission
}
from
'
@/api/ecw/customerCommission
'
import
{
cancelProcessInstance
}
from
'
@/api/bpm/processInstance
'
import
{
cancelProcessInstance
}
from
'
@/api/bpm/processInstance
'
const
TYPE
=
3
export
default
{
export
default
{
name
:
"
Commossion
"
,
name
:
"
Commossion
"
,
props
:
{
props
:
{
...
@@ -128,7 +128,7 @@ export default {
...
@@ -128,7 +128,7 @@ export default {
productTypeList
:[],
productTypeList
:[],
ccIdArr
:
[],
ccIdArr
:
[],
form
:
{
form
:
{
type
:
2
type
:
TYPE
}
,
}
,
rules
:{
rules
:{
commissionType
:
{
required
:
true
,
message
:
'
请选择佣金类型
'
}
,
commissionType
:
{
required
:
true
,
message
:
'
请选择佣金类型
'
}
,
...
@@ -197,14 +197,14 @@ export default {
...
@@ -197,14 +197,14 @@ export default {
createOfferSpecial
(
Object
.
assign
({
createOfferSpecial
(
Object
.
assign
({
clearanceFreight
:
this
.
form
.
orgClearanceFreight
,
clearanceFreight
:
this
.
form
.
orgClearanceFreight
,
seaFreight
:
this
.
form
.
orgSeaFreight
seaFreight
:
this
.
form
.
orgSeaFreight
}
,
this
.
form
,
{
type
:
2
}
)).
then
(
res
=>
{
}
,
this
.
form
,
{
type
:
TYPE
}
)).
then
(
res
=>
{
this
.
$message
.
success
(
this
.
$t
(
'
提交成功
'
))
this
.
$message
.
success
(
this
.
$t
(
'
提交成功
'
))
this
.
$emit
(
'
success
'
)
this
.
$emit
(
'
success
'
)
}
)
}
)
}
)
}
)
}
,
}
,
getOfferSpecial
(){
getOfferSpecial
(){
getOfferSpecial
(
this
.
offerProd
.
offerProdId
,
{
type
:
2
}
).
then
(
r
=>
{
getOfferSpecial
(
this
.
offerProd
.
offerProdId
,
{
type
:
TYPE
}
).
then
(
r
=>
{
this
.
form
=
r
.
data
this
.
form
=
r
.
data
}
)
}
)
}
,
}
,
...
@@ -225,7 +225,7 @@ export default {
...
@@ -225,7 +225,7 @@ export default {
productAttr
:
this
.
offerProd
.
prodAttrIds
.
split
(
'
,
'
).
filter
(
item
=>
item
&&
item
!=
''
),
productAttr
:
this
.
offerProd
.
prodAttrIds
.
split
(
'
,
'
).
filter
(
item
=>
item
&&
item
!=
''
),
productType
:
this
.
offerProd
.
productType
,
productType
:
this
.
offerProd
.
productType
,
transportId
:
this
.
offer
.
transportId
,
transportId
:
this
.
offer
.
transportId
,
type
:
2
,
// 暗佣
type
:
2
,
}
).
then
(
res
=>
{
}
).
then
(
res
=>
{
this
.
darkCommission
=
res
.
data
?.
darkCommission
this
.
darkCommission
=
res
.
data
?.
darkCommission
}
)
}
)
...
...
src/views/ecw/order/special/Discount.vue
View file @
aaaf5c4f
...
@@ -78,7 +78,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
...
@@ -78,7 +78,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
import
{
getProductType
}
from
'
@/api/ecw/productType
'
import
{
getProductType
}
from
'
@/api/ecw/productType
'
import
{
cancelProcessInstance
}
from
'
@/api/bpm/processInstance
'
import
{
cancelProcessInstance
}
from
'
@/api/bpm/processInstance
'
import
WorkFlow
from
'
@/components/WorkFlow
'
import
WorkFlow
from
'
@/components/WorkFlow
'
console
.
log
({
cancelProcessInstance
}
)
export
default
{
export
default
{
name
:
"
OrderSpecialDiscount
"
,
name
:
"
OrderSpecialDiscount
"
,
props
:
{
props
:
{
...
...
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