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
c9d64291
Commit
c9d64291
authored
Mar 08, 2025
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 工厂端修改
parent
4765943b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
300 additions
and
283 deletions
+300
-283
src/api/podOrder.ts
+3
-3
src/views/order/fastProduction.vue
+2
-3
src/views/order/pod/index.vue
+295
-277
No files found.
src/api/podOrder.ts
View file @
c9d64291
...
@@ -26,12 +26,12 @@ export function getOrderDetail(id: number) {
...
@@ -26,12 +26,12 @@ export function getOrderDetail(id: number) {
},
},
)
)
}
}
export
function
getSubOrderBySubOrderNumber
(
factory
SubOrderNumber
:
string
)
{
export
function
getSubOrderBySubOrderNumber
(
third
SubOrderNumber
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
PodProductList
>>
(
return
axios
.
get
<
never
,
BaseRespData
<
PodProductList
>>
(
'factory/podJomallOrderProduct/getSubOrderBySubOrderNumber'
,
'factory/podJomallOrderProduct/getSubOrderBy
Third
SubOrderNumber'
,
{
{
params
:
{
params
:
{
factory
SubOrderNumber
,
third
SubOrderNumber
,
},
},
},
},
)
)
...
...
src/views/order/fastProduction.vue
View file @
c9d64291
...
@@ -346,10 +346,10 @@ watch(
...
@@ -346,10 +346,10 @@ watch(
isAutoSure
.
value
=
false
isAutoSure
.
value
=
false
if
(
props
.
type
===
1
)
{
if
(
props
.
type
===
1
)
{
placeholderText
.
value
=
placeholderText
.
value
=
'扫描枪输入
生产
单号,录入下一单本单自动生产完成,最后一单扫两次完成生产'
'扫描枪输入
第三方订
单号,录入下一单本单自动生产完成,最后一单扫两次完成生产'
}
else
if
(
props
.
type
===
2
)
{
}
else
if
(
props
.
type
===
2
)
{
placeholderText
.
value
=
placeholderText
.
value
=
'扫描枪输入
生产
单号,录入下一单本单自动发货完成,最后一单扫两次完成发货'
'扫描枪输入
第三方订
单号,录入下一单本单自动发货完成,最后一单扫两次完成发货'
}
}
sendNum
.
value
=
0
sendNum
.
value
=
0
// canlogisticsList('GNKD').then((res) => {
// canlogisticsList('GNKD').then((res) => {
...
@@ -625,7 +625,6 @@ const trackcodeInput = async () => {
...
@@ -625,7 +625,6 @@ const trackcodeInput = async () => {
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
error
(
e
)
console
.
error
(
e
)
productInfo
.
value
=
{}
productInfo
.
value
=
{}
playAudio
(
'weight_search_error'
)
nextTick
(()
=>
{
nextTick
(()
=>
{
if
(
trackingNumberRef
.
value
)
{
if
(
trackingNumberRef
.
value
)
{
;(
trackingNumberRef
.
value
as
HTMLInputElement
).
focus
()
;(
trackingNumberRef
.
value
as
HTMLInputElement
).
focus
()
...
...
src/views/order/pod/index.vue
View file @
c9d64291
...
@@ -175,227 +175,256 @@
...
@@ -175,227 +175,256 @@
<
ElButton
type
=
"danger"
@
click
=
"voidedBtn"
>
作废
<
/ElButton
>
<
ElButton
type
=
"danger"
@
click
=
"voidedBtn"
>
作废
<
/ElButton
>
<
/span> --
>
<
/span> --
>
<
/div
>
<
/div
>
<
div
<
template
v
-
if
=
"['IN_PRODUCTION', 'WAIT_SHIPMENT'].includes(status)"
>
v
-
if
=
"['IN_PRODUCTION', 'WAIT_SHIPMENT'].includes(status)"
<
div
class
=
"card-mode"
v
-
if
=
"CardOrderList.length"
>
v
-
loading
=
"loading"
<
div
v
-
loading
=
"loading"
class
=
"card-list"
>
element
-
loading
-
text
=
"加载中..."
<
div
class
=
"card-mode"
v
-
for
=
"cardItem in CardOrderList"
>
:
key
=
"cardItem.id"
<
div
class
=
"card-list"
>
class
=
"card-list_item"
<
div
@
click
=
"cardClick(cardItem)"
v
-
for
=
"cardItem in CardOrderList"
>
:
key
=
"cardItem.id"
<
CardWrapper
class
=
"card-list_item"
@
contextmenu
.
prevent
=
"(v)=>rightClick(v,cardItem)"
@
click
=
"cardClick(cardItem)"
:
card
-
item
=
"cardItem"
:
class
=
"{ active: isSelectStatused(cardItem)
}
"
>
>
<!--
<
template
#
top_right
>
工厂类型
<
/template> --
>
<
CardWrapper
<
template
#
bottom_left
>
:
card
-
item
=
"cardItem"
<
span
:
class
=
"{ active: isSelectStatused(cardItem)
}
"
v
-
if
=
"cardItem?.factorySubOrderNumber"
@
contextmenu
.
prevent
=
"(v) => rightClick(v, cardItem)"
title
=
"生产单号"
>
class
=
"base_sku"
<!--
<
template
#
top_right
>
工厂类型
<
/template> --
>
@
click
.
stop
=
"
<
template
#
bottom_left
>
copy(String(cardItem?.factorySubOrderNumber || ''))
<
span
"
v
-
if
=
"cardItem?.factorySubOrderNumber"
>
title
=
"生产单号"
{{
cardItem
?.
factorySubOrderNumber
}}
class
=
"base_sku"
<
/span
>
@
click
.
stop
=
"
<
/template
>
copy(String(cardItem?.factorySubOrderNumber || ''))
<
template
#
operations
>
"
<
Icon
>
name
=
"caozuorizhi"
{{
cardItem
?.
factorySubOrderNumber
}}
@
click
.
stop
=
"
<
/span
>
openLog(Number(cardItem.podOrderId) || undefined)
<
/template
>
"
<
template
#
operations
>
>
<
Icon
<
template
#
title
>
name
=
"caozuorizhi"
<
title
>
操作日志
<
/title
>
@
click
.
stop
=
"
<
/template
>
openLog(Number(cardItem.podOrderId) || undefined)
<
/Icon
>
"
<
Icon
>
name
=
"chakanxiangqing"
<
template
#
title
>
@
click
.
stop
=
"openDetail(cardItem.id)"
<
title
>
操作日志
<
/title
>
>
<
/template
>
<
template
#
title
>
<
/Icon
>
<
title
>
查看详情
<
/title
>
<
Icon
<
/template
>
name
=
"chakanxiangqing"
<
/Icon
>
@
click
.
stop
=
"openDetail(cardItem.id)"
<
/template
>
>
<
template
#
images
>
<
template
#
title
>
<
div
class
=
"flex-between"
>
<
title
>
查看详情
<
/title
>
<
div
class
=
"images-position"
>
<
/template
>
<
div
<
/Icon
>
v
-
for
=
"(item, index) in getSafeImages(cardItem)"
<
/template
>
:
key
=
"index"
<
template
#
images
>
:
title
=
"
<
div
class
=
"flex-between"
>
item?.ename
<
div
class
=
"images-position"
>
? item.ename === 'front'
<
div
? '正面图片'
v
-
for
=
"(item, index) in getSafeImages(cardItem)"
: '反面图片'
:
key
=
"index"
: ''
:
title
=
"
"
item?.ename
:
style
=
"
? item.ename === 'front'
currentImage === item?.image &&
? '正面图片'
currentId === cardItem.id
: '反面图片'
? 'border-color: red'
: ''
: ''
"
"
:
style
=
"
class
=
"item-image"
currentImage === item?.image &&
@
click
=
"handleChangeImages(item, cardItem)"
currentId === cardItem.id
>
? 'border-color: red'
<
img
:
src
=
"item?.image"
height
=
"28"
/>
: ''
"
class
=
"item-image"
@
click
=
"handleChangeImages(item, cardItem)"
>
<
img
:
src
=
"item?.image"
height
=
"28"
/>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
b
<
b
v
-
if
=
"cardItem"
v
-
if
=
"cardItem"
:
style
=
"{
:
style
=
"{
color:
color:
(Number(cardItem.customizedQuantity) || 0) > 1
? 'red'
: '#67C23A',
}
"
>
{{
(
Number
(
cardItem
.
customizedQuantity
)
||
0
)
>
1
(
Number
(
cardItem
.
customizedQuantity
)
||
0
)
>
1
? 'red'
?
'多'
: '#67C23A',
:
'单'
}
"
}}
<
/b
>
<
/div
>
<
/template
>
<
template
#
info
>
<
div
style
=
"height: 100px; font-size: 12px; padding: 14px 5px 0"
>
>
{{
<
el
-
row
class
=
"el_row"
>
(
Number
(
cardItem
.
customizedQuantity
)
||
0
)
>
1
<
el
-
col
:
span
=
"14"
:
offset
=
"0"
>
?
'多'
<
el
-
tooltip
:
'单'
class
=
"item"
}}
effect
=
"dark"
<
/b
>
:
content
=
"cardItem?.baseSku"
<
/div
>
placement
=
"bottom"
<
/template
>
>
<
template
#
info
>
<
span
<
div
title
=
"Base SKU"
style
=
"height: 100px; font-size: 12px; padding: 14px 5px 0"
style
=
"
>
white-space: nowrap;
<
el
-
row
class
=
"el_row"
>
overflow: hidden;
<
el
-
col
:
span
=
"14"
:
offset
=
"0"
>
text-overflow: ellipsis;
<
el
-
tooltip
width: 100%;
class
=
"item"
display: inline-block;
effect
=
"dark"
"
:
content
=
"cardItem?.baseSku"
>
placement
=
"bottom"
{{
cardItem
?.
baseSku
}}
<
/span
>
<
/el-tooltip
>
<
/el-col
>
<
el
-
col
:
span
=
"10"
:
offset
=
"0"
style
=
"text-align: right"
>
<
el
-
tooltip
class
=
"item"
effect
=
"dark"
:
content
=
"
status === 'IN_PRODUCTION'
? '未生产数量'
: '已生产数量'
"
placement
=
"bottom"
>
<
span
>
数量:
{{
status
===
'IN_PRODUCTION'
?
cardItem
?.
notPassNum
:
cardItem
?.
passNum
}}
<
/spa
n
>
<
/el-tooltip
>
<
/el-col
>
<
/el-row
>
<
el
-
row
style
=
"margin-top: 5px"
>
<
el
-
col
:
span
=
"14"
:
offset
=
"0"
style
=
"
white-space: nowrap;
display: flex;
align-items: center;
"
>
>
<
span
<
span
title
=
"
Base
SKU"
title
=
"
Variant
SKU"
style
=
"
style
=
"
white-space: nowrap;
display: inline-block;
width: 100%;
overflow: hidden;
overflow: hidden;
text-overflow: ellipsis;
text-overflow: ellipsis;
width: 100%;
display: inline-block;
"
"
>
>
{{
cardItem
?.
base
Sku
}}
{{
cardItem
?.
variant
Sku
}}
<
/span
>
<
/span
>
<
/el-tooltip
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"10"
:
offset
=
"0"
style
=
"text-align: right"
>
<
el
-
col
:
span
=
"10"
:
offset
=
"0"
style
=
"text-align: right"
>
<
el
-
tooltip
<
el
-
tooltip
class
=
"item"
class
=
"item"
effect
=
"dark"
effect
=
"dark"
:
content
=
"'货号'"
:
content
=
"
placement
=
"bottom"
status === 'IN_PRODUCTION'
? '未生产数量'
: '已生产数量'
"
placement
=
"bottom"
>
<
span
>
数量:
{{
status
===
'IN_PRODUCTION'
?
cardItem
?.
notPassNum
:
cardItem
?.
passNum
}}
<
/spa
n
>
>
<
/el-tooltip
>
<
span
>
货号:
{{
cardItem
?.
supplierItemNo
}}
<
/span
>
<
/el-col
>
<
/el-tooltip
>
<
/el-row
>
<
/el-col
>
<
el
-
row
style
=
"margin-top: 5px"
>
<
/el-row
>
<
el
-
col
<
el
-
row
style
=
"margin-top: 5px"
>
:
span
=
"14"
<
el
-
col
:
offset
=
"0"
:
span
=
"12"
style
=
"
:
offset
=
"0"
white-space: nowrap;
display: flex;
align-items: center;
"
>
<
span
title
=
"Variant SKU"
style
=
"
style
=
"
display: inline-block;
white-space: nowrap;
width: 100%;
display: flex;
overflow: hidden;
align-items: center;
text-overflow: ellipsis;
"
"
>
>
{{
cardItem
?.
variantSku
}}
<
span
>
工艺:
<
/span
>
<
/span
>
<
span
<
/el-col
>
:
title
=
"String(cardItem?.process)"
<
el
-
col
:
span
=
"10"
:
offset
=
"0"
style
=
"text-align: right"
>
style
=
"
<
el
-
tooltip
display: inline-block;
class
=
"item"
width: 100%;
effect
=
"dark"
overflow: hidden;
:
content
=
"'货号'"
text-overflow: ellipsis;
placement
=
"bottom"
"
>
>
<
span
>
货号:
{{
cardItem
?.
supplierItemNo
}}
<
/span
>
{{
cardItem
?.
process
}}
<
/el-tooltip
>
<
/span
>
<
/el-col
>
<
/el-col
>
<
/el-row
>
<
el
-
col
:
span
=
"12"
:
offset
=
"0"
style
=
"text-align: right"
>
<
el
-
row
style
=
"margin-top: 5px"
>
<
span
title
=
"期望交货时间"
>
<
el
-
col
{{
cardItem
?.
expectDeliveryTime
}}
:
span
=
"12"
<
/span
>
:
offset
=
"0"
<
/el-col
>
style
=
"
<
/el-row
>
white-space: nowrap;
<
el
-
row
style
=
"margin-top: 5px"
>
display: flex;
<
el
-
col
align-items: center;
:
span
=
"14"
"
:
offset
=
"0"
>
style
=
"white-space: nowrap"
<
span
>
工艺:
<
/span
>
<
span
:
title
=
"String(cardItem?.process)"
style
=
"
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
>
>
{{
cardItem
?.
process
}}
<
span
<
/span
>
:
title
=
"`店铺单号:${cardItem?.shopNumber
}
`"
<
/el-col
>
style
=
"
<
el
-
col
:
span
=
"12"
:
offset
=
"0"
style
=
"text-align: right"
>
display: inline-block;
<
span
title
=
"期望交货时间"
>
width: 100%;
{{
cardItem
?.
expectDeliveryTime
}}
overflow: hidden;
<
/span
>
text-overflow: ellipsis;
<
/el-col
>
"
<
/el-row
>
>
<
el
-
row
style
=
"margin-top: 5px"
>
{{
cardItem
?.
shopNumber
}}
<
el
-
col
:
span
=
"14"
:
offset
=
"0"
style
=
"white-space: nowrap"
>
<
/span
>
<
span
<
/el-col
>
:
title
=
"`店铺单号:${cardItem?.shopNumber
}
`"
<
el
-
col
style
=
"
:
span
=
"10"
display: inline-block;
:
offset
=
"0"
width: 100%;
style
=
"white-space: nowrap"
overflow: hidden;
text-overflow: ellipsis;
"
>
>
{{
cardItem
?.
shopNumber
}}
<
span
<
/span
>
:
title
=
"`第三方订单号:${cardItem?.thirdSubOrderNumber
}
`"
<
/el-col
>
style
=
"
<
/el-row
>
display: inline-block;
<
/div
>
width: 100%;
<
/template
>
overflow: hidden;
<
/CardWrapper
>
text-overflow: ellipsis;
"
@
click
.
stop
=
"
copy(String(cardItem?.thirdSubOrderNumber || ''))
"
>
{{
cardItem
?.
thirdSubOrderNumber
}}
<
/span
>
<
/el-col
>
<
/el-row
>
<
/div
>
<
/template
>
<
/CardWrapper
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
v
-
else
class
=
"empty"
>
暂无数据
<
/div
>
<
/template
>
<
div
<
div
v
-
else
v
-
else
ref
=
"tableWrapperRef"
ref
=
"tableWrapperRef"
...
@@ -404,13 +433,12 @@
...
@@ -404,13 +433,12 @@
class
=
"order-list flex-1 overflow-hidden"
class
=
"order-list flex-1 overflow-hidden"
>
>
<
TableView
<
TableView
ref
=
"tableRef"
:
paginated
-
data
=
"tableData"
:
paginated
-
data
=
"tableData"
:
columns
=
"tableColumns"
:
columns
=
"tableColumns"
default
-
expand
-
all
default
-
expand
-
all
:
span
-
method
=
"arraySpanMethod"
:
span
-
method
=
"arraySpanMethod"
@
right
-
click
=
"rightClick"
@
selection
-
change
=
"handleSelectionChange"
@
selection
-
change
=
"handleSelectionChange"
@
right
-
click
=
"rightClick"
>
>
<
template
#
expand
=
"{ row
}
"
>
<
template
#
expand
=
"{ row
}
"
>
<
div
v
-
if
=
"row.productList"
class
=
"table-expand"
>
<
div
v
-
if
=
"row.productList"
class
=
"table-expand"
>
...
@@ -726,15 +754,11 @@
...
@@ -726,15 +754,11 @@
>
>
<
LogList
:
log
-
list
=
"logList"
/>
<
LogList
:
log
-
list
=
"logList"
/>
<
/el-dialog
>
<
/el-dialog
>
<
el
-
dialog
<
right
-
menu
v
-
model
=
"countVisible"
ref
=
"rightMenuRef"
title
=
"数据统计"
:
show_copy_shop_number
=
"['IN_PRODUCTION', 'WAIT_SHIPMENT'].includes(status)"
width
=
"400px"
@
change
=
"rightChange"
:
close
-
on
-
click
-
modal
=
"false"
/>
>
<
p
>
基版
<
b
>
{{
cardItem
?.
baseSku
}}
<
/b> 的统计数量为:<b> {{count
}}
</
b
><
/p
>
<
/el-dialog
>
<
right
-
menu
:
show_copy_shop_number
=
"['IN_PRODUCTION','WAIT_SHIPMENT'].includes(status)"
ref
=
"rightMenuRef"
@
change
=
"rightChange"
/>
<
fastProduction
<
fastProduction
v
-
model
:
detailVisible
=
"detailVisible"
v
-
model
:
detailVisible
=
"detailVisible"
:
title
=
"fastTitle"
:
title
=
"fastTitle"
...
@@ -762,7 +786,7 @@ import {
...
@@ -762,7 +786,7 @@ import {
getCardOrderList
,
getCardOrderList
,
getOrderDetail
,
getOrderDetail
,
getInProductionCount
,
getInProductionCount
,
getWaitShipmentCount
getWaitShipmentCount
,
}
from
'@/api/podOrder'
}
from
'@/api/podOrder'
import
TableView
from
'@/components/TableView.vue'
import
TableView
from
'@/components/TableView.vue'
import
{
import
{
...
@@ -792,57 +816,64 @@ import {
...
@@ -792,57 +816,64 @@ import {
imageAryInter
,
imageAryInter
,
CardOrderData
,
CardOrderData
,
}
from
'@/types/api/podOrder'
}
from
'@/types/api/podOrder'
import
{
ArrowUp
,
ArrowDown
}
from
'@element-plus/icons-vue'
import
{
ArrowUp
,
ArrowDown
}
from
'@element-plus/icons-vue'
import
{
getLogisticsCompanyList
}
from
'@/api/common'
import
{
getLogisticsCompanyList
}
from
'@/api/common'
import
{
ElButton
,
type
FormRules
}
from
'element-plus'
import
{
ElButton
,
type
FormRules
}
from
'element-plus'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
filePath
}
from
'@/api/axios'
import
{
filePath
}
from
'@/api/axios'
import
LogList
from
'@/components/LogList.vue'
import
LogList
from
'@/components/LogList.vue'
const
tableRef
=
ref
();
const
tableRef
=
ref
()
const
countVisible
=
ref
(
false
)
const
countVisible
=
ref
(
false
)
const
keyCode
=
ref
(
''
);
const
keyCode
=
ref
(
''
)
const
cardItem
=
ref
<
PodProductList
|
CardOrderData
>
();
const
cardItem
=
ref
<
PodProductList
|
CardOrderData
>
()
const
rightMenuRef
=
ref
()
const
rightMenuRef
=
ref
()
const
count
=
ref
<
number
>
(
0
)
const
count
=
ref
<
number
>
(
0
)
const
rightClick
=
(
e
:
MouseEvent
,
item
:
PodProductList
|
CardOrderData
)
=>
{
const
rightClick
=
(
e
:
MouseEvent
,
item
:
PodProductList
|
CardOrderData
)
=>
{
cardItem
.
value
=
item
cardItem
.
value
=
item
rightMenuRef
.
value
.
setPosition
({
rightMenuRef
.
value
.
setPosition
({
x
:
e
.
clientX
,
x
:
e
.
clientX
,
y
:
e
.
clientY
,
y
:
e
.
clientY
,
cardItem
:
e
.
clientY
,
cardItem
:
e
.
clientY
,
el
:
e
el
:
e
,
}
)
}
)
}
}
const
rightChange
=
async
(
code
:
string
)
=>
{
const
rightChange
=
async
(
code
:
string
)
=>
{
const
flag
=
[
'IN_PRODUCTION'
,
'WAIT_SHIPMENT'
].
includes
(
status
.
value
)
const
flag
=
[
'IN_PRODUCTION'
,
'WAIT_SHIPMENT'
].
includes
(
status
.
value
)
if
(
code
===
'check_all'
)
{
if
(
code
===
'check_all'
)
{
if
(
flag
)
{
if
(
flag
)
{
selection
.
value
=
JSON
.
parse
(
JSON
.
stringify
(
CardOrderList
.
value
))
selection
.
value
=
JSON
.
parse
(
JSON
.
stringify
(
CardOrderList
.
value
))
}
else
{
}
else
{
if
(
tableRef
.
value
&&
tableRef
.
value
?.
tableRef
)
{
if
(
tableRef
.
value
&&
tableRef
.
value
?.
tableRef
)
{
tableRef
.
value
?.
tableRef
.
toggleAllSelection
()
tableRef
.
value
?.
tableRef
.
toggleAllSelection
()
}
}
// selection.value = JSON.parse(JSON.stringify(tableData.value))
// selection.value = JSON.parse(JSON.stringify(tableData.value))
}
}
}
else
if
(
code
===
'clear_check'
)
{
}
else
if
(
code
===
'clear_check'
)
{
selection
.
value
=
[]
selection
.
value
=
[]
tableRef
.
value
?.
tableRef
.
toggleAllSelection
()
tableRef
.
value
?.
tableRef
.
toggleAllSelection
()
}
else
if
(
code
===
'copy_code'
)
{
}
else
if
(
code
===
'copy_code'
)
{
const
str
=
selection
.
value
.
map
(
item
=>
item
.
factorySubOrderNumber
||
item
.
factoryOrderNumber
).
join
()
const
str
=
selection
.
value
.
map
((
item
)
=>
item
.
factorySubOrderNumber
||
item
.
factoryOrderNumber
)
.
join
()
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'copy_shopNumber'
)
{
}
else
if
(
code
===
'copy_shopNumber'
)
{
const
str
=
selection
.
value
.
map
(
item
=>
item
.
shopNumber
).
join
()
const
str
=
selection
.
value
.
map
(
(
item
)
=>
item
.
shopNumber
).
join
()
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'count'
)
{
}
else
if
(
code
===
'count'
)
{
countVisible
.
value
=
true
countVisible
.
value
=
true
let
res
let
res
if
(
status
.
value
===
'WAIT_SHIPMENT'
){
if
(
status
.
value
===
'WAIT_SHIPMENT'
)
{
res
=
await
getWaitShipmentCount
(
cardItem
.
value
?.
productionFileId
,
cardItem
.
value
?.
baseSku
)
res
=
await
getWaitShipmentCount
(
}
else
if
(
status
.
value
===
'IN_PRODUCTION'
){
cardItem
.
value
?.
productionFileId
,
res
=
await
getInProductionCount
(
cardItem
.
value
?.
productionFileId
,
cardItem
.
value
?.
baseSku
)
cardItem
.
value
?.
baseSku
,
)
}
else
if
(
status
.
value
===
'IN_PRODUCTION'
)
{
res
=
await
getInProductionCount
(
cardItem
.
value
?.
productionFileId
,
cardItem
.
value
?.
baseSku
,
)
}
}
count
.
value
=
(
res
?.
data
||
0
)
as
number
count
.
value
=
(
res
?.
data
||
0
)
as
number
}
}
...
@@ -1039,16 +1070,17 @@ const fastToProduction = (title: string, type: number) => {
...
@@ -1039,16 +1070,17 @@ const fastToProduction = (title: string, type: number) => {
}
}
const
cardClick
=
(
data
:
PodProductList
|
CardOrderData
)
=>
{
const
cardClick
=
(
data
:
PodProductList
|
CardOrderData
)
=>
{
const
status
=
isSelectStatused
(
data
)
const
status
=
isSelectStatused
(
data
)
if
(
keyCode
.
value
===
'Shift'
){
if
(
keyCode
.
value
===
'Shift'
)
{
if
(
selection
.
value
.
length
){
if
(
selection
.
value
.
length
)
{
const
startIndex
=
CardOrderList
.
value
.
findIndex
(
el
=>
el
.
id
===
selection
.
value
[
0
].
id
)
const
startIndex
=
CardOrderList
.
value
.
findIndex
(
const
endIndex
=
CardOrderList
.
value
.
findIndex
(
el
=>
el
.
id
===
data
.
id
)
(
el
)
=>
el
.
id
===
selection
.
value
[
0
].
id
,
selection
.
value
=
[]
)
for
(
let
k
=
startIndex
;
k
<=
endIndex
;
k
++
){
const
endIndex
=
CardOrderList
.
value
.
findIndex
((
el
)
=>
el
.
id
===
data
.
id
)
selection
.
value
=
[]
for
(
let
k
=
startIndex
;
k
<=
endIndex
;
k
++
)
{
selection
.
value
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
CardOrderList
.
value
[
k
])))
selection
.
value
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
CardOrderList
.
value
[
k
])))
}
}
}
}
}
}
if
(
status
)
{
if
(
status
)
{
selection
.
value
=
selection
.
value
.
filter
(
selection
.
value
=
selection
.
value
.
filter
(
...
@@ -1148,6 +1180,7 @@ const {
...
@@ -1148,6 +1180,7 @@ const {
onPageSizeChange
:
handleSizeChange
,
onPageSizeChange
:
handleSizeChange
,
}
=
usePageList
<
OrderData
|
CardOrderData
>
({
}
=
usePageList
<
OrderData
|
CardOrderData
>
({
query
:
async
(
page
,
pageSize
)
=>
{
query
:
async
(
page
,
pageSize
)
=>
{
console
.
log
(
111111
)
const
commonParams
=
{
const
commonParams
=
{
...
searchForm
.
value
,
...
searchForm
.
value
,
status
:
status
.
value
,
status
:
status
.
value
,
...
@@ -1164,8 +1197,9 @@ const {
...
@@ -1164,8 +1197,9 @@ const {
// 动态选择接口
// 动态选择接口
const
fetchData
=
const
fetchData
=
status
.
value
===
'IN_PRODUCTION'
?
getCardOrderList
:
getOrderList
status
.
value
===
'IN_PRODUCTION'
?
getCardOrderList
:
getOrderList
const
res
=
await
fetchData
(
commonParams
,
page
,
pageSize
)
return
fetchData
(
commonParams
,
page
,
pageSize
).
then
(
return
res
.
data
(
res
)
=>
res
.
data
,
)
as
never
}
,
}
,
}
)
}
)
// 发货
// 发货
...
@@ -1391,7 +1425,11 @@ const addInternalTag = async () => {
...
@@ -1391,7 +1425,11 @@ const addInternalTag = async () => {
}
).
then
(
async
({
value
}
:
{
value
:
string
}
)
=>
{
}
).
then
(
async
({
value
}
:
{
value
:
string
}
)
=>
{
try
{
try
{
const
res
=
await
addInternalTagApi
(
const
res
=
await
addInternalTagApi
(
selection
.
value
.
map
((
item
:
CardOrderData
|
PodProductList
)
=>
item
.
id
),
selection
.
value
.
map
((
item
:
CardOrderData
|
PodProductList
)
=>
status
.
value
===
'IN_PRODUCTION'
||
status
.
value
===
'WAIT_SHIPMENT'
?
(
item
.
podOrderId
as
number
)
:
item
.
id
,
),
value
,
value
,
)
)
ElMessage
.
success
(
res
.
message
)
ElMessage
.
success
(
res
.
message
)
...
@@ -1402,34 +1440,6 @@ const addInternalTag = async () => {
...
@@ -1402,34 +1440,6 @@ const addInternalTag = async () => {
}
}
}
)
}
)
}
}
// const voidedBtn = async () =>
{
// if (selection.value.length === 0)
{
// return ElMessage(
{
// message: '请选择订单',
// type: 'warning',
// offset: window.innerHeight / 2,
//
}
)
//
}
// ElMessageBox.prompt('', '作废',
{
// confirmButtonText: '确认',
// cancelButtonText: '取消',
// inputPlaceholder: '请输入作废原因',
// inputPattern: /.+/,
// inputErrorMessage: '作废原因不能为空',
//
}
).
then
(
async
({
value
}
)
=>
{
// try
{
// const res = await reasonInvalidationApi(
// selection.value.map((item) => item.id),
// value,
// )
// ElMessage.success(res.message)
// loadTabData()
// loadDiffList()
//
}
catch
(
e
)
{
// // showError(e)
//
}
//
}
)
//
}
const
printManuscript
=
async
()
=>
{
const
printManuscript
=
async
()
=>
{
if
(
selection
.
value
.
length
===
0
)
{
if
(
selection
.
value
.
length
===
0
)
{
return
ElMessage
({
return
ElMessage
({
...
@@ -1550,18 +1560,18 @@ const getSafeImages = (item: PodProductList | CardOrderData): cardImages[] => {
...
@@ -1550,18 +1560,18 @@ const getSafeImages = (item: PodProductList | CardOrderData): cardImages[] => {
if
(
!
item
.
images
)
return
[]
if
(
!
item
.
images
)
return
[]
return
item
.
images
as
cardImages
[]
return
item
.
images
as
cardImages
[]
}
}
const
listenerKeydown
=
(
e
:
KeyboardEvent
)
=>
{
const
listenerKeydown
=
(
e
:
KeyboardEvent
)
=>
{
console
.
log
(
e
)
keyCode
.
value
=
e
?.
key
keyCode
.
value
=
e
?.
key
}
}
onBeforeUnmount
(()
=>
{
document
.
removeEventListener
(
'keydown'
,
listenerKeydown
)
}
)
onMounted
(()
=>
{
onMounted
(()
=>
{
document
.
addEventListener
(
'keydown'
,
listenerKeydown
)
document
.
addEventListener
(
'keydown'
,
listenerKeydown
)
getLogisticsList
()
getLogisticsList
()
loadTabData
()
loadTabData
()
}
)
}
)
onBeforeUnmount
(()
=>
{
document
.
removeEventListener
(
'keydown'
,
listenerKeydown
)
}
)
<
/script
>
<
/script
>
<
style
lang
=
"scss"
scoped
>
<
style
lang
=
"scss"
scoped
>
.
header
-
filter
-
form
{
.
header
-
filter
-
form
{
...
@@ -1573,12 +1583,13 @@ onMounted(() => {
...
@@ -1573,12 +1583,13 @@ onMounted(() => {
.
card
-
mode
{
.
card
-
mode
{
padding
-
top
:
10
px
;
padding
-
top
:
10
px
;
overflow
:
auto
;
overflow
:
auto
;
flex
:
1
;
.
card
-
list
{
.
card
-
list
{
flex
:
1
;
display
:
grid
;
display
:
grid
;
grid
-
template
-
columns
:
repeat
(
6
,
1
fr
);
grid
-
template
-
columns
:
repeat
(
6
,
1
fr
);
grid
-
template
-
rows
:
max
-
content
;
grid
-
template
-
rows
:
max
-
content
;
gap
:
10
px
;
gap
:
10
px
;
overflow
:
hidden
;
.
card
-
list_item
{
.
card
-
list_item
{
border
:
1
px
solid
#
eee
;
border
:
1
px
solid
#
eee
;
border
-
top
-
left
-
radius
:
10
px
;
border
-
top
-
left
-
radius
:
10
px
;
...
@@ -1626,7 +1637,14 @@ onMounted(() => {
...
@@ -1626,7 +1637,14 @@ onMounted(() => {
}
}
}
}
}
}
.
empty
{
flex
:
1
;
display
:
flex
;
justify
-
content
:
center
;
align
-
items
:
center
;
color
:
#
777
;
overflow
:
hidden
;
}
.
tabs
{
.
tabs
{
display
:
flex
;
display
:
flex
;
align
-
items
:
center
;
align
-
items
:
center
;
...
...
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