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
d1e448f7
Commit
d1e448f7
authored
Oct 29, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加订单详情中到仓详情页签
parent
f1387b0a
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
428 additions
and
2 deletions
+428
-2
order.js
src/api/ecw/order.js
+8
-0
CheckDetailProd.vue
src/views/ecw/order/CheckDetailProd.vue
+399
-0
detail.vue
src/views/ecw/order/detail.vue
+21
-2
No files found.
src/api/ecw/order.js
View file @
d1e448f7
...
...
@@ -1052,6 +1052,14 @@ export function getOrderItemDeleted(orderId){
})
}
//退仓品名列表
export
function
getOrderCheckInfo
(
orderId
){
return
request
({
url
:
'
/ecw/order/order-check-info/
'
+
orderId
,
method
:
'
get
'
,
})
}
// 打包页面订单数据统计
export
function
getPackStatistics
(
orderId
){
return
request
({
...
...
src/views/ecw/order/CheckDetailProd.vue
0 → 100644
View file @
d1e448f7
This diff is collapsed.
Click to expand it.
src/views/ecw/order/detail.vue
View file @
d1e448f7
...
...
@@ -323,6 +323,14 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane
:label=
"$t('到仓详情')"
name=
"seven"
>
<check-detail-prod
:list=
"orderCheckInfoData"
:attr-list=
"attrList"
:currency-map=
"currencyMap"
:unit-map=
"unitMap"
:transport-id=
"order.transportId"
></check-detail-prod>
</el-tab-pane>
<!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 -->
<el-tab-pane
:label=
"$t('操作日志')"
name=
"five"
v-if=
"checkPermi(['ecw:order:logs'])"
>
<el-table
:data=
"logs"
v-loading=
"logsLoading"
>
...
...
@@ -399,7 +407,7 @@
<
/template
>
<
script
>
import
{
getOrder
,
operateLogPage
,
getOrderItemDeleted
}
from
'
@/api/ecw/order
'
import
{
getOrder
,
operateLogPage
,
getOrderItemDeleted
,
getOrderCheckInfo
}
from
'
@/api/ecw/order
'
import
{
getDictDatas
,
DICT_TYPE
,
getDictData
}
from
'
@/utils/dict
'
;
import
PrintWarehouseReceipt
from
'
./components/PrintWarehouseReceipt
'
import
PrintLadingBill
from
'
./components/PrintLadingBill
'
...
...
@@ -423,11 +431,13 @@ import {getSupplier} from "@/api/ecw/supplier";
import
{
getProductAttrList
}
from
"
@/api/ecw/productAttr
"
;
import
Decimal
from
'
decimal.js
'
import
DetailProd
from
'
@/views/ecw/order/components/DetailProd.vue
'
import
CheckDetailProd
from
'
@/views/ecw/order/components/CheckDetailProd.vue
'
export
default
{
name
:
"
detail
"
,
components
:
{
DetailProd
,
CheckDetailProd
,
ImageDisplay
,
OperateLogDetail
,
PrintWarehouseReceipt
,
PrintLadingBill
,
...
...
@@ -483,6 +493,7 @@ export default {
packAfterData
:
null
,
//显示打包历史详情
attrList
:
[],
orderItemDeletedData
:[],
//退仓品名
orderCheckInfoData
:[],
//到仓详情
type
:
1
}
}
,
...
...
@@ -563,6 +574,7 @@ export default {
this
.
getOrder
();
this
.
getOfferNumber
()
this
.
getOrderItemDeleted
()
this
.
getOrderCheckInfo
()
}
getCurrencyList
().
then
(
res
=>
this
.
currencyList
=
res
.
data
)
...
...
@@ -591,7 +603,7 @@ export default {
this
.
showMore
=
!
this
.
showMore
;
this
.
consigneeText
=
this
.
showMore
?
this
.
$t
(
'
隐藏
'
)
:
this
.
$t
(
'
更多
'
)
}
,
/** 查询列表 */
getOrder
()
{
let
that
=
this
...
...
@@ -610,6 +622,13 @@ export default {
that
.
orderItemDeletedData
=
response
.
data
;
}
);
}
,
getOrderCheckInfo
(){
let
that
=
this
// 执行查询
getOrderCheckInfo
(
that
.
orderId
).
then
(
response
=>
{
that
.
orderCheckInfoData
=
response
.
data
;
}
);
}
,
/* loadBrands(){
let brandIds = []
this.form.orderItemVOList.forEach(item => {
...
...
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