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
bc21d9ab
Commit
bc21d9ab
authored
Nov 01, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of
http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master
into test
parents
ab07a9b7
a53c42ca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
53 deletions
+53
-53
order.js
src/api/ecw/order.js
+0
-8
CheckDetailProd.vue
src/views/ecw/order/components/CheckDetailProd.vue
+37
-28
DetailProd.vue
src/views/ecw/order/components/DetailProd.vue
+2
-2
detail.vue
src/views/ecw/order/detail.vue
+12
-13
index.vue
src/views/ecw/order/index.vue
+2
-2
No files found.
src/api/ecw/order.js
View file @
bc21d9ab
...
@@ -1052,14 +1052,6 @@ export function getOrderItemDeleted(orderId){
...
@@ -1052,14 +1052,6 @@ export function getOrderItemDeleted(orderId){
})
})
}
}
//退仓品名列表
export
function
getOrderCheckInfo
(
orderId
){
return
request
({
url
:
'
/ecw/order/order-check-info/
'
+
orderId
,
method
:
'
get
'
,
})
}
// 打包页面订单数据统计
// 打包页面订单数据统计
export
function
getPackStatistics
(
orderId
){
export
function
getPackStatistics
(
orderId
){
return
request
({
return
request
({
...
...
src/views/ecw/order/components/CheckDetailProd.vue
View file @
bc21d9ab
...
@@ -5,6 +5,10 @@ import { parseTime } from '@/utils/ruoyi'
...
@@ -5,6 +5,10 @@ import { parseTime } from '@/utils/ruoyi'
export
default
{
export
default
{
name
:
'
CheckDetailProd
'
,
name
:
'
CheckDetailProd
'
,
props
:
{
props
:
{
unloadTime
:
{
type
:
String
,
required
:
false
},
list
:
{
list
:
{
type
:
Array
,
type
:
Array
,
required
:
true
required
:
true
...
@@ -47,6 +51,9 @@ export default {
...
@@ -47,6 +51,9 @@ export default {
}
}
};
};
},
},
getUnloadTime
()
{
return
this
.
unloadTime
;
},
// 显示特性
// 显示特性
showAttrText
(){
showAttrText
(){
return
ids
=>
{
return
ids
=>
{
...
@@ -62,6 +69,14 @@ export default {
...
@@ -62,6 +69,14 @@ export default {
},
},
methods
:{
methods
:{
// 处理异常
handleError
(
row
)
{
this
.
$emit
(
"
closeStart
"
,
"
close
"
);
this
.
$router
.
push
({
path
:
`/order/pending?id=
${
row
.
orderId
}
`
,
});
},
// 获取储位名称
// 获取储位名称
getLocationName
(
locationArr
){
getLocationName
(
locationArr
){
if
(
!
locationArr
||
!
locationArr
.
length
)
return
''
if
(
!
locationArr
||
!
locationArr
.
length
)
return
''
...
@@ -114,10 +129,12 @@ export default {
...
@@ -114,10 +129,12 @@ export default {
warehouseInData
.
volume
=
warehouseInData
.
volume
.
plus
(
item
.
warehouseInInfoVO
.
volume
||
0
)
warehouseInData
.
volume
=
warehouseInData
.
volume
.
plus
(
item
.
warehouseInInfoVO
.
volume
||
0
)
warehouseInData
.
quantity
=
warehouseInData
.
quantity
.
plus
(
item
.
warehouseInInfoVO
.
quantityAll
||
0
)
warehouseInData
.
quantity
=
warehouseInData
.
quantity
.
plus
(
item
.
warehouseInInfoVO
.
quantityAll
||
0
)
}
}
toWarehouseData
.
checkNum
=
toWarehouseData
.
checkNum
.
plus
(
item
.
checkNum
||
0
)
if
(
item
.
warehouseCheckInfoVO
){
toWarehouseData
.
checkWeight
=
toWarehouseData
.
checkWeight
.
plus
(
item
.
checkWeight
||
0
)
toWarehouseData
.
checkNum
=
toWarehouseData
.
checkNum
.
plus
(
item
.
warehouseCheckInfoVO
.
cartonsNum
||
0
)
toWarehouseData
.
checkVolume
=
toWarehouseData
.
checkVolume
.
plus
(
item
.
checkVolume
||
0
)
toWarehouseData
.
checkWeight
=
toWarehouseData
.
checkWeight
.
plus
(
item
.
warehouseCheckInfoVO
.
weight
||
0
)
toWarehouseData
.
checkQuantity
=
toWarehouseData
.
checkQuantity
.
plus
(
item
.
checkQuantity
||
0
)
toWarehouseData
.
checkVolume
=
toWarehouseData
.
checkVolume
.
plus
(
item
.
warehouseCheckInfoVO
.
volume
||
0
)
toWarehouseData
.
checkQuantity
=
toWarehouseData
.
checkQuantity
.
plus
(
item
.
warehouseCheckInfoVO
.
quantity
||
0
)
}
chargeData
.
weight
=
chargeData
.
weight
.
plus
(
item
.
chargeWeight
||
0
)
chargeData
.
weight
=
chargeData
.
weight
.
plus
(
item
.
chargeWeight
||
0
)
chargeData
.
volume
=
chargeData
.
volume
.
plus
(
item
.
chargeVolume
||
0
)
chargeData
.
volume
=
chargeData
.
volume
.
plus
(
item
.
chargeVolume
||
0
)
})
})
...
@@ -144,25 +161,25 @@ export default {
...
@@ -144,25 +161,25 @@ export default {
<el-table-column
:label=
"$t('序号')"
width=
"90px"
>
<el-table-column
:label=
"$t('序号')"
width=
"90px"
>
<template
slot-scope=
"scope"
>
{{
scope
.
$index
+
1
}}
</
template
>
<template
slot-scope=
"scope"
>
{{
scope
.
$index
+
1
}}
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('品名')"
>
<el-table-column
:label=
"$t('品名')"
width=
"180px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<
span>
{{
getProdTypeName
(
row
.
prodType
)
}}
</span
>
<
div>
{{
getProdTypeName
(
row
.
prodType
)
}}
</div
>
<
span>
{{
row
.
prodTitleZh
}}
/
{{
row
.
prodTitleEn
}}
</span
>
<
div>
{{
row
.
prodTitleZh
}}
/
{{
row
.
prodTitleEn
}}
</div
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
<!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
<el-table-column
:label=
"$t('品牌')"
width=
"90px"
>
<el-table-column
:label=
"$t('品牌')"
width=
"90px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<template
v-if=
"row.
brandName"
>
{{
row
.
b
randName
}}
</
template
>
<template
v-if=
"row.
checkBrandName"
>
{{
row
.
checkB
randName
}}
</
template
>
<dict-tag
v-else
:type=
"DICT_TYPE.ECW_IS_BRAND"
:value=
"row.brandType"
/>
<dict-tag
v-else
:type=
"DICT_TYPE.ECW_IS_BRAND"
:value=
"row.brandType"
/>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('特性')"
width=
"
9
0px"
>
<el-table-column
:label=
"$t('特性')"
width=
"
12
0px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
{{
showAttrText
(
row
.
warehouseInInfoVO
?
row
.
warehouseInProdAttrIds
:
row
.
prodAttrIds
)
}}
{{
showAttrText
(
row
.
warehouseInInfoVO
?
row
.
warehouseInProdAttrIds
:
row
.
prodAttrIds
)
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('装柜/出货信息')"
width=
"
9
0px"
>
<el-table-column
:label=
"$t('装柜/出货信息')"
width=
"
15
0px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<div
v-if=
"row.warehouseInInfoVO"
>
<div
v-if=
"row.warehouseInInfoVO"
>
{{
row
.
warehouseInInfoVO
.
cartonsNum
}}{{
$t
(
'
箱
'
)
}}
{{
row
.
warehouseInInfoVO
.
cartonsNum
}}{{
$t
(
'
箱
'
)
}}
...
@@ -172,33 +189,25 @@ export default {
...
@@ -172,33 +189,25 @@ export default {
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"sumNum"
:label=
"$t('到仓信息')"
width=
"
9
0px"
>
<el-table-column
prop=
"sumNum"
:label=
"$t('到仓信息')"
width=
"
15
0px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<div
v-if=
"row.warehouse
In
InfoVO"
>
<div
v-if=
"row.warehouse
Check
InfoVO"
>
{{
row
.
warehouse
In
InfoVO
.
cartonsNum
}}{{
$t
(
'
箱
'
)
}}
{{
row
.
warehouse
Check
InfoVO
.
cartonsNum
}}{{
$t
(
'
箱
'
)
}}
{{
row
.
warehouse
In
InfoVO
.
weight
}}
Kg
{{
row
.
warehouse
Check
InfoVO
.
weight
}}
Kg
{{
row
.
warehouse
In
InfoVO
.
volume
}}
m³
{{
row
.
warehouse
Check
InfoVO
.
volume
}}
m³
{{
row
.
warehouse
InInfoVO
.
quantityAll
}}{{
$t
(
'
个
'
)
}}
{{
row
.
warehouse
CheckInfoVO
.
quantity
}}{{
$t
(
'
个
'
)
}}
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('到仓时间')"
>
<el-table-column
:label=
"$t('到仓时间')"
width=
"150px"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
unloadTime
|
parseTime
}}
{{
parseTime
(
row
.
warehouseCheckInfoVO
.
checkTime
)
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('异常类型')"
>
<el-table-column
:label=
"$t('异常类型')"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<div
v-for=
"(exception, i) in row.itemException"
:key=
"i"
:src=
"row.itemException"
>
<div
v-for=
"(itemException, i) in row.itemExceptionList"
:key=
"i"
:src=
"row.itemExceptionList"
>
<router-link
<el-button
type=
"text"
size=
"small"
@
click=
"handleError(row)"
>
{{
itemException
.
exceptionType
}}
-
{{
itemException
.
result
}}
</el-button>
:to=
"
{
path: '/exception/detail',
query: { id: exception.id }
}"
class="link-type"
>
<span>
{{
exception
.
msg
}}
</span>
</router-link>
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
...
src/views/ecw/order/components/DetailProd.vue
View file @
bc21d9ab
...
@@ -250,8 +250,8 @@ export default {
...
@@ -250,8 +250,8 @@ export default {
</el-table-column>
</el-table-column>
<el-table-column
prop=
"prodTitleZh"
:label=
"$t('品名')"
>
<el-table-column
prop=
"prodTitleZh"
:label=
"$t('品名')"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<
span>
{{
getProdTypeName
(
row
.
prodType
)
}}
</span
>
<
div>
{{
getProdTypeName
(
row
.
prodType
)
}}
</div
>
<
span>
{{
row
.
prodTitleZh
}}
/
{{
row
.
prodTitleEn
}}
</span
>
<
div>
{{
row
.
prodTitleZh
}}
/
{{
row
.
prodTitleEn
}}
</div
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
<!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
...
...
src/views/ecw/order/detail.vue
View file @
bc21d9ab
...
@@ -326,19 +326,20 @@
...
@@ -326,19 +326,20 @@
</el-table>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
:label=
"$t('到仓详情')"
name=
"seven"
>
<el-tab-pane
:label=
"$t('到仓详情')"
name=
"seven"
>
<check-detail-prod
:list=
"
order
CheckInfoData"
<check-detail-prod
:list=
"
warehouse
CheckInfoData"
:attr-list=
"attrList"
:attr-list=
"attrList"
:prod-type-list=
"prodTypeList"
:prod-type-list=
"prodTypeList"
:currency-map=
"currencyMap"
:currency-map=
"currencyMap"
:unit-map=
"unitMap"
:unit-map=
"unitMap"
:transport-id=
"order.transportId"
:transport-id=
"order.transportId"
:unload-time=
"order.unloadTime|parseTime"
></check-detail-prod>
></check-detail-prod>
</el-tab-pane>
</el-tab-pane>
<!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 -->
<!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 -->
<el-tab-pane
:label=
"$t('操作日志')"
name=
"five"
v-if=
"checkPermi(['ecw:order:logs'])"
>
<el-tab-pane
:label=
"$t('操作日志')"
name=
"five"
v-if=
"checkPermi(['ecw:order:logs'])"
>
<el-table
:data=
"logs"
v-loading=
"logsLoading"
>
<el-table
:data=
"logs"
v-loading=
"logsLoading"
>
<el-table-column
:label=
"$t('时间')"
width=
"150"
>
<el-table-column
:label=
"$t('时间')"
width=
"150"
>
<
template
slot-scope=
"{row}"
>
{{
parseTime
(
row
.
createTime
)
}}
</
template
>
<
template
slot-scope=
"{row}"
>
{{
row
.
createTime
|
parseTime
}}
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('操作人')"
prop=
"creatorName"
width=
"150"
>
</el-table-column>
<el-table-column
:label=
"$t('操作人')"
prop=
"creatorName"
width=
"150"
>
</el-table-column>
<el-table-column
:label=
"$t('操作人类型')"
width=
"100"
>
<el-table-column
:label=
"$t('操作人类型')"
width=
"100"
>
...
@@ -410,7 +411,7 @@
...
@@ -410,7 +411,7 @@
<
/template
>
<
/template
>
<
script
>
<
script
>
import
{
getOrder
,
operateLogPage
,
getOrderItemDeleted
,
getOrderCheckInfo
}
from
'
@/api/ecw/order
'
import
{
getOrder
,
operateLogPage
,
getOrderItemDeleted
}
from
'
@/api/ecw/order
'
import
{
getDictDatas
,
DICT_TYPE
,
getDictData
}
from
'
@/utils/dict
'
;
import
{
getDictDatas
,
DICT_TYPE
,
getDictData
}
from
'
@/utils/dict
'
;
import
PrintWarehouseReceipt
from
'
./components/PrintWarehouseReceipt
'
import
PrintWarehouseReceipt
from
'
./components/PrintWarehouseReceipt
'
import
PrintLadingBill
from
'
./components/PrintLadingBill
'
import
PrintLadingBill
from
'
./components/PrintLadingBill
'
...
@@ -497,7 +498,7 @@ export default {
...
@@ -497,7 +498,7 @@ export default {
packAfterData
:
null
,
//显示打包历史详情
packAfterData
:
null
,
//显示打包历史详情
attrList
:
[],
attrList
:
[],
orderItemDeletedData
:[],
//退仓品名
orderItemDeletedData
:[],
//退仓品名
order
CheckInfoData
:[],
//到仓详情
warehouse
CheckInfoData
:[],
//到仓详情
prodTypeList
:[],
//商品类型列表
prodTypeList
:[],
//商品类型列表
type
:
1
type
:
1
}
}
...
@@ -579,7 +580,6 @@ export default {
...
@@ -579,7 +580,6 @@ export default {
this
.
getOrder
();
this
.
getOrder
();
this
.
getOfferNumber
()
this
.
getOfferNumber
()
this
.
getOrderItemDeleted
()
this
.
getOrderItemDeleted
()
this
.
getOrderCheckInfo
()
this
.
getProdTypeList
();
this
.
getProdTypeList
();
}
}
...
@@ -599,6 +599,7 @@ export default {
...
@@ -599,6 +599,7 @@ export default {
handleChange
(
val
){
handleChange
(
val
){
this
.
showText
=
val
.
length
>
0
?
this
.
$t
(
'
隐藏
'
)
:
this
.
$t
(
'
显示更多
'
)
this
.
showText
=
val
.
length
>
0
?
this
.
$t
(
'
隐藏
'
)
:
this
.
$t
(
'
显示更多
'
)
}
,
}
,
getAirCompany
(){
getAirCompany
(){
getSupplier
(
this
.
order
.
airlineCompany
).
then
(
res
=>
{
getSupplier
(
this
.
order
.
airlineCompany
).
then
(
res
=>
{
this
.
$set
(
this
.
order
,
'
companyName
'
,
this
.
$l
(
res
.
data
,
'
company
'
))
this
.
$set
(
this
.
order
,
'
companyName
'
,
this
.
$l
(
res
.
data
,
'
company
'
))
...
@@ -618,6 +619,12 @@ export default {
...
@@ -618,6 +619,12 @@ export default {
getOrder
(
that
.
orderId
).
then
(
response
=>
{
getOrder
(
that
.
orderId
).
then
(
response
=>
{
that
.
order
=
response
.
data
;
that
.
order
=
response
.
data
;
if
(
that
.
order
.
airlineCompany
)
that
.
getAirCompany
()
if
(
that
.
order
.
airlineCompany
)
that
.
getAirCompany
()
for
(
let
index
in
this
.
order
.
orderItemVOList
)
{
let
item
=
this
.
order
.
orderItemVOList
[
index
];
if
(
item
.
warehouseCheckInfoVO
)
{
this
.
warehouseCheckInfoData
.
push
(
item
)
}
}
}
);
}
);
}
,
}
,
//退仓品名
//退仓品名
...
@@ -628,14 +635,6 @@ export default {
...
@@ -628,14 +635,6 @@ export default {
that
.
orderItemDeletedData
=
response
.
data
;
that
.
orderItemDeletedData
=
response
.
data
;
}
);
}
);
}
,
}
,
getOrderCheckInfo
(){
let
that
=
this
// TODO 待提供执行查询接口
// getOrderCheckInfo(that.orderId).then(response =>
{
getOrderItemDeleted
(
that
.
orderId
).
then
(
response
=>
{
that
.
orderCheckInfoData
=
response
.
data
;
}
);
}
,
/** 获取产品类型列表 */
/** 获取产品类型列表 */
getProdTypeList
()
{
getProdTypeList
()
{
getProductTypeList
().
then
((
response
)
=>
{
getProductTypeList
().
then
((
response
)
=>
{
...
...
src/views/ecw/order/index.vue
View file @
bc21d9ab
...
@@ -329,9 +329,9 @@
...
@@ -329,9 +329,9 @@
>
>
<el-button
type=
"text"
>
{{
$t
(
"
操作
"
)
}}
</el-button>
<el-button
type=
"text"
>
{{
$t
(
"
操作
"
)
}}
</el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-menu
slot=
"dropdown"
>
<!--出货订单编辑,shipmentState > 0表示出货后,inWarehouseState == 0 表示预装未审核
,或者是卸柜到仓
)-->
<!--出货订单编辑,shipmentState > 0表示出货后,inWarehouseState == 0 表示预装未审核
或者是卸柜到仓 , shipmentState==307 表示已预装,待封柜, shipmentState==407 表示已预装,待封柜
)-->
<template
<template
v-if=
"scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0"
v-if=
"scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0
&& scope.row.shipmentState != 307 && scope.row.shipmentState != 407
"
>
>
<el-dropdown-item
<el-dropdown-item
@
click.native=
"handleUpdate(scope.row)"
@
click.native=
"handleUpdate(scope.row)"
...
...
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