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
c960d245
Commit
c960d245
authored
May 03, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator
into dev
parents
7ca4659c
5d90d624
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
234 additions
and
35 deletions
+234
-35
order.js
src/api/ecw/order.js
+9
-0
product.js
src/api/ecw/product.js
+9
-0
index.vue
src/components/ProductSelector/index.vue
+9
-4
index.vue
src/views/ecw/box/ladingBill/index.vue
+16
-1
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+57
-5
edit.vue
src/views/ecw/customer/edit.vue
+29
-1
index.vue
src/views/ecw/customer/index.vue
+1
-1
indirectCustomer.vue
src/views/ecw/customer/indirectCustomer.vue
+1
-1
query.vue
src/views/ecw/customer/query.vue
+9
-1
index.vue
src/views/ecw/customerConfirm/index.vue
+5
-1
index.vue
src/views/ecw/customerToBeAssigned/index.vue
+5
-1
index.vue
src/views/ecw/myCustomerService/index.vue
+5
-1
index.vue
src/views/ecw/oceanCustomer/index.vue
+5
-1
warehouseDetails.vue
src/views/ecw/order/components/warehouseDetails.vue
+10
-0
splitApply.vue
src/views/ecw/order/splitApply.vue
+6
-6
Warehouse.vue
src/views/ecw/order/warehousing/components/Warehouse.vue
+50
-11
withdrawal.vue
src/views/ecw/order/withdrawal.vue
+7
-0
index.vue
src/views/ecw/product/index.vue
+1
-0
No files found.
src/api/ecw/order.js
View file @
c960d245
...
@@ -719,3 +719,12 @@ export function cancelSplitRevoke(data){
...
@@ -719,3 +719,12 @@ export function cancelSplitRevoke(data){
})
})
}
}
/*修改拆单项*/
export
function
splitItemUpdate
(
data
){
return
request
({
url
:
'
/order/split-item/update
'
,
method
:
'
post
'
,
data
})
}
src/api/ecw/product.js
View file @
c960d245
...
@@ -9,6 +9,15 @@ export function createProduct(data) {
...
@@ -9,6 +9,15 @@ export function createProduct(data) {
})
})
}
}
// 创建产品
export
function
addProduct
(
data
)
{
return
request
({
url
:
'
/ecw/product/add
'
,
method
:
'
post
'
,
data
:
data
})
}
// 更新产品
// 更新产品
export
function
updateProduct
(
data
)
{
export
function
updateProduct
(
data
)
{
return
request
({
return
request
({
...
...
src/components/ProductSelector/index.vue
View file @
c960d245
...
@@ -14,8 +14,12 @@
...
@@ -14,8 +14,12 @@
<el-option
<el-option
v-for=
"(item, index) in list"
v-for=
"(item, index) in list"
:key=
"item.id"
:key=
"item.id"
:label=
"item['title' + lang] + (item.auditStatus === 2 ? '' : `($
{
$t('审核中')
})`)"
:label=
"item['title' + lang] + (item.auditStatus === 2 ? '' : `($
{
lang === 'Zh' ? '待确定' : 'To be determined'
})`)"
:value="index">
:value="index">
<span
style=
"float: left"
>
{{
item
[
'
title
'
+
lang
]
}}
</span>
<span
style=
"float: right; color: #c76e6e; font-size: 13px"
>
{{
item
.
auditStatus
===
2
?
''
:
(
lang
===
'
Zh
'
?
'
待确定
'
:
'
To be determined
'
)
}}
</span>
</el-option>
</el-option>
</el-select>
</el-select>
</
template
>
</
template
>
...
@@ -59,7 +63,7 @@ export default {
...
@@ -59,7 +63,7 @@ export default {
init
(){
init
(){
if
(
!
this
.
value
){
if
(
!
this
.
value
){
this
.
index
=
null
this
.
index
=
null
return
return
}
}
let
index
=
this
.
list
.
findIndex
(
item
=>
item
.
id
==
this
.
value
)
let
index
=
this
.
list
.
findIndex
(
item
=>
item
.
id
==
this
.
value
)
if
(
index
<
0
){
if
(
index
<
0
){
...
@@ -80,7 +84,8 @@ export default {
...
@@ -80,7 +84,8 @@ export default {
},
},
remoteMethod
(
keyword
){
remoteMethod
(
keyword
){
let
params
=
{
let
params
=
{
pageSize
:
keyword
?
100000
:
10
pageSize
:
keyword
?
100000
:
10
,
filter
:
false
}
}
if
(
this
.
productType
){
if
(
this
.
productType
){
params
.
typeId
=
this
.
productType
params
.
typeId
=
this
.
productType
...
@@ -93,4 +98,4 @@ export default {
...
@@ -93,4 +98,4 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
src/views/ecw/box/ladingBill/index.vue
View file @
c960d245
...
@@ -9,7 +9,22 @@
...
@@ -9,7 +9,22 @@
<el-row
style=
"margin-top:15px"
>
<el-row
style=
"margin-top:15px"
>
<el-table
:data=
"billData.list"
border
max-height=
"500px"
>
<el-table
:data=
"billData.list"
border
max-height=
"500px"
>
<el-table-column
:label=
"$t('序号')"
align=
"center"
width=
"50"
prop=
"tidanNo"
/>
<el-table-column
:label=
"$t('序号')"
align=
"center"
width=
"50"
prop=
"tidanNo"
/>
<el-table-column
:label=
"$t('订单号')"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('订单号')"
align=
"center"
prop=
"orderNo"
>
<template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
orderNo
}}
</div>
<div
style=
"color:blue;fontWeight:bold;"
>
{{
scope
.
row
.
drawee
?
scope
.
row
.
drawee
:
''
}}
</div>
<div
style=
"color:red;fontWeight:bold;"
>
{{
scope
.
row
.
applicationInfo
?
scope
.
row
.
applicationInfo
:
''
}}
</div>
<div
style=
"color:red;fontWeight:bold;"
>
{{
scope
.
row
.
customsTypeName
?
scope
.
row
.
customsTypeName
:
''
}}
</div>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('货物信息')"
align=
"center"
prop=
""
>
<el-table-column
:label=
"$t('货物信息')"
align=
"center"
prop=
""
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<section
class=
"table-goodList"
>
<section
class=
"table-goodList"
>
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
c960d245
...
@@ -138,14 +138,32 @@
...
@@ -138,14 +138,32 @@
<dict-tag
:type=
"DICT_TYPE.ECW_IS_BRAND"
:value=
"scope.row.brandType"
/>
<dict-tag
:type=
"DICT_TYPE.ECW_IS_BRAND"
:value=
"scope.row.brandType"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('
体积')"
align=
"center"
>
<el-table-column
:label=
"$t('
入仓体积')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
volume
}}
m³
</span>
<el-input
v-model=
"scope.row.volume"
@
change=
"updateField(scope.row, 'volume')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
m³
</span>
</el-input>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('
重量')"
align=
"center"
>
<el-table-column
:label=
"$t('
收费体积')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
weight
}}
kg
</span>
<el-input
v-model=
"scope.row.chargeVolume"
@
change=
"updateField(scope.row, 'chargeVolume')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
m³
</span>
</el-input>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('入仓重量')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.weight"
@
change=
"updateField(scope.row, 'weight')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
kg
</span>
</el-input>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('收费重量')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.chargeWeight"
@
change=
"updateField(scope.row, 'chargeWeight')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
kg
</span>
</el-input>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('箱数')"
align=
"center"
>
<el-table-column
:label=
"$t('箱数')"
align=
"center"
>
...
@@ -208,6 +226,18 @@
...
@@ -208,6 +226,18 @@
<el-form-item
:label=
"$t('放入箱数')+':'"
>
<el-form-item
:label=
"$t('放入箱数')+':'"
>
{{shopForm.putNum||0}}
{{shopForm.putNum||0}}
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('入仓体积')"
>
<el-input-number
v-model=
"shopForm.volume"
controls-position=
"right"
:min=
"0"
:max=
"orderItem.warehouseInInfoVO.volume"
></el-input-number>
</el-form-item>
<el-form-item
:label=
"$t('收费体积')"
>
<el-input-number
v-model=
"shopForm.chargeVolume"
controls-position=
"right"
:min=
"0"
:max=
"orderItem.chargeVolume"
></el-input-number>
</el-form-item>
<el-form-item
:label=
"$t('入仓重量')"
>
<el-input-number
v-model=
"shopForm.weight"
controls-position=
"right"
:min=
"0"
:max=
"orderItem.warehouseInInfoVO.weight"
></el-input-number>
</el-form-item>
<el-form-item
:label=
"$t('收费重量')"
>
<el-input-number
v-model=
"shopForm.chargeWeight"
controls-position=
"right"
:min=
"0"
:max=
"orderItem.chargeWeight"
></el-input-number>
</el-form-item>
<!-- <el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity">
<!-- <el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item> -->
</el-form-item> -->
...
@@ -233,7 +263,7 @@ import {
...
@@ -233,7 +263,7 @@ import {
}
from
"
@/api/ecw/orderHandle
"
;
}
from
"
@/api/ecw/orderHandle
"
;
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
WorkFlow
from
"
@/components/WorkFlow
"
;
import
WorkFlow
from
"
@/components/WorkFlow
"
;
import
{
getOrder
}
from
"
@/api/ecw/order
"
;
import
{
getOrder
,
splitItemUpdate
}
from
"
@/api/ecw/order
"
;
import
{
serviceMsg
,
toReviewDetail
}
from
"
../../utils
"
;
import
{
serviceMsg
,
toReviewDetail
}
from
"
../../utils
"
;
import
{
createApproval
,
approvalCancel
,
splitList
}
from
"
@/api/ecw/boxSea
"
;
import
{
createApproval
,
approvalCancel
,
splitList
}
from
"
@/api/ecw/boxSea
"
;
import
Decimal
from
"
decimal.js
"
;
import
Decimal
from
"
decimal.js
"
;
...
@@ -328,8 +358,26 @@ export default {
...
@@ -328,8 +358,26 @@ export default {
}
}
return
false
;
return
false
;
},
},
// 订单项数据,默认要返回一个如下的空json结构体,避免报错
orderItem
(){
if
(
!
this
.
orderData
)
return
{
warehouseInInfoVO
:{}}
return
this
.
orderData
.
orderItemVOList
.
find
(
item
=>
item
.
orderItemId
==
this
.
shopForm
.
orderItemId
)
||
{
warehouseInInfoVO
:{}}
}
},
},
methods
:
{
methods
:
{
/*检查并提交字段(体积,重量)修改*/
updateField
(
row
,
field
){
let
val
=
parseFloat
(
row
[
field
])
if
(
!
val
||
val
<
0
){
this
.
$message
.
error
(
this
.
$t
(
'
数据无效
'
))
return
this
.
getList
()
}
splitItemUpdate
(
row
).
then
(()
=>
{
this
.
$message
.
success
(
this
.
$t
(
'
修改成功
'
))
}).
catch
(()
=>
{
this
.
getList
()
})
},
/* 拆箱总数 */
/* 拆箱总数 */
totalSplitNum
()
{
totalSplitNum
()
{
let
_total
=
0
;
let
_total
=
0
;
...
@@ -565,6 +613,10 @@ export default {
...
@@ -565,6 +613,10 @@ export default {
orderItemId
:
this
.
shopForm
.
orderItemId
,
orderItemId
:
this
.
shopForm
.
orderItemId
,
orderSplitId
:
this
.
splitData
.
id
,
orderSplitId
:
this
.
splitData
.
id
,
remarks
:
this
.
shopForm
.
remarks
,
remarks
:
this
.
shopForm
.
remarks
,
volume
:
this
.
shopForm
.
volume
,
weight
:
this
.
shopForm
.
weight
,
chargeWeight
:
this
.
shopForm
.
chargeWeight
,
chargeVolume
:
this
.
shopForm
.
chargeVolume
};
};
createSplitItem
(
params
).
then
((
res
)
=>
{
createSplitItem
(
params
).
then
((
res
)
=>
{
this
.
$message
.
success
(
this
.
$t
(
"
放入成功
"
));
this
.
$message
.
success
(
this
.
$t
(
"
放入成功
"
));
...
...
src/views/ecw/customer/edit.vue
View file @
c960d245
...
@@ -17,6 +17,16 @@
...
@@ -17,6 +17,16 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('客户英文名称')"
>
<el-input
v-model=
"form.nameEn"
:placeholder=
"$t('请输入客户英文名称')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('付款人姓名')"
>
<el-input
v-model=
"form.payerName"
:placeholder=
"$t('请输入付款人姓名')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('客户等级')"
prop=
"level"
>
<el-form-item
:label=
"$t('客户等级')"
prop=
"level"
>
<el-select
v-model=
"form.level"
:placeholder=
"$t('请选择客户等级')"
disabled
>
<el-select
v-model=
"form.level"
:placeholder=
"$t('请选择客户等级')"
disabled
>
...
@@ -70,7 +80,6 @@
...
@@ -70,7 +80,6 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('客户生日')"
prop=
"birthday"
>
<el-form-item
:label=
"$t('客户生日')"
prop=
"birthday"
>
<el-date-picker
<el-date-picker
v-model=
"form.birthday"
v-model=
"form.birthday"
...
@@ -80,6 +89,11 @@
...
@@ -80,6 +89,11 @@
</el-date-picker>
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('公司英文名称')"
>
<el-input
v-model=
"form.companyEn"
:placeholder=
"$t('请输入客户英文名称')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('主营类别')"
prop=
"productType"
>
<el-form-item
:label=
"$t('主营类别')"
prop=
"productType"
>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
...
@@ -268,6 +282,16 @@
...
@@ -268,6 +282,16 @@
</el-form-item>
</el-form-item>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column>
<
template
slot=
"header"
>
{{
$t
(
'
联系人英文名称
'
)
}}
</
template
>
<
template
v-slot=
"{row, cellValue, $index}"
>
<el-form-item
label=
""
>
<el-input
v-model=
"row.nameEn"
:placeholder=
"$t('请输入联系人英文名称')"
size=
"mini"
/>
</el-form-item>
</
template
>
</el-table-column>
<el-table-column
<el-table-column
prop=
"areaCode"
prop=
"areaCode"
:label=
"$t('区号')"
:label=
"$t('区号')"
...
@@ -873,12 +897,15 @@ export default {
...
@@ -873,12 +897,15 @@ export default {
id
:
undefined
,
id
:
undefined
,
number
:
undefined
,
number
:
undefined
,
name
:
undefined
,
name
:
undefined
,
nameEn
:
undefined
,
level
:
1
,
level
:
1
,
country
:
undefined
,
country
:
undefined
,
type
:
undefined
,
type
:
undefined
,
transportType
:[],
transportType
:[],
agentId
:
undefined
,
agentId
:
undefined
,
company
:
undefined
,
company
:
undefined
,
companyEn
:
undefined
,
payerName
:
undefined
,
address
:
undefined
,
address
:
undefined
,
productType
:
undefined
,
productType
:
undefined
,
productId
:
undefined
,
productId
:
undefined
,
...
@@ -948,6 +975,7 @@ export default {
...
@@ -948,6 +975,7 @@ export default {
"
social
"
:
undefined
,
"
social
"
:
undefined
,
"
socialNumber
"
:
""
,
"
socialNumber
"
:
""
,
"
userid
"
:
undefined
,
"
userid
"
:
undefined
,
"
nameEn
"
:
""
,
// "username": ""
// "username": ""
})
})
},
},
...
...
src/views/ecw/customer/index.vue
View file @
c960d245
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
name
}}
<el-tag
v-if=
"row.isInOpenSea"
size=
"mini"
>
{{
$t
(
'
公
'
)
}}
</el-tag>
{{
$l
(
row
,
'
name
'
)
}}
<el-tag
v-if=
"row.isInOpenSea"
size=
"mini"
>
{{
$t
(
'
公
'
)
}}
</el-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
...
src/views/ecw/customer/indirectCustomer.vue
View file @
c960d245
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<template
v-slot=
"scope"
>
<template
v-slot=
"scope"
>
<router-link
:to=
"
{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
<router-link
:to=
"
{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
<span>
{{
scope
.
row
.
name
}}
</span>
<span>
{{
$l
(
scope
.
row
,
'
name
'
)
}}
</span>
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
...
src/views/ecw/customer/query.vue
View file @
c960d245
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<el-card
style=
"margin-top: 15px;"
>
<el-card
style=
"margin-top: 15px;"
>
<el-descriptions
:column=
"4"
border
>
<el-descriptions
:column=
"4"
border
>
<el-descriptions-item
:label=
"$t('客户编号')"
>
{{
customer
.
number
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户编号')"
>
{{
customer
.
number
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户名称')"
>
{{
customer
.
name
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户名称')"
>
{{
$l
(
customer
,
'
name
'
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('结算方式')"
>
{{
getDictDataLabel
(
DICT_TYPE
.
CUSTOMER_BALANCE
,
customer
.
balance
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('结算方式')"
>
{{
getDictDataLabel
(
DICT_TYPE
.
CUSTOMER_BALANCE
,
customer
.
balance
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户生日')"
>
{{
parseTime
(
customer
.
birthday
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/el-descriptions-item
>
<el-descriptions-item
:label=
"$t('客户生日')"
>
{{
parseTime
(
customer
.
birthday
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
:
label
=
"
$t('出货渠道')
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('出货渠道')
"
>
...
@@ -77,6 +77,9 @@
...
@@ -77,6 +77,9 @@
prop
=
"
name
"
prop
=
"
name
"
:
label
=
"
$t('联系人')
"
:
label
=
"
$t('联系人')
"
>
>
<
template
v
-
slot
=
"
{row
}
"
>
{{
$l
(
row
,
'
name
'
)
}}
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
<
el
-
table
-
column
prop
=
"
phoneNew
"
prop
=
"
phoneNew
"
...
@@ -231,6 +234,11 @@
...
@@ -231,6 +234,11 @@
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.ORDER_STATUS
"
:
value
=
"
scope.row.status
"
/>-->
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.ORDER_STATUS
"
:
value
=
"
scope.row.status
"
/>-->
<!--
<
/template>--
>
<!--
<
/template>--
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('入仓时间')
"
>
<
template
v
-
slot
=
"
{row
}
"
>
{{
parseTime
(
row
.
rucangTime
)
}}
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
/el-table
>
<
pagination
@
pagination
=
"
getorderList
"
:
page
.
sync
=
"
queryParams.page
"
:
limit
.
sync
=
"
queryParams.rows
"
:
total
=
"
orderTotal
"
><
/pagination
>
<
pagination
@
pagination
=
"
getorderList
"
:
page
.
sync
=
"
queryParams.page
"
:
limit
.
sync
=
"
queryParams.rows
"
:
total
=
"
orderTotal
"
><
/pagination
>
<
/el-card
>
<
/el-card
>
...
...
src/views/ecw/customerConfirm/index.vue
View file @
c960d245
...
@@ -85,7 +85,11 @@
...
@@ -85,7 +85,11 @@
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
/>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<
template
v-slot=
"{row}"
>
{{
$l
(
row
,
'
name
'
)
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
...
...
src/views/ecw/customerToBeAssigned/index.vue
View file @
c960d245
...
@@ -96,7 +96,11 @@
...
@@ -96,7 +96,11 @@
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
/>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<
template
v-slot=
"{row}"
>
{{
$l
(
row
,
'
name
'
)
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
...
...
src/views/ecw/myCustomerService/index.vue
View file @
c960d245
...
@@ -85,7 +85,11 @@
...
@@ -85,7 +85,11 @@
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
/>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<
template
v-slot=
"{row}"
>
{{
$l
(
row
,
'
name
'
)
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
...
...
src/views/ecw/oceanCustomer/index.vue
View file @
c960d245
...
@@ -90,7 +90,11 @@
...
@@ -90,7 +90,11 @@
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
/>
<el-table-column
:label=
"$t('客户名称')"
align=
"center"
prop=
"name"
>
<
template
v-slot=
"{row}"
>
{{
$l
(
row
,
'
name
'
)
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<el-table-column
:label=
"$t('客户等级')"
align=
"center"
prop=
"vipLevelNameZh"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_LEVEL"
:value=
"scope.row.level"
/>
...
...
src/views/ecw/order/components/warehouseDetails.vue
View file @
c960d245
...
@@ -130,6 +130,16 @@
...
@@ -130,6 +130,16 @@
<div>
<div>
{{ FeeDetails.details
&&
FeeDetails.details.reason ? FeeDetails.details.reason :''}}
{{ FeeDetails.details
&&
FeeDetails.details.reason ? FeeDetails.details.reason :''}}
</div>
</div>
<p>
{{$t('退仓图片')}}
</p>
<div>
<el-image
v-for=
"(item, index) in (FeeDetails.details.imgUrl || '').split(',')"
:key =
'index'
style=
"width: 100px; height: 100px;margin:10px;"
:src=
"item"
:preview-src-list=
"(FeeDetails.details.imgUrl || '').split(',')"
>
</el-image>
</div>
</div>
</div>
<div
v-if=
"type === 4"
>
<div
v-if=
"type === 4"
>
<p>
{{ $t('申请理由') }}
</p>
<p>
{{ $t('申请理由') }}
</p>
...
...
src/views/ecw/order/splitApply.vue
View file @
c960d245
...
@@ -156,28 +156,28 @@
...
@@ -156,28 +156,28 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('入仓体积')"
align=
"center"
>
<el-table-column
:label=
"$t('入仓体积')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.volume"
@
change=
"updateField(scope.row, 'volume')"
size=
"mini"
>
<el-input
v-model=
"scope.row.volume"
@
change=
"updateField(scope.row, 'volume')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
m³
</span>
<span
slot=
"append"
>
m³
</span>
</el-input>
</el-input>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('收费体积')"
align=
"center"
>
<el-table-column
:label=
"$t('收费体积')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.chargeVolume"
@
change=
"updateField(scope.row, 'chargeVolume')"
size=
"mini"
>
<el-input
v-model=
"scope.row.chargeVolume"
@
change=
"updateField(scope.row, 'chargeVolume')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
m³
</span>
<span
slot=
"append"
>
m³
</span>
</el-input>
</el-input>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('入仓重量')"
align=
"center"
>
<el-table-column
:label=
"$t('入仓重量')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.weight"
@
change=
"updateField(scope.row, 'weight')"
size=
"mini"
>
<el-input
v-model=
"scope.row.weight"
@
change=
"updateField(scope.row, 'weight')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
kg
</span>
<span
slot=
"append"
>
kg
</span>
</el-input>
</el-input>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('收费重量')"
align=
"center"
>
<el-table-column
:label=
"$t('收费重量')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.chargeWeight"
@
change=
"updateField(scope.row, 'chargeWeight')"
size=
"mini"
>
<el-input
v-model=
"scope.row.chargeWeight"
@
change=
"updateField(scope.row, 'chargeWeight')"
size=
"mini"
:disabled=
"index === 0"
>
<span
slot=
"append"
>
kg
</span>
<span
slot=
"append"
>
kg
</span>
</el-input>
</el-input>
</
template
>
</
template
>
...
@@ -297,7 +297,7 @@ import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSp
...
@@ -297,7 +297,7 @@ import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSp
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
import
WorkFlow
from
'
@/components/WorkFlow
'
import
WorkFlow
from
'
@/components/WorkFlow
'
import
{
getOrder
}
from
'
@/api/ecw/order
'
import
{
getOrder
,
splitItemUpdate
}
from
'
@/api/ecw/order
'
import
Decimal
from
'
decimal.js
'
import
Decimal
from
'
decimal.js
'
export
default
{
export
default
{
...
@@ -399,7 +399,7 @@ export default {
...
@@ -399,7 +399,7 @@ export default {
this
.
$message
.
error
(
this
.
$t
(
'
数据无效
'
))
this
.
$message
.
error
(
this
.
$t
(
'
数据无效
'
))
return
this
.
getList
()
return
this
.
getList
()
}
}
createSplitItem
(
row
).
then
(()
=>
{
splitItemUpdate
(
row
).
then
(()
=>
{
this
.
$message
.
success
(
this
.
$t
(
'
修改成功
'
))
this
.
$message
.
success
(
this
.
$t
(
'
修改成功
'
))
}).
catch
(()
=>
{
}).
catch
(()
=>
{
this
.
getList
()
this
.
getList
()
...
...
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @
c960d245
...
@@ -57,9 +57,20 @@
...
@@ -57,9 +57,20 @@
<span
v-else
>
{{ warehousing.weight }}
</span>
Kg
<span
v-else
>
{{ warehousing.weight }}
</span>
Kg
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<el-form-item
:label=
"$t('材质')"
style=
"margin-top: 20px"
>
<el-row>
<dict-selector
:type=
"DICT_TYPE.ECW_PRODUCT_MATERIAL"
v-model=
"form.material"
clearable
></dict-selector>
<el-col
:span=
"8"
>
</el-form-item>
<el-form-item
:label=
"$t('材质')"
style=
"margin-top: 20px"
>
<dict-selector
:type=
"DICT_TYPE.ECW_PRODUCT_MATERIAL"
v-model=
"form.material"
clearable
></dict-selector>
</el-form-item>
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('入仓特性')"
style=
"margin-top: 20px"
>
<el-checkbox-group
v-model=
"form.prodAttrIds"
>
<el-checkbox
v-for=
"item in attrList"
:key=
"item.id"
:label=
"item.id"
>
{{ item.attrName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
<el-form-item
:label=
"$t('入仓时间')"
v-if=
"!edit"
>
<el-form-item
:label=
"$t('入仓时间')"
v-if=
"!edit"
>
<el-date-picker
v-model=
"form.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
v-model=
"form.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form-item>
...
@@ -240,9 +251,20 @@
...
@@ -240,9 +251,20 @@
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('填单参数')"
>
{{ $t('非填单货物') }}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('填单参数')"
>
{{ $t('非填单货物') }}
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<el-form-item
:label=
"$t('材质')"
style=
"margin-top: 20px"
>
<el-row>
<dict-selector
:type=
"DICT_TYPE.ECW_PRODUCT_MATERIAL"
v-model=
"form1.material"
></dict-selector>
<el-col
:span=
"8"
>
</el-form-item>
<el-form-item
:label=
"$t('材质')"
style=
"margin-top: 20px"
>
<dict-selector
:type=
"DICT_TYPE.ECW_PRODUCT_MATERIAL"
v-model=
"form1.material"
clearable
></dict-selector>
</el-form-item>
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('入仓特性')"
style=
"margin-top: 20px"
>
<el-checkbox-group
v-model=
"form1.prodAttrIds"
>
<el-checkbox
v-for=
"item in attrList"
:key=
"item.id"
:label=
"item.id"
>
{{ item.attrName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
<el-form-item
:label=
"$t('入仓时间')"
>
<el-form-item
:label=
"$t('入仓时间')"
>
<el-date-picker
v-model=
"form1.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
v-model=
"form1.inTime"
type=
"datetime"
:placeholder=
"$t('请选择入仓时间')"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form-item>
...
@@ -451,7 +473,7 @@ import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
...
@@ -451,7 +473,7 @@ import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
import
{
orderWarehouseIn
,
orderWarehouseInUpdateApply
}
from
"
@/api/ecw/order
"
import
{
orderWarehouseIn
,
orderWarehouseInUpdateApply
}
from
"
@/api/ecw/order
"
import
{
getProductAttrList
}
from
"
@/api/ecw/productAttr
"
import
{
getProductAttrList
}
from
"
@/api/ecw/productAttr
"
import
{
getProductTypeList
}
from
"
@/api/ecw/productType
"
import
{
getProductTypeList
}
from
"
@/api/ecw/productType
"
import
{
create
Product
}
from
"
@/api/ecw/product
"
import
{
add
Product
}
from
"
@/api/ecw/product
"
export
default
{
export
default
{
name
:
"
Warehouse
"
,
name
:
"
Warehouse
"
,
...
@@ -595,7 +617,7 @@ export default {
...
@@ -595,7 +617,7 @@ export default {
inTime
:
undefined
,
inTime
:
undefined
,
material
:
undefined
,
material
:
undefined
,
orderItemId
:
undefined
,
orderItemId
:
undefined
,
prodAttrIds
:
undefined
,
prodAttrIds
:
[]
,
prodId
:
undefined
,
prodId
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleZh
:
undefined
,
prodTitleZh
:
undefined
,
...
@@ -613,7 +635,7 @@ export default {
...
@@ -613,7 +635,7 @@ export default {
inTime
:
undefined
,
inTime
:
undefined
,
material
:
undefined
,
material
:
undefined
,
orderItemId
:
undefined
,
orderItemId
:
undefined
,
prodAttrIds
:
undefined
,
prodAttrIds
:
[]
,
prodId
:
undefined
,
prodId
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleZh
:
undefined
,
prodTitleZh
:
undefined
,
...
@@ -683,7 +705,7 @@ export default {
...
@@ -683,7 +705,7 @@ export default {
this
.
form
.
orderId
=
this
.
warehousing
.
orderId
this
.
form
.
orderId
=
this
.
warehousing
.
orderId
this
.
form
.
orderItemId
=
this
.
warehousing
.
orderItemId
this
.
form
.
orderItemId
=
this
.
warehousing
.
orderItemId
this
.
form
.
orderNo
=
this
.
warehousing
.
orderNo
this
.
form
.
orderNo
=
this
.
warehousing
.
orderNo
this
.
form
.
prodAttrIds
=
this
.
warehousing
.
prodAttrIds
this
.
form
.
prodAttrIds
=
this
.
warehousing
.
prodAttrIds
?.
split
(
'
,
'
).
map
(
e
=>
+
e
)
||
[]
this
.
form
.
prodId
=
this
.
warehousing
.
prodId
this
.
form
.
prodId
=
this
.
warehousing
.
prodId
this
.
form
.
prodTitleEn
=
this
.
warehousing
.
prodTitleEn
this
.
form
.
prodTitleEn
=
this
.
warehousing
.
prodTitleEn
this
.
form
.
prodTitleZh
=
this
.
warehousing
.
prodTitleZh
this
.
form
.
prodTitleZh
=
this
.
warehousing
.
prodTitleZh
...
@@ -738,6 +760,13 @@ export default {
...
@@ -738,6 +760,13 @@ export default {
handleSubmit
()
{
handleSubmit
()
{
if
(
this
.
activeName
!==
"
first
"
){
if
(
this
.
activeName
!==
"
first
"
){
// 添加非填单货物
// 添加非填单货物
if
(
this
.
form1
.
prodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
return
this
.
$notify
({
title
:
this
.
$t
(
'
提示
'
),
message
:
this
.
$t
(
"
订单包含不接受货物,请检查
"
),
type
:
'
warning
'
})
}
this
.
$refs
[
'
form1
'
].
validate
(
valid
=>
{
this
.
$refs
[
'
form1
'
].
validate
(
valid
=>
{
this
.
$refs
[
'
tableForm1
'
].
validate
(
valid1
=>
{
this
.
$refs
[
'
tableForm1
'
].
validate
(
valid1
=>
{
if
(
!
valid
||
!
valid1
)
{
if
(
!
valid
||
!
valid1
)
{
...
@@ -749,6 +778,7 @@ export default {
...
@@ -749,6 +778,7 @@ export default {
orderId
:
this
.
warehousing
.
orderId
,
orderId
:
this
.
warehousing
.
orderId
,
orderItemId
:
undefined
,
orderItemId
:
undefined
,
orderNo
:
this
.
warehousing
.
orderNo
,
orderNo
:
this
.
warehousing
.
orderNo
,
prodAttrIds
:
this
.
form
.
prodAttrIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form1
.
table
.
map
(
e
=>
{
orderWarehouseInItemDoList
:
this
.
form1
.
table
.
map
(
e
=>
{
return
{
return
{
...
e
,
...
e
,
...
@@ -767,6 +797,13 @@ export default {
...
@@ -767,6 +797,13 @@ export default {
})
})
})
})
}
else
{
}
else
{
if
(
this
.
form
.
prodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
return
this
.
$notify
({
title
:
this
.
$t
(
'
提示
'
),
message
:
this
.
$t
(
"
订单包含不接受货物,请检查
"
),
type
:
'
warning
'
})
}
this
.
$refs
[
'
form
'
].
validate
(
valid
=>
{
this
.
$refs
[
'
form
'
].
validate
(
valid
=>
{
this
.
$refs
[
'
tableForm
'
].
validate
(
valid1
=>
{
this
.
$refs
[
'
tableForm
'
].
validate
(
valid1
=>
{
if
(
!
valid
||
!
valid1
)
{
if
(
!
valid
||
!
valid1
)
{
...
@@ -784,6 +821,7 @@ export default {
...
@@ -784,6 +821,7 @@ export default {
volume
:
(
+
this
.
warehousing
.
volume
)?.
toFixed
(
2
)
||
''
,
volume
:
(
+
this
.
warehousing
.
volume
)?.
toFixed
(
2
)
||
''
,
weight
:
(
+
this
.
warehousing
.
weight
)?.
toFixed
(
2
)
||
''
,
weight
:
(
+
this
.
warehousing
.
weight
)?.
toFixed
(
2
)
||
''
,
prodId
:
this
.
form
.
prodId
,
prodId
:
this
.
form
.
prodId
,
prodAttrIds
:
this
.
form
.
prodAttrIds
.
join
(
'
,
'
),
"
orderWarehouseInUpdateItemDoList
"
:
this
.
form
.
table
.
map
(
e
=>
{
"
orderWarehouseInUpdateItemDoList
"
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
return
{
...
e
,
...
e
,
...
@@ -809,6 +847,7 @@ export default {
...
@@ -809,6 +847,7 @@ export default {
orderItemId
:
this
.
warehousing
.
orderItemId
,
orderItemId
:
this
.
warehousing
.
orderItemId
,
orderNo
:
this
.
warehousing
.
orderNo
,
orderNo
:
this
.
warehousing
.
orderNo
,
isAppend
:
this
.
isAdd
?
true
:
undefined
,
isAppend
:
this
.
isAdd
?
true
:
undefined
,
prodAttrIds
:
this
.
form
.
prodAttrIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form
.
table
.
map
(
e
=>
{
orderWarehouseInItemDoList
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
return
{
...
e
,
...
e
,
...
@@ -934,7 +973,7 @@ export default {
...
@@ -934,7 +973,7 @@ export default {
//商品特性转字符串
//商品特性转字符串
this
.
productForm
.
attrId
=
this
.
productForm
.
attrArray
.
join
(
'
,
'
)
this
.
productForm
.
attrId
=
this
.
productForm
.
attrArray
.
join
(
'
,
'
)
// 添加的提交
// 添加的提交
create
Product
(
this
.
productForm
).
then
(
response
=>
{
add
Product
(
this
.
productForm
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
新增成功
"
))
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
新增成功
"
))
if
(
this
.
activeName
===
'
first
'
)
{
if
(
this
.
activeName
===
'
first
'
)
{
this
.
form
.
prodId
=
response
.
data
this
.
form
.
prodId
=
response
.
data
...
...
src/views/ecw/order/withdrawal.vue
View file @
c960d245
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
<el-form-item
:label=
"$t('退仓原因')"
>
<el-form-item
:label=
"$t('退仓原因')"
>
<el-input
v-model=
"params.reason"
style=
"width:500px"
type=
"textarea"
></el-input>
<el-input
v-model=
"params.reason"
style=
"width:500px"
type=
"textarea"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('图片')"
>
<image-and-video-upload
:file-type=
"['png' , 'jpg', 'jpeg']"
:fileSize=
"50"
:isShowTip=
"true"
v-model=
"params.imgUrl"
></image-and-video-upload>
</el-form-item>
</el-form>
</el-form>
<el-divider></el-divider>
<el-divider></el-divider>
<h2>
{{
$t
(
'
审批流程
'
)
}}
</h2>
<h2>
{{
$t
(
'
审批流程
'
)
}}
</h2>
...
@@ -37,6 +40,7 @@ import {
...
@@ -37,6 +40,7 @@ import {
warehouseApprovalCancel
warehouseApprovalCancel
}
from
"
@/api/ecw/batchSingleApplication
"
;
}
from
"
@/api/ecw/batchSingleApplication
"
;
import
workFlow
from
"
@/components/WorkFlow
"
;
import
workFlow
from
"
@/components/WorkFlow
"
;
import
ImageAndVideoUpload
from
"
@/components/ImageAndVideoUpload/index.vue
"
;
export
default
{
export
default
{
name
:
"
withdrawal
"
,
name
:
"
withdrawal
"
,
...
@@ -45,6 +49,7 @@ export default {
...
@@ -45,6 +49,7 @@ export default {
dialogVisible
:
Boolean
dialogVisible
:
Boolean
},
},
components
:{
components
:{
ImageAndVideoUpload
,
workFlow
workFlow
},
},
data
(){
data
(){
...
@@ -55,6 +60,7 @@ export default {
...
@@ -55,6 +60,7 @@ export default {
orderNo
:
undefined
,
orderNo
:
undefined
,
reason
:
''
,
reason
:
''
,
copyUserId
:[],
copyUserId
:[],
imgUrl
:[]
},
},
isExamine
:
true
,
isExamine
:
true
,
details
:{},
details
:{},
...
@@ -82,6 +88,7 @@ export default {
...
@@ -82,6 +88,7 @@ export default {
submit
(){
submit
(){
this
.
params
.
orderId
=
this
.
orderDetails
.
orderId
;
this
.
params
.
orderId
=
this
.
orderDetails
.
orderId
;
this
.
params
.
orderNo
=
this
.
orderDetails
.
orderNo
;
this
.
params
.
orderNo
=
this
.
orderDetails
.
orderNo
;
this
.
params
.
imgUrl
=
this
.
params
.
imgUrl
.
join
(
'
,
'
)
orderWarehouseInDelete
(
this
.
params
).
then
(
r
=>
{
orderWarehouseInDelete
(
this
.
params
).
then
(
r
=>
{
if
(
r
.
code
===
0
){
if
(
r
.
code
===
0
){
this
.
$message
.
success
(
this
.
$t
(
'
退仓成功
'
));
this
.
$message
.
success
(
this
.
$t
(
'
退仓成功
'
));
...
...
src/views/ecw/product/index.vue
View file @
c960d245
...
@@ -439,6 +439,7 @@ export default {
...
@@ -439,6 +439,7 @@ export default {
params
.
filter
=
false
;
params
.
filter
=
false
;
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
'
createTime
'
);
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
'
createTime
'
);
// 执行查询
// 执行查询
params
.
status
=
0
;
getProductPage
(
params
).
then
(
response
=>
{
getProductPage
(
params
).
then
(
response
=>
{
this
.
list
=
response
.
data
.
list
;
this
.
list
=
response
.
data
.
list
;
this
.
total
=
response
.
data
.
total
;
this
.
total
=
response
.
data
.
total
;
...
...
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