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
325c8c1c
Commit
325c8c1c
authored
Sep 01, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator
into dev
parents
63c4fa1c
40f64694
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
380 additions
and
30 deletions
+380
-30
customer.js
src/api/ecw/customer.js
+8
-0
order.js
src/api/ecw/order.js
+27
-1
index.js
src/router/index.js
+14
-0
query.vue
src/views/ecw/customer/query.vue
+30
-2
index.vue
src/views/ecw/order/index.vue
+1
-1
discount.vue
src/views/ecw/order/special/discount.vue
+269
-0
index.vue
src/views/ecw/order/special/index.vue
+30
-25
transferWarehousing.vue
src/views/ecw/order/transferWarehousing.vue
+1
-1
No files found.
src/api/ecw/customer.js
View file @
325c8c1c
...
...
@@ -155,3 +155,11 @@ export function userMemberUserList(){
method
:
'
get
'
})
}
//查看某客户授权的品牌
export
function
getBrankByCustomer
(
data
){
return
request
({
url
:
'
/ecw/product-brank/getBrankByCustomer
'
,
method
:
'
post
'
,
data
,
})
}
src/api/ecw/order.js
View file @
325c8c1c
...
...
@@ -325,4 +325,30 @@ export function getApproval(id){
url
:
'
/order/approval/get?id=
'
+
id
,
method
:
'
get
'
})
}
\ No newline at end of file
}
// 特价申请
export
function
createOrderSpecial
(
data
)
{
return
request
({
url
:
'
/ecw/order/special/apply
'
,
method
:
'
put
'
,
data
:
data
})
}
// 获得订单特价申请详情
export
function
getOrderSpecial
(
offerProdId
,
type
=
1
)
{
return
request
({
url
:
'
/ecw/order/special/info/
'
+
offerProdId
+
'
/
'
+
type
,
method
:
'
get
'
})
}
// 根据订单项商品ID与审批类型获得订单商品的特价申请详情
export
function
getOrderSpecialByApproveId
(
approveId
)
{
return
request
({
url
:
'
/ecw/order/special/info?approveId=
'
+
approveId
,
method
:
'
get
'
})
}
src/router/index.js
View file @
325c8c1c
...
...
@@ -289,6 +289,20 @@ export const constantRoutes = [
hidden
:
true
,
redirect
:
'
noredirect
'
,
children
:
[
{
path
:
'
special/:orderId(
\\
d+)
'
,
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/order/special
'
),
props
:
true
,
name
:
'
order-special
'
,
meta
:
{
title
:
'
订单特价申请
'
,
icon
:
''
,
activeMenu
:
'
/order/index
'
}
},
{
path
:
'
discount/:offerProdId(
\\
d+)
'
,
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/order/special/discount
'
),
props
:
true
,
name
:
'
discount
'
,
meta
:
{
title
:
'
订单优惠申请
'
,
icon
:
''
,
activeMenu
:
'
/order/index
'
}
},
{
path
:
'
associated-order/:orderId(
\\
d+)
'
,
component
:
(
resolve
)
=>
require
([
'
@/views/ecw/order/associatedOrder
'
],
resolve
),
...
...
src/views/ecw/customer/query.vue
View file @
325c8c1c
...
...
@@ -159,7 +159,23 @@
<
/el-tab-pane
>
<
el
-
tab
-
pane
label
=
"
品牌授权
"
>
<
el
-
table
border
style
=
"
width:100%
"
:
data
=
"
brandAuthorizationList
"
>
<
el
-
table
-
column
type
=
"
index
"
prop
=
"
序号
"
><
/el-table-column
>
<
el
-
table
-
column
label
=
"
中文标题
"
prop
=
"
titleZh
"
><
/el-table-column
>
<
el
-
table
-
column
prop
=
"
titleEn
"
label
=
"
英文标题
"
><
/el-table-column
>
<
el
-
table
-
column
label
=
"
有无备案
"
>
<
template
v
-
slot
=
"
{row
}
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BRAND_REG_TYPE
"
:
value
=
"
row.filing
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
创建时间
"
>
<
template
v
-
slot
=
"
{row
}
"
>
{{
parseTime
(
row
.
createTime
)
}}
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
pagination
v
-
show
=
"
brandAuthorizationTotal > 0
"
:
total
=
"
brandAuthorizationTotal
"
:
page
.
sync
=
"
brandAuthorizationFrom.pageNo
"
:
limit
.
sync
=
"
brandAuthorizationFrom.pageSize
"
@
pagination
=
"
getBrankByCustomerList
"
/>
<
/el-tab-pane
>
<
el
-
tab
-
pane
label
=
"
信用日志
"
>
...
...
@@ -175,7 +191,7 @@
<
/template
>
<
script
>
import
{
getCustomer
,
getCustomerSelect
}
from
'
@/api/ecw/customer
'
import
{
getCustomer
,
getCustomerSelect
,
getBrankByCustomer
}
from
'
@/api/ecw/customer
'
import
{
DICT_TYPE
,
getDictDataLabel
}
from
'
@/utils/dict
'
import
{
getProductTypeList
}
from
'
@/api/ecw/productType
'
import
{
getNodeList
}
from
'
@/api/ecw/node
'
...
...
@@ -215,6 +231,7 @@ export default {
listServiceUser
().
then
(
r
=>
{
this
.
serviceUserList
=
r
.
data
}
)
this
.
getBrankByCustomerList
()
}
,
data
()
{
return
{
...
...
@@ -263,6 +280,12 @@ export default {
weightUnit
:
undefined
,
createTime
:
undefined
}
,
brandAuthorizationFrom
:{
pageNo
:
1
,
pageSize
:
10
,
}
,
brandAuthorizationList
:[],
brandAuthorizationTotal
:
0
,
}
}
,
computed
:
{
...
...
@@ -283,6 +306,11 @@ export default {
id
()
{
return
this
.
customerId
?
parseInt
(
this
.
customerId
)
:
undefined
}
}
,
methods
:{
getBrankByCustomerList
(){
getBrankByCustomer
({...
this
.
brandAuthorizationFrom
,
customerId
:
this
.
id
}
).
then
(
r
=>
{
this
.
brandAuthorizationList
=
r
.
data
.
list
;
this
.
brandAuthorizationTotal
=
r
.
data
.
total
}
)
}
}
}
<
/script
>
...
...
src/views/ecw/order/index.vue
View file @
325c8c1c
...
...
@@ -173,7 +173,7 @@
<el-button
type=
"text"
size=
"mini"
@
click=
"orderId = scope.row.orderId;isShow = true"
>
特需
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"$router.push(`/order/associated-order/$
{scope.row.orderId}`)" >关联
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"$router.push(`/order/mutex-order/$
{scope.row.orderId}`)" >互斥
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"$router.push('/order/special
?id=
' + scope.row.orderId)"
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"$router.push('/order/special
/
' + scope.row.orderId)"
v-hasPermi=
"['ecw:order:update']"
>
特价
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"$router.push(`/order/release?orderId=$
{scope.row.orderId}`)">确认放货
</el-button>
...
...
src/views/ecw/order/special/discount.vue
0 → 100644
View file @
325c8c1c
This diff is collapsed.
Click to expand it.
src/views/ecw/order/special/index.vue
View file @
325c8c1c
...
...
@@ -3,11 +3,11 @@
<el-card>
<div
slot=
"header"
class=
"card-title"
>
申请特价
</div>
<!-- 列表 -->
<div
class=
"o
ff
er-header"
>
<span
style=
"font-size: 15px;"
>
订单号:
{{
o
ff
er
.
number
}}
</span>
<div
class=
"o
rd
er-header"
>
<span
style=
"font-size: 15px;"
>
订单号:
{{
o
rd
er
.
number
}}
</span>
</div>
<el-table
v-loading=
"loading"
:data=
"o
ffer.offerProdResp
VOList"
>
<el-table
v-loading=
"loading"
:data=
"o
rder.orderItem
VOList"
>
<el-table-column
label=
"序号"
align=
"center"
prop=
"id"
type=
"index"
></el-table-column>
<el-table-column
prop=
"prodTitleZh"
...
...
@@ -20,17 +20,22 @@
prop=
"prodAttrIds"
label=
"填单货物属性"
>
<
template
v-slot=
"{row}"
>
{{
getProductNamesByIds
(
row
.
prodAttrIds
)
}}
品牌:
{{
[
'
无牌
'
,
'
有牌
'
,
'
中性
'
][
row
.
brandType
]
}}
<br>
箱数:
{{
row
.
num
}}
<br>
体积:
{{
row
.
volume
}}
m³
<br>
重量:
{{
row
.
weight
}}
Kg
</
template
>
</el-table-column>
<el-table-column
prop=
"address"
label=
"入库货物属性"
>
<
template
v-slot=
"{row}"
>
品牌:
{{
row
.
brand
?
'
有
'
:
'
无
'
}}
<br>
箱数:
{{
row
.
num
}}
<br>
体积:
{{
row
.
volume
}}
m³
<br>
重量:
{{
row
.
weight
}}
Kg
<template
v-if=
"row.warehouseInInfoVO"
>
品牌:
{{
[
'
无牌
'
,
'
有牌
'
,
'
中性
'
][
row
.
brandType
]
}}
<br>
箱数:
{{
row
.
warehouseInInfoVO
.
cartonsNum
}}
<br>
体积:
{{
row
.
warehouseInInfoVO
.
volume
}}
m³
<br>
重量:
{{
row
.
warehouseInInfoVO
.
weight
}}
Kg
</
template
>
</template>
</el-table-column>
<el-table-column
...
...
@@ -64,18 +69,18 @@
清关费:
{{
row
.
clearanceFreight
}}
{{
currentMap
[
row
.
clearanceFreightCurrency
]
}}
/
{{
unitMap
[
row
.
clearanceFreightVolume
]
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"status"
:formatter=
"(v) => ['取消报价', '特价审批中', '需求确认(草稿)', '跟进中', '赢单', '输单', '报价完成', '审批通过', '审批拒绝'][v.status]"
label=
"审核状态"
>
</el-table-column
>
<!-- <el-table-column-->
<!-- prop="status"-->
<!-- :formatter="(v) => ['取消报价', '特价审批中', '需求确认(草稿)', '跟进中', '赢单', '输单', '报价完成', '审批通过', '审批拒绝'][v.status]"-->
<!-- label="审核状态">--
>
<!-- </el-table-column>--
>
<el-table-column
prop=
"address"
label=
"操作"
>
<
template
v-slot=
"{row}"
>
<el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:o
ffer:update']"
@
click=
"$router.push(`/offer/discount/$
{row.offerProdId}?offerId=${row.off
erId}`)">优惠申请
</el-button>
<
!--
<el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:offer:update']"
>
佣金规则
</el-button>
--
>
<
!--
<el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:offer:update']"
>
管理折扣
</el-button>
--
>
<el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:o
rder:update']"
@
click=
"$router.push(`/order/discount/$
{row.prodId}?orderId=${row.ord
erId}`)">优惠申请
</el-button>
<
el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:order:update']"
>
佣金规则
</el-button
>
<
el-button
size=
"mini"
type=
"text"
v-hasPermi=
"['ecw:order:update']"
>
管理折扣
</el-button
>
</
template
>
</el-table-column>
...
...
@@ -102,7 +107,7 @@ export default {
components
:
{
},
props
:
{
o
fferId
:
String
o
rderId
:
[
String
,
Number
]
},
data
()
{
return
{
...
...
@@ -116,14 +121,14 @@ export default {
params
:{
page
:
1
,
rows
:
20
,
o
ff
erId
:
0
,
o
rd
erId
:
0
,
type
:
2
},
relationId
:
0
,
creatorName
:
'
test
'
,
o
ff
er
:
{
o
rd
er
:
{
number
:
''
,
o
fferProdResp
VOList
:
[]
o
rderItem
VOList
:
[]
},
unitList
:[],
currencyList
:[],
...
...
@@ -131,8 +136,8 @@ export default {
};
},
created
()
{
if
(
this
.
o
ff
erId
){
this
.
params
.
o
fferId
=
this
.
off
erId
if
(
this
.
o
rd
erId
){
this
.
params
.
o
rderId
=
this
.
ord
erId
this
.
getOrder
()
}
getUnitList
().
then
(
res
=>
this
.
unitList
=
res
.
data
)
...
...
@@ -142,9 +147,9 @@ export default {
methods
:
{
getOrder
(){
this
.
loading
=
true
getOrder
(
this
.
o
ff
erId
).
then
(
response
=>
{
getOrder
(
this
.
o
rd
erId
).
then
(
response
=>
{
this
.
loading
=
false
this
.
o
ff
er
=
response
.
data
this
.
o
rd
er
=
response
.
data
})
},
getProductNamesByIds
(
ids
){
...
...
@@ -183,7 +188,7 @@ export default {
font-size
:
18px
;
font-weight
:
bold
;
}
.o
ff
er-header
{
.o
rd
er-header
{
padding-bottom
:
16px
;
display
:
flex
;
align-items
:
center
;
...
...
src/views/ecw/order/transferWarehousing.vue
View file @
325c8c1c
...
...
@@ -118,7 +118,7 @@
<div>
<el-button
v-if=
"type == 1"
@
click=
"submit"
>
确认出仓
</el-button>
<el-button
v-else
@
click=
"submit2"
>
确认到仓
</el-button>
<el-button
@
click=
"$
router.back(
)"
>
返回
</el-button>
<el-button
@
click=
"$
tab.closeOpenPage({path:'/order/order'}
)"
>
返回
</el-button>
</div>
</div>
</template>
...
...
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