Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinjianhui
factory_front
Commits
1a32910e
Commit
1a32910e
authored
May 14, 2024
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
待质检修改
parent
cb427077
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
488 additions
and
56 deletions
+488
-56
components.d.ts
+1
-0
src/types/api/order.ts
+5
-1
src/views/order/ProductInfoInspected.vue
+223
-0
src/views/order/Quarantine.vue
+36
-7
src/views/order/index.vue
+223
-48
No files found.
components.d.ts
View file @
1a32910e
...
...
@@ -20,6 +20,7 @@ declare module 'vue' {
ElForm
:
typeof
import
(
'element-plus/es'
)[
'ElForm'
]
ElFormItem
:
typeof
import
(
'element-plus/es'
)[
'ElFormItem'
]
ElIcon
:
typeof
import
(
'element-plus/es'
)[
'ElIcon'
]
ElImage
:
typeof
import
(
'element-plus/es'
)[
'ElImage'
]
ElInput
:
typeof
import
(
'element-plus/es'
)[
'ElInput'
]
ElMenu
:
typeof
import
(
'element-plus/es'
)[
'ElMenu'
]
ElMenuItem
:
typeof
import
(
'element-plus/es'
)[
'ElMenuItem'
]
...
...
src/types/api/order.ts
View file @
1a32910e
...
...
@@ -5,6 +5,9 @@ export interface SearchForm {
endProductId
:
string
orderNumber
:
string
shopNumber
:
string
logisticsTracking
:
string
lanshouName
:
string
billNumber
:
string
internalMemo
:
string
status
?:
number
subOrderNumber
:
string
...
...
@@ -54,6 +57,7 @@ export interface OrderData {
internalMemoList
?:
MemoList
[]
substrateAreaName
?:
string
productList
?:
ProductList
[]
detailList
?:
ProductList
[]
delayMinDay
?:
number
shipmentList
?:
string
sourceType
?:
string
...
...
@@ -182,6 +186,7 @@ export interface QaData {
variantImage
?:
string
num
?:
number
shipmentNum
?:
number
shippingWay
?:
number
productName
?:
string
logisticsTracking
?:
string
lanshouName
?:
string
...
...
@@ -193,7 +198,6 @@ export interface QaData {
notPassNum
?:
number
version
?:
number
factorySubOrderNumber
?:
string
shippingWay
?:
string
inspectionStatus
?:
boolean
source
?:
string
sourceType
?:
string
...
...
src/views/order/ProductInfoInspected.vue
0 → 100644
View file @
1a32910e
<
template
>
<div
v-for=
"item in row.detailList?.slice(
0,
row.moreable || isDetail ? row.detailList.length : 2,
)"
:key=
"item.id"
class=
"order-list-expand_item"
>
<div
class=
"order-list-expand_item_img"
>
<img
:src=
"item.variantImage"
style=
"width: 100%; height: 100%"
/>
</div>
<div
class=
"order-list-expand_item_info"
>
<div
class=
"order-list-expand_item_info_title"
style=
"font-weight: bold"
>
<span
class=
"order-list-expand_item_label"
>
商品名:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
productName
||
'--'
}}
</span>
</div>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
Base SKU:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
baseSku
||
'--'
}}
<el-icon
class=
"icon"
@
click=
"copy(item.baseSku || '')"
><DocumentCopy
/></el-icon
></span>
</div>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
Variant SKU:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
variantSku
||
'--'
}}
<el-icon
class=
"icon"
@
click=
"copy(item.variantSku || '')"
><DocumentCopy
/></el-icon>
</span>
</div>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
店铺单号:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
shopNumber
||
'--'
}}
<el-icon
class=
"icon"
@
click=
"copy(item.shopNumber || '')"
><DocumentCopy
/></el-icon>
</span>
</div>
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
店铺单号:
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
--
>
<!-- >
{{
item
.
shopNumber
||
'--'
}}
-->
<!--
<el-icon
class=
"icon"
@
click=
"copy(item.shopNumber || '')"
--
>
<!-- >
<DocumentCopy-->
<!-- />
</el-icon>
-->
<!--
</span>
-->
<!--
</div>
-->
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
生产单号:
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
--
>
<!-- >
{{
item
.
subOrderNumber
||
'--'
-->
<!--
}}
<el-icon
class=
"icon"
@
click=
"copy(item.subOrderNumber || '')"
--
>
<!-- >
<DocumentCopy-->
<!-- />
</el-icon>
-->
<!--
</span>
-->
<!--
</div>
-->
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
发货状态:
</span>
-->
<!--
<span-->
<!-- v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!--
<el-tag
effect=
"dark"
type=
"success"
>
已发货
</el-tag>
-->
<!--
</span>
-->
<!--
<span-->
<!-- v-if="-->
<!-- item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0) &&-->
<!-- (item.shipmentNum || 0) > 0-->
<!-- "-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!--
<el-tag
effect=
"dark"
>
部分发货
</el-tag>
-->
<!--
</span>
-->
<!--
<span-->
<!-- v-if="item.shipmentNum === 0"-->
<!-- class="order-list-expand_item_value"-->
<!-- >-->
<!--
<el-tag
effect=
"dark"
type=
"danger"
>
未发货
</el-tag>
-->
<!--
</span>
-->
<!--
</div>
-->
</div>
<div
class=
"order-list-expand_item_price"
>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
生产单号:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
subOrderNumber
||
'--'
}}
</span>
</div>
<!--
<div
class=
"order-list-expand_item_info_title font-bold"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
工厂单号:
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
>
{{
item
.
factorySubOrderNumber
||
'--'
}}
</span>
-->
<!--
</div>
-->
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
发货数量:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
item
.
shipmentNum
||
0
}}
</span>
</div>
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
未发数:
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
>
{{
-->
<!--
(
item
.
num
||
0
)
-
((
item
.
shipmentNum
||
0
)
-
(
item
.
notPassNum
||
0
))
-->
<!--
}}
</span>
-->
<!--
</div>
-->
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
待质检:
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
>
{{
-->
<!--
(
item
.
shipmentNum
||
0
)
-
-->
<!--
((
item
.
passNum
||
0
)
+
(
item
.
notPassNum
||
0
))
-->
<!--
}}
</span>
-->
<!--
</div>
-->
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
质检(通过):
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
>
{{
-->
<!--
item
.
passNum
||
0
-->
<!--
}}
</span>
-->
<!--
</div>
-->
<!--
<div
class=
"order-list-expand_item_info_title"
>
-->
<!--
<span
class=
"order-list-expand_item_label"
>
质检(不通过):
</span>
-->
<!--
<span
class=
"order-list-expand_item_value"
>
{{
-->
<!--
item
.
notPassNum
||
0
-->
<!--
}}
</span>
-->
<!--
</div>
-->
<div
v-if=
"
(status === 3 || status === 4 || status === 2) &&
(item.shipmentNum === 0 ||
item.num !== (item.shipmentNum || 0) - (item.notPassNum || 0))
"
class=
"order-list-expand_item_info_title"
>
<el-button
type=
"success"
size=
"small"
@
click=
"downloadManuscriptBySubOrder(item)"
>
下载稿件
</el-button
>
</div>
</div>
</div>
</
template
>
<
script
setup
lang=
"ts"
>
import
{
DocumentCopy
}
from
'@element-plus/icons-vue'
import
{
filePath
}
from
'@/api/axios'
import
{
downloadOrder
}
from
'@/api/order'
import
{
OrderData
,
ProductList
}
from
'@/types/api/order'
import
{
showError
}
from
'@/utils/ui'
import
{
PropType
}
from
'vue'
defineProps
({
row
:
{
type
:
Object
as
PropType
<
OrderData
>
,
default
:
()
=>
{},
},
isDetail
:
{
type
:
Boolean
,
default
:
false
,
},
status
:
{
type
:
Number
,
},
})
const
downloadManuscriptBySubOrder
=
async
(
item
:
ProductList
)
=>
{
try
{
const
res
=
await
downloadOrder
(
item
.
id
)
window
.
open
(
filePath
+
res
.
message
)
}
catch
(
e
)
{
showError
(
e
)
}
}
const
copy
=
(
text
:
string
)
=>
{
navigator
.
clipboard
.
writeText
(
text
)
ElMessage
.
success
(
'复制成功'
)
}
</
script
>
<
style
lang=
"scss"
scoped
>
.order-list-expand_item
{
display
:
flex
;
border-bottom
:
1px
solid
#eee
;
padding
:
20px
;
}
.order-list-expand_item
:last-child
{
border-bottom
:
0
;
}
.order-list-expand_item_img
{
width
:
100px
;
height
:
100px
;
margin-right
:
20px
;
border
:
1px
solid
#eee
;
}
.order-list-expand_item_info
{
flex
:
1
;
margin-right
:
20px
;
}
.order-list-expand_item_price
{
width
:
180px
;
}
.order-list-expand_item_info_title
{
line-height
:
26px
;
display
:
flex
;
}
.order-list-expand_item_label
{
margin-right
:
6px
;
}
.order-list-expand_item_value
{
flex
:
1
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
</
style
>
src/views/order/Quarantine.vue
View file @
1a32910e
...
...
@@ -61,14 +61,14 @@
>
<
template
#
default
=
"{ row
}
"
>
<
span
v
-
if
=
"row.num === row.shipmentNum - row.notPassNum"
>
已发货
<
/spa
n
>
已发货
<
/spa
n
>
<
span
v
-
else
-
if
=
"
row.num !== row.shipmentNum - row.notPassNum &&
row.shipmentNum > 0
"
>
部分发货
<
/spa
n
>
部分发货
<
/spa
n
>
<
span
v
-
else
-
if
=
"row.shipmentNum === 0"
>
未发货
<
/span
>
<
/template
>
...
...
@@ -109,8 +109,10 @@
font-weight: bold;
vertical-align: middle;
"
><
CircleCheck
/><
/el-icon
>
>
<
CircleCheck
/>
<
/el-icon
>
<
el
-
icon
v
-
if
=
"!row.isCheck"
style
=
"
...
...
@@ -119,8 +121,10 @@
font-weight: bold;
vertical-align: middle;
"
><
CircleClose
/><
/el-icon
>
>
<
CircleClose
/>
<
/el-icon
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
...
...
@@ -175,10 +179,24 @@
<
span
class
=
"value"
>
{{
(
currentRow
.
lanshouRegion
||
''
)
+
(
currentRow
.
lanshouAddress
||
''
)
||
'--'
(
currentRow
.
lanshouAddress
||
''
)
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"left-qa-order-basic-info_item"
>
<
span
class
=
"label"
>
发货方式
:
<
/span
>
<
span
class
=
"value"
>
{{
currentRow
.
shippingWay
==
1
?
'送货上门'
:
'快递'
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"left-qa-order-basic-info_item"
>
<
span
class
=
"label"
>
物流跟踪号
:
<
/span
>
<
span
class
=
"value"
>
{{
currentRow
.
logisticsTracking
||
'--'
}}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"left-qa-order-image-info"
>
...
...
@@ -263,6 +281,7 @@ import { CircleClose, CircleCheck } from '@element-plus/icons-vue'
import
useQuarantine
from
'./hook/useQuarantine'
import
{
PropType
}
from
'vue'
import
{
QaData
}
from
'@/types/api/order'
const
props
=
defineProps
({
quarantine
:
{
type
:
Object
as
PropType
<
ReturnType
<
typeof
useQuarantine
>>
,
...
...
@@ -315,17 +334,21 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
flex
-
direction
:
column
;
gap
:
10
px
;
}
.
right
-
qa
-
order_top
{
display
:
flex
;
}
.
right
-
qa
-
order_top_tab
{
border
:
1
px
solid
#
eee
;
padding
:
6
px
20
px
;
cursor
:
pointer
;
}
.
right
-
qa
-
order_top_tab
:
first
-
child
{
border
-
right
:
none
;
}
.
right
-
qa
-
order_top_tab
:
nth
-
child
(
2
)
{
border
-
right
:
none
;
}
...
...
@@ -368,6 +391,7 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
font
-
weight
:
bold
;
color
:
red
;
}
.
qa
-
pass
-
btn
{
border
:
1
px
solid
#
eee
;
padding
:
8
px
20
px
;
...
...
@@ -383,12 +407,14 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
color
:
#
fff
;
margin
-
bottom
:
10
px
;
}
.
qa
-
pass
-
btn
.
primary
{
background
-
color
:
#
409
eff
;
border
-
color
:
#
409
eff
;
color
:
#
fff
;
margin
-
bottom
:
10
px
;
}
.
qa
-
pass
-
btn
.
success
{
background
-
color
:
#
67
c23a
;
border
-
color
:
#
67
c23a
;
...
...
@@ -413,13 +439,16 @@ const tableRowClassName = ({ row }: { row: QaData }) => {
:
deep
(.
el
-
table__cell
)
{
padding
:
0
;
}
:
deep
(.
el
-
table__row
)
{
font
-
size
:
12
px
;
}
:
deep
(.
current
-
row
-
active
)
{
background
-
color
:
#
409
eff
!
important
;
color
:
#
fff
;
}
:
deep
(
.
el
-
table
--
enable
-
row
-
transition
.
el
-
table__body
...
...
src/views/order/index.vue
View file @
1a32910e
...
...
@@ -59,6 +59,32 @@
@
blur=
"searchForm.internalMemo = searchForm.internalMemo.trim()"
></ElInput>
</ElFormItem>
<ElFormItem
v-if=
"statusCode===6"
label=
"物流跟踪号"
>
<ElInput
v-model=
"searchForm.logisticsTracking"
placeholder=
"物流跟踪号"
clearable
style=
"width: 160px"
@
blur=
"searchForm.logisticsTracking = searchForm.logisticsTracking.trim()"
></ElInput>
</ElFormItem>
<ElFormItem
v-if=
"statusCode===6"
label=
"发货单号"
>
<ElInput
v-model=
"searchForm.billNumber"
placeholder=
"发货单号"
clearable
style=
"width: 160px"
@
blur=
"searchForm.billNumber = searchForm.billNumber.trim()"
></ElInput>
</ElFormItem>
<ElFormItem
v-if=
"statusCode===6"
label=
"收货人"
>
<ElInput
v-model=
"searchForm.lanshouName"
placeholder=
"收货人"
clearable
style=
"width: 160px"
></ElInput>
</ElFormItem>
<ElFormItem>
<ElButton
type=
"primary"
@
click=
"search"
>
查询
</ElButton>
</ElFormItem>
...
...
@@ -94,7 +120,7 @@
class
=
"item"
>
<
ElButton
type
=
"warning"
is
-
dark
@
click
=
"downloadManuscript"
>
下载稿件
<
/ElButto
n
>
下载稿件
<
/ElButto
n
>
<
/span
>
<
span
...
...
@@ -102,12 +128,12 @@
class
=
"item"
>
<
ElButton
type
=
"success"
is
-
dark
@
click
=
"reGenerateManuscript"
>
更新稿件
<
/ElButto
n
>
更新稿件
<
/ElButto
n
>
<
/span
>
<
span
v
-
if
=
"statusCode === 2 || statusCode === 3"
class
=
"item"
>
<
ElButton
type
=
"primary"
dark
@
click
=
"printManuscript"
>
打印生产单
<
/ElButto
n
>
打印生产单
<
/ElButto
n
>
<
/span
>
<
span
...
...
@@ -115,12 +141,12 @@
class
=
"item"
>
<
ElButton
type
=
"success"
dark
@
click
=
"exportManuscript"
>
导出生产单
<
/ElButto
n
>
导出生产单
<
/ElButto
n
>
<
/span
>
<
span
class
=
"item"
>
<
ElButton
type
=
"warning"
@
click
=
"addInternalTag"
>
添加内部标签
<
/ElButto
n
>
添加内部标签
<
/ElButto
n
>
<
/span
>
<
span
...
...
@@ -128,7 +154,7 @@
class
=
"item"
>
<
ElButton
type
=
"primary"
@
click
=
"refreshProduct"
>
刷新商品信息
<
/ElButto
n
>
刷新商品信息
<
/ElButto
n
>
<
/span
>
<
span
v
-
if
=
"statusCode === 3 || statusCode === 4"
class
=
"item"
>
...
...
@@ -145,6 +171,7 @@
class
=
"order-list flex-1 overflow-hidden"
>
<
ElTable
v
-
show
=
"statusCode!==6"
:
data
=
"tableData"
:
span
-
method
=
"arraySpanMethod"
default
-
expand
-
all
...
...
@@ -153,9 +180,9 @@
@
selection
-
change
=
"handleSelectionChange"
>
<
ElTableColumn
type
=
"selection"
width
=
"50"
><
/ElTableColumn
>
<
ElTableColumn
type
=
"expand"
width
=
"1"
>
<
template
#
default
=
"{ row
}
"
>
<
div
class
=
"table-expand"
>
<
ElTableColumn
type
=
"expand"
width
=
"1"
>
<
template
#
default
=
"{ row
}
"
>
<
div
v
-
if
=
"row.productList"
class
=
"table-expand"
>
<
div
class
=
"order-list-expand"
:
style
=
"{ width: `${thOrderDetailWidth + 50
}
px`
}
"
...
...
@@ -166,14 +193,14 @@
<
span
@
click
=
"openAll(row)"
>
<
template
v
-
if
=
"!row.moreable"
>
展开全部
<
strong
style
=
"color: red"
>
({{
row
.
productList
.
length
}}
)
<
/stron
g
>
条商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowDown
/><
/el-ico
n
>
({{
row
.
productList
.
length
}}
)
<
/stron
g
>
条商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowDown
/><
/el-ico
n
><
/template
>
<
template
v
-
else
>
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowUp
/><
/el-icon
>
><
ArrowUp
/><
/el-icon
>
<
/template
>
<
/span
>
<
/div
>
...
...
@@ -184,22 +211,22 @@
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
商品价
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
productAmount
}}
<
/span
>
row
.
productAmount
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
小计
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
totalAmount
||
'--'
}}
<
/span
>
row
.
totalAmount
||
'--'
}}
<
/span
>
<
/div
>
<
div
v
-
if
=
"row.totolBuyNumber"
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_value"
>
共
{{
row
.
totolBuyNumber
}}
件
<
/spa
n
>
共
{{
row
.
totolBuyNumber
}}
件
<
/spa
n
>
<
/div
>
<
/div
>
...
...
@@ -233,36 +260,35 @@
<
div
class
=
"order-time_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
创建时间
:
<
/spa
n
>
创建时间
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
createTime
||
'--'
}}
<
/span
>
row
.
createTime
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
确认时间
:
<
/spa
n
>
确认时间
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
startStockingTime
||
'--'
}}
<
/span
>
row
.
startStockingTime
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
完成时间
:
<
/spa
n
>
完成时间
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
finishTime
||
'--'
}}
<
/span
>
row
.
finishTime
||
'--'
}}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"order-operate"
>
<
div
class
=
"order-operate_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
ElButton
text
type
=
"primary"
@
click
=
"openDetail(row.id)"
>
查看详情
>
查看详情
<
/ElButton
>
<
/div
>
<
div
...
...
@@ -273,13 +299,13 @@
text
type
=
"primary"
@
click
=
"openShipment(row.id)"
>
查看发货单
>
查看发货单
<
/ElButton
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
ElButton
text
type
=
"primary"
@
click
=
"openLog(row.id)"
>
操作日志
>
操作日志
<
/ElButton
>
<
/div
>
<
div
...
...
@@ -287,12 +313,13 @@
class
=
"order-list-expand_item_info_title"
>
<
ElButton
text
type
=
"danger"
@
click
=
"cancelOrder(row.id)"
>
取消
>
取消
<
/ElButton
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/template
>
<
/ElTableColumn
>
<
ElTableColumn
...
...
@@ -301,7 +328,7 @@
class
-
name
=
"th-order-detail"
min
-
width
=
"800"
>
<
template
#
default
=
"scope"
>
<
template
#
default
=
"scope"
>
<
div
class
=
"order-detail"
>
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
订单号
:
<
/span
>
...
...
@@ -310,14 +337,14 @@
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
第三方订单号
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.erpOrderNumber"
>
{{
scope
.
row
.
erpOrderNumber
||
'--'
}}
<
/span
>
scope
.
row
.
erpOrderNumber
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
稿件下载状态
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.manuscriptStatusStr"
>
{{
scope
.
row
.
manuscriptStatusStr
||
'--'
}}
<
/span
>
scope
.
row
.
manuscriptStatusStr
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
收货人
:
<
/span
>
...
...
@@ -330,8 +357,8 @@
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
收货地址
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.lanshouAddress"
>
{{
scope
.
row
.
lanshouAddress
}}
<
/span
>
scope
.
row
.
lanshouAddress
}}
<
/span
>
<
/div
>
<
div
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
邮编
:
<
/span
>
...
...
@@ -358,6 +385,146 @@
<
ElTableColumn
label
=
"操作"
width
=
"100"
header
-
align
=
"center"
>
<
/ElTableColumn
>
<
/ElTable
>
<
ElTable
v
-
show
=
"statusCode===6"
:
data
=
"tableData"
:
span
-
method
=
"arraySpanMethod"
default
-
expand
-
all
border
style
=
"width: 100%; height: 100%"
@
selection
-
change
=
"handleSelectionChange"
>
<
ElTableColumn
type
=
"selection"
width
=
"50"
><
/ElTableColumn
>
<
ElTableColumn
label
=
"发货单号"
width
=
"280"
prop
=
"billNumber"
header
-
align
=
"center"
><
/ElTableColumn
>
<
ElTableColumn
label
=
"发货单信息"
header
-
align
=
"center"
>
<
template
#
default
=
"{row
}
"
>
<
div
v
-
if
=
"row.detailList"
class
=
"table-expand"
style
=
"margin-right: -14px;"
>
<
div
style
=
"flex: 1;flex-shrink: 0;overflow: hidden"
class
=
"order-list-expand"
>
<
ProductInfoInspected
:
row
=
"row"
:
status
=
"statusCode"
/>
<
template
v
-
if
=
"row.detailList.length > 2"
>
<
div
class
=
"order-list-expand_more"
>
<
span
@
click
=
"openAll(row)"
>
<
template
v
-
if
=
"!row.moreable"
>
展开全部
<
strong
style
=
"color: red"
>
({{
row
.
detailList
.
length
}}
)
<
/stron
g
>
条商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowDown
/><
/el-ico
n
><
/template
>
<
template
v
-
else
>
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowUp
/><
/el-icon
>
<
/template
>
<
/span
>
<
/div
>
<
/template
>
<
/div
>
<
div
class
=
"order-actual-payment"
>
<
div
class
=
"order-actual-payment_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
订单号
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
orderNumber
}}
<
/span
>
<
el
-
icon
class
=
"icon"
@
click
=
"copy(row.orderNumber || '')"
><
DocumentCopy
/><
/el-icon
>
<
/div
>
<!--
<
div
class
=
"order-list-expand_item_info_title"
>-->
<!--
<
span
class
=
"order-list-expand_item_label"
>
工厂订单号
:
<
/span>--
>
<!--
<
span
class
=
"order-list-expand_item_value"
>
{{
-->
<!--
row
.
factoryOrderNumber
||
'--'
-->
<!--
}}
<
/span>--
>
<!--
<
el
-
icon
class
=
"icon"
@
click
=
"copy(row.factoryOrderNumber || '')"
-->
<!--
><
DocumentCopy
-->
<!--
/></
el
-
icon
>-->
<!--
<
/div>--
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
发货方式
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
shippingWay
===
1
?
'送货上门'
:
'快递'
}}
<
/span
>
<
/div
>
<
div
v
-
if
=
"row.shippingWay!==1"
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
物流名称
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
carriageName
}}
<
/span
>
<
/div
>
<
div
v
-
if
=
"row.shippingWay === 2"
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
物流跟踪号
:
<
/span
>
<
span
style
=
"color: red"
class
=
"order-list-expand_item_value"
>
{{
row
.
logisticsTracking
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
发货时间
:
<
/span
>
<
span
style
=
"color: red"
class
=
"order-list-expand_item_value"
>
{{
row
.
createTime
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
收货人
:
<
/span
>
<
span
style
=
"color: red"
class
=
"order-list-expand_item_value"
>
{{
row
.
lanshouName
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
收货人电话
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
lanshouPhone
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
邮编
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
lanshouPost
||
'--'
}}
<
/span
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
收货地址
:
<
/span
>
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
lanshouRegion
+
row
.
lanshouAddress
}}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"order-operate"
>
<
div
class
=
"order-operate_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
ElButton
text
type
=
"primary"
@
click
=
"openLog(row.orderId)"
>
操作日志
<
/ElButton
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/template
>
<
/ElTableColumn
>
<
ElTableColumn
label
=
"发货单详情"
width
=
"280"
header
-
align
=
"center"
>
<
/ElTableColumn
>
<
ElTableColumn
label
=
"操作"
width
=
"100"
header
-
align
=
"center"
>
<
/ElTableColumn
>
<
/ElTable
>
<
/div
>
<
el
-
pagination
v
-
model
:
current
-
page
=
"currentPage"
...
...
@@ -393,7 +560,7 @@
type
=
"primary"
size
=
"large"
@
click
=
"searchShipmentByOrderNumber"
>
查询
>
查询
<
/el-button
>
<
/div
>
<
Shipment
...
...
@@ -462,10 +629,10 @@
<
template
#
footer
>
<
div
class
=
"dialog-footer"
>
<
el
-
button
size
=
"large"
@
click
=
"shipmentVisible = false"
>
取消
>
取消
<
/el-button
>
<
el
-
button
size
=
"large"
type
=
"primary"
@
click
=
"saveShipment"
>
发货
>
发货
<
/el-button
>
<
/div
>
<
/template
>
...
...
@@ -505,17 +672,17 @@
@
keyup
.
enter
=
"searchQaByOrderNumber"
/>
<
el
-
button
type
=
"primary"
size
=
"large"
@
click
=
"searchQaByOrderNumber"
>
查询
>
查询
<
/el-button
>
<
/div
>
<
Quarantine
:
quarantine
=
"quarantine"
/>
<
template
#
footer
>
<
div
class
=
"dialog-footer"
>
<
el
-
button
size
=
"large"
@
click
=
"quarantineVisible = false"
>
取消
>
取消
<
/el-button
>
<
el
-
button
size
=
"large"
type
=
"primary"
@
click
=
"() => saveQuarantine()"
>
质检完成
>
质检完成
<
/el-button
>
<
/div
>
<
/template
>
...
...
@@ -545,7 +712,7 @@ import type {
}
from
'@/types/api/order'
import
{
onMounted
,
reactive
,
ref
}
from
'vue'
import
useElTableColumnWidth
from
'@/utils/hooks/useElTableColumnWidth'
import
{
ArrowDown
,
ArrowUp
}
from
'@element-plus/icons-vue'
import
{
ArrowDown
,
ArrowUp
,
DocumentCopy
}
from
'@element-plus/icons-vue'
import
usePageList
from
'@/utils/hooks/usePageList'
import
{
getOrderList
,
...
...
@@ -567,6 +734,7 @@ import { filePath } from '@/api/axios'
import
{
getLogisticsCompanyList
}
from
'@/api/common'
import
type
{
FormRules
}
from
'element-plus'
import
ProductInfo
from
'./ProductInfo.vue'
import
ProductInfoInspected
from
'./ProductInfoInspected.vue'
import
SendOrder
from
'./SendOrder.vue'
import
LogList
from
'@/components/LogList.vue'
import
OrderDetail
from
'./OrderDetail.vue'
...
...
@@ -577,6 +745,9 @@ import Quarantine from './Quarantine.vue'
const
[
searchForm
,
resetSearchForm
]
=
useValue
<
SearchForm
>
({
mainSku
:
''
,
endProductId
:
''
,
logisticsTracking
:
''
,
lanshouName
:
''
,
billNumber
:
''
,
shopNumber
:
''
,
orderNumber
:
''
,
internalMemo
:
''
,
...
...
@@ -706,7 +877,10 @@ const changeTab = (item: Tab) => {
statusCode
.
value
=
item
.
statusCode
search
()
}
const
copy
=
(
text
:
string
)
=>
{
navigator
.
clipboard
.
writeText
(
text
)
ElMessage
.
success
(
'复制成功'
)
}
const
openAll
=
(
row
:
OrderData
)
=>
{
row
.
moreable
=
!
row
.
moreable
}
...
...
@@ -1128,6 +1302,7 @@ const onChangeCurrentRow = (item: ProductList) => {
.
order
-
list
-
expand_item_info_title
{
line
-
height
:
26
px
;
display
:
flex
;
align
-
items
:
center
;
}
.
order
-
list
-
expand_item_label
{
...
...
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