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
40eb52de
Commit
40eb52de
authored
Sep 08, 2022
by
黄卓
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入仓 备案 收费模式
parent
4a06ee08
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
3 deletions
+34
-3
productBrank.js
src/api/ecw/productBrank.js
+9
-0
editDialog.vue
src/views/ecw/order/warehousing/components/editDialog.vue
+24
-2
index.vue
src/views/ecw/order/warehousing/index.vue
+1
-1
No files found.
src/api/ecw/productBrank.js
View file @
40eb52de
...
@@ -61,3 +61,12 @@ export function setUnauthCustomerFeeType(data) {
...
@@ -61,3 +61,12 @@ export function setUnauthCustomerFeeType(data) {
data
:
data
data
:
data
})
})
}
}
//
export
function
getFeeTypeByCustomerProduct
(
data
){
return
request
({
url
:
'
/ecw/product-brank/getFeeTypeByCustomerProduct
'
,
method
:
'
post
'
,
data
})
}
src/views/ecw/order/warehousing/components/editDialog.vue
View file @
40eb52de
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
v-else
v-model=
"form.brand"
v-else
v-model=
"form.brand"
placeholder=
"可修改"
placeholder=
"可修改"
filterable
filterable
@
change=
"handleBrandChange"
allow-create
>
allow-create
>
<el-option
<el-option
v-for=
"item in brandList"
v-for=
"item in brandList"
...
@@ -129,7 +130,7 @@
...
@@ -129,7 +130,7 @@
import
dictSelector
from
"
@/components/DictSelector
"
import
dictSelector
from
"
@/components/DictSelector
"
import
{
DICT_TYPE
,
getDictDataLabel
}
from
"
@/utils/dict
"
import
{
DICT_TYPE
,
getDictDataLabel
}
from
"
@/utils/dict
"
import
{
orderWarehouseIn
,
orderWarehouseInUpdateApply
}
from
'
@/api/ecw/order
'
import
{
orderWarehouseIn
,
orderWarehouseInUpdateApply
}
from
'
@/api/ecw/order
'
import
{
getProductBrankPage
}
from
"
@/api/ecw/productBrank
"
import
{
getFeeTypeByCustomerProduct
,
getProductBrankPage
}
from
'
@/api/ecw/productBrank
'
import
WorkFlow
from
"
@/components/WorkFlow
"
import
WorkFlow
from
"
@/components/WorkFlow
"
import
elSelect
from
'
@/components/render/slots/el-select
'
import
elSelect
from
'
@/components/render/slots/el-select
'
...
@@ -142,6 +143,10 @@ export default {
...
@@ -142,6 +143,10 @@ export default {
},
},
props
:
{
props
:
{
customerId
:
{
type
:
Number
,
default
:
undefined
},
visible
:
{
visible
:
{
type
:
Boolean
,
type
:
Boolean
,
default
:
false
default
:
false
...
@@ -208,7 +213,8 @@ export default {
...
@@ -208,7 +213,8 @@ export default {
"
prodTitleZh
"
:
""
,
"
prodTitleZh
"
:
""
,
"
prodType
"
:
0
,
"
prodType
"
:
0
,
"
type
"
:
0
,
"
type
"
:
0
,
feeType
:
0
feeType
:
0
,
recordMode
:
undefined
},
},
// orderItem: {},
// orderItem: {},
...
@@ -231,6 +237,7 @@ export default {
...
@@ -231,6 +237,7 @@ export default {
if
(
val
)
{
if
(
val
)
{
this
.
form
.
material
=
this
.
warehousing
.
material
this
.
form
.
material
=
this
.
warehousing
.
material
this
.
form
.
brand
=
this
.
warehousing
.
brand
this
.
form
.
brand
=
this
.
warehousing
.
brand
this
.
handleBrandChange
(
this
.
form
.
brand
)
}
else
{
}
else
{
this
.
$emit
(
'
update:visible
'
,
false
)
this
.
$emit
(
'
update:visible
'
,
false
)
}
}
...
@@ -238,6 +245,18 @@ export default {
...
@@ -238,6 +245,18 @@ export default {
},
},
methods
:
{
methods
:
{
handleBrandChange
(
v
){
getFeeTypeByCustomerProduct
({
brandId
:
parseInt
(
v
),
productId
:
this
.
warehousing
.
prodId
,
customerId
:
this
.
customerId
}).
then
(
r
=>
{
if
(
r
.
code
===
0
){
this
.
form
.
feeType
=
parseInt
(
r
.
data
.
feeType
)
this
.
form
.
recordMode
=
parseInt
(
r
.
data
.
recordMode
)
}
})
},
handleVolume
(
index
){
handleVolume
(
index
){
const
{
boxGauge1
,
boxGauge2
,
boxGauge3
}
=
this
.
tableData
[
index
]
const
{
boxGauge1
,
boxGauge2
,
boxGauge3
}
=
this
.
tableData
[
index
]
if
(
boxGauge1
&&
boxGauge2
&&
boxGauge3
)
{
if
(
boxGauge1
&&
boxGauge2
&&
boxGauge3
)
{
...
@@ -320,6 +339,9 @@ export default {
...
@@ -320,6 +339,9 @@ export default {
return
[...
this
.
warehousing
.
orderWarehouseInBackItemDoList
,
...
this
.
form
.
orderWarehouseInItemDoList
]
return
[...
this
.
warehousing
.
orderWarehouseInBackItemDoList
,
...
this
.
form
.
orderWarehouseInItemDoList
]
},
},
isBeian
(){
isBeian
(){
if
(
this
.
form
.
recordMode
!==
undefined
){
return
[
'
无备案
'
,
'
有备案
'
,
'
中性
'
][
this
.
form
.
recordMode
]
}
if
(
this
.
brandObject
.
filing
){
if
(
this
.
brandObject
.
filing
){
return
[
'
无备案
'
,
'
有备案
'
,
'
中性
'
][
this
.
brandObject
.
filing
]
return
[
'
无备案
'
,
'
有备案
'
,
'
中性
'
][
this
.
brandObject
.
filing
]
}
else
{
}
else
{
...
...
src/views/ecw/order/warehousing/index.vue
View file @
40eb52de
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
<warehouse-area-dialog
ref=
"area"
:visible.sync=
"areaVisible"
v-model=
"form.orderLocationCreateReqVOList"
<warehouse-area-dialog
ref=
"area"
:visible.sync=
"areaVisible"
v-model=
"form.orderLocationCreateReqVOList"
:order-id=
"orderId"
:city-id=
"cityId"
></warehouse-area-dialog>
:order-id=
"orderId"
:city-id=
"cityId"
></warehouse-area-dialog>
<edit-dialog
:visible.sync=
"warehousingVisible"
:warehousing=
"warehousing"
:edit=
"order.status === 5"
></edit-dialog>
<edit-dialog
:
customer-id=
"order.customerId"
:
visible.sync=
"warehousingVisible"
:warehousing=
"warehousing"
:edit=
"order.status === 5"
></edit-dialog>
<!-- 完成入仓 -->
<!-- 完成入仓 -->
<el-dialog
<el-dialog
...
...
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