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
53681b11
Commit
53681b11
authored
Dec 17, 2025
by
qinjianhui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_order_select' into release
parents
c2097860
77a2f776
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
277 additions
and
62 deletions
+277
-62
src/components/RightClickMenu.vue
+2
-1
src/views/order/orderTracking/index.vue
+56
-10
src/views/order/orderTracking/indexcn.vue
+118
-28
src/views/order/podCN/index.vue
+57
-16
src/views/order/podUs/index.vue
+44
-7
No files found.
src/components/RightClickMenu.vue
View file @
53681b11
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
>
>
复制店铺单号
复制店铺单号
</div>
</div>
<div
v-if=
"showCopyCount"
class=
"menu-item"
@
click=
"onChangeCopy('count')"
>
<div
v-if=
"showCopyCount"
class=
"menu-item"
@
click=
"onChangeCopy('count')"
>
统计数量
统计数量
</div>
</div>
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
</
template
>
</
template
>
<
script
setup
lang=
"ts"
>
<
script
setup
lang=
"ts"
>
import
{
ref
,
defineExpose
,
onMounted
,
onUnmounted
}
from
'vue'
import
{
ref
,
onMounted
,
onUnmounted
}
from
'vue'
const
visible
=
ref
(
false
)
const
visible
=
ref
(
false
)
const
position
=
ref
({
x
:
0
,
y
:
0
})
const
position
=
ref
({
x
:
0
,
y
:
0
})
...
...
src/views/order/orderTracking/index.vue
View file @
53681b11
...
@@ -706,6 +706,44 @@ function changeChinaTime(zone: string) {
...
@@ -706,6 +706,44 @@ function changeChinaTime(zone: string) {
})
})
}
}
const
handleRadioGroupClick
=
(
event
:
Event
)
=>
{
const
target
=
event
.
target
as
HTMLElement
const
radioButton
=
target
.
closest
(
'.el-radio-button'
)
if
(
radioButton
)
{
const
input
=
radioButton
.
querySelector
(
'input[type="radio"]'
,
)
as
HTMLInputElement
if
(
input
)
{
const
value
=
input
.
value
if
(
searchForm
.
value
.
customizedQuantity
===
value
)
{
event
.
preventDefault
()
event
.
stopPropagation
()
searchForm
.
value
.
customizedQuantity
=
''
}
}
}
}
const
handleMultiRadioGroupClick
=
(
event
:
Event
)
=>
{
const
target
=
event
.
target
as
HTMLElement
const
radioButton
=
target
.
closest
(
'.el-radio-button'
)
if
(
radioButton
)
{
const
input
=
radioButton
.
querySelector
(
'input[type="radio"]'
,
)
as
HTMLInputElement
if
(
input
)
{
const
value
=
input
.
value
===
'true'
?
true
:
false
if
(
searchForm
.
value
.
multi
===
value
)
{
event
.
preventDefault
()
event
.
stopPropagation
()
searchForm
.
value
.
multi
=
null
}
}
}
}
const
resultConfirm
=
()
=>
{
const
resultConfirm
=
()
=>
{
search
()
search
()
loadTabData
()
loadTabData
()
...
@@ -796,7 +834,7 @@ onMounted(() => {
...
@@ -796,7 +834,7 @@ onMounted(() => {
clearable
clearable
filterable
filterable
popper-class=
"customize-select-style"
popper-class=
"customize-select-style"
style=
"width: 1
5
0px"
style=
"width: 1
8
0px"
>
>
<ElOption
<ElOption
v-for=
"(item, index) in platformJson"
v-for=
"(item, index) in platformJson"
...
@@ -878,16 +916,27 @@ onMounted(() => {
...
@@ -878,16 +916,27 @@ onMounted(() => {
</ElSelect>
</ElSelect>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"类型"
>
<ElFormItem
label=
"印刷"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
>
<el-radio-group
v-model=
"searchForm.customizedQuantity"
>
<el-radio-group
v-model=
"searchForm.customizedQuantity"
>
<el-radio-button
value=
"single"
>
单面
</el-radio-button>
<el-radio-button
value=
"single"
>
单面
</el-radio-button>
<el-radio-button
value=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
value=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
value=
"normal"
>
普品
</el-radio-button>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"数量"
>
<ElFormItem
label=
"数量"
>
<el-radio-group
v-model=
"searchForm.multi"
>
<el-radio-group
<el-radio-button
:value=
"false"
>
单件
</el-radio-button>
v-model=
"searchForm.multi"
<el-radio-button
:value=
"true"
>
多件
</el-radio-button>
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
>
<el-radio-button
:value=
"false"
class=
"radioBtn"
>
单件
</el-radio-button
>
<el-radio-button
:value=
"true"
class=
"radioBtn"
>
多件
</el-radio-button
>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem>
<ElFormItem>
...
@@ -1283,12 +1332,9 @@ onMounted(() => {
...
@@ -1283,12 +1332,9 @@ onMounted(() => {
}
}
}
}
}
}
.
search-form
{
.
radioBtn
{
::v-deep
.el-radio-button
{
::v-deep
.el-radio-button
__inner
{
width
:
75px
;
width
:
75px
;
.el-radio-button__inner
{
width
:
100%
;
}
}
}
}
}
</
style
>
</
style
>
src/views/order/orderTracking/indexcn.vue
View file @
53681b11
...
@@ -102,7 +102,8 @@ const tableColumns = computed(() => {
...
@@ -102,7 +102,8 @@ const tableColumns = computed(() => {
prop
:
'replaceShipment'
,
prop
:
'replaceShipment'
,
width
:
120
,
width
:
120
,
align
:
'center'
,
align
:
'center'
,
},{
},
{
label
:
'物流类型'
,
label
:
'物流类型'
,
slot
:
'shipmentType'
,
slot
:
'shipmentType'
,
prop
:
'shipmentType'
,
prop
:
'shipmentType'
,
...
@@ -297,6 +298,24 @@ const goodsColumns = computed(() => {
...
@@ -297,6 +298,24 @@ const goodsColumns = computed(() => {
},
},
]
]
})
})
const
productMarkList
=
[
{
label
:
'普通商品'
,
value
:
'normal'
,
},
{
label
:
'pod商品'
,
value
:
'pod'
,
},
{
label
:
'一件定制局部印'
,
value
:
'custom_part'
,
},
{
label
:
'一件定制满印'
,
value
:
'custom_full'
,
},
]
const
tableData
=
ref
<
PodCnOrderListData
[]
>
([])
const
tableData
=
ref
<
PodCnOrderListData
[]
>
([])
const
goodsData
=
ref
<
ProductList
[]
>
([])
const
goodsData
=
ref
<
ProductList
[]
>
([])
const
searchVisible
=
ref
(
false
)
const
searchVisible
=
ref
(
false
)
...
@@ -377,7 +396,7 @@ const search = () => {
...
@@ -377,7 +396,7 @@ const search = () => {
goodsData
.
value
=
[]
goodsData
.
value
=
[]
logList
.
value
=
[]
logList
.
value
=
[]
getOrderListFn
()
getOrderListFn
()
if
(
tabValue
.
value
===
'2'
)
{
if
(
tabValue
.
value
===
'2'
)
{
zoneType
.
value
=
'Asia/Shanghai'
zoneType
.
value
=
'Asia/Shanghai'
operationLog
()
operationLog
()
}
}
...
@@ -652,7 +671,7 @@ const refreshAddress = async () => {
...
@@ -652,7 +671,7 @@ const refreshAddress = async () => {
ElMessage
.
success
(
'操作成功'
)
ElMessage
.
success
(
'操作成功'
)
search
()
search
()
await
loadTabData
()
await
loadTabData
()
if
(
tabValue
.
value
===
'2'
)
{
if
(
tabValue
.
value
===
'2'
)
{
zoneType
.
value
=
'Asia/Shanghai'
zoneType
.
value
=
'Asia/Shanghai'
await
operationLog
()
await
operationLog
()
}
}
...
@@ -663,7 +682,6 @@ const refreshAddress = async () => {
...
@@ -663,7 +682,6 @@ const refreshAddress = async () => {
}
}
}
}
/**
/**
* @description: 获取打印面单
* @description: 获取打印面单
*/
*/
...
@@ -751,6 +769,44 @@ const handleSelectionChange = (val: PodCnOrderListData[]) => {
...
@@ -751,6 +769,44 @@ const handleSelectionChange = (val: PodCnOrderListData[]) => {
selection
.
value
=
val
selection
.
value
=
val
}
}
const
handleRadioGroupClick
=
(
event
:
Event
)
=>
{
const
target
=
event
.
target
as
HTMLElement
const
radioButton
=
target
.
closest
(
'.el-radio-button'
)
if
(
radioButton
)
{
const
input
=
radioButton
.
querySelector
(
'input[type="radio"]'
,
)
as
HTMLInputElement
if
(
input
)
{
const
value
=
input
.
value
if
(
searchForm
.
value
.
customizedQuantity
===
value
)
{
event
.
preventDefault
()
event
.
stopPropagation
()
searchForm
.
value
.
customizedQuantity
=
''
}
}
}
}
const
handleMultiRadioGroupClick
=
(
event
:
Event
)
=>
{
const
target
=
event
.
target
as
HTMLElement
const
radioButton
=
target
.
closest
(
'.el-radio-button'
)
if
(
radioButton
)
{
const
input
=
radioButton
.
querySelector
(
'input[type="radio"]'
,
)
as
HTMLInputElement
if
(
input
)
{
const
value
=
input
.
value
===
'true'
?
true
:
false
if
(
searchForm
.
value
.
multi
===
value
)
{
event
.
preventDefault
()
event
.
stopPropagation
()
searchForm
.
value
.
multi
=
null
}
}
}
}
/**
/**
* @description: 页面添加回车监听
* @description: 页面添加回车监听
*/
*/
...
@@ -814,7 +870,7 @@ onMounted(() => {
...
@@ -814,7 +870,7 @@ onMounted(() => {
clearable
clearable
filterable
filterable
placeholder=
"请输入"
placeholder=
"请输入"
style=
"width: 1
5
0px"
style=
"width: 1
8
0px"
>
>
<el-option
<el-option
v-for=
"item in warehouseList"
v-for=
"item in warehouseList"
...
@@ -900,16 +956,27 @@ onMounted(() => {
...
@@ -900,16 +956,27 @@ onMounted(() => {
</ElSelect>
</ElSelect>
</ElFormItem>
</ElFormItem>
<!--
<ElFormItem
label=
"类型"
>
<ElFormItem
label=
"印刷"
>
<el-radio-group
v-model=
"searchForm.customizedQuantity"
>
<el-radio-group
v-model=
"searchForm.customizedQuantity"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
>
<el-radio-button
value=
"single"
>
单面
</el-radio-button>
<el-radio-button
value=
"single"
>
单面
</el-radio-button>
<el-radio-button
value=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
value=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
value=
"normal"
>
普品
</el-radio-button>
</el-radio-group>
</el-radio-group>
</ElFormItem>
-->
</ElFormItem>
<ElFormItem
label=
"数量"
>
<ElFormItem
label=
"数量"
>
<el-radio-group
v-model=
"searchForm.multi"
>
<el-radio-group
<el-radio-button
:value=
"false"
>
单件
</el-radio-button>
v-model=
"searchForm.multi"
<el-radio-button
:value=
"true"
>
多件
</el-radio-button>
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
>
<el-radio-button
:value=
"false"
class=
"radioBtn"
>
单件
</el-radio-button
>
<el-radio-button
:value=
"true"
class=
"radioBtn"
>
多件
</el-radio-button
>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem>
<ElFormItem>
...
@@ -1042,7 +1109,32 @@ onMounted(() => {
...
@@ -1042,7 +1109,32 @@ onMounted(() => {
></ElOption>
></ElOption>
</ElSelect>
</ElSelect>
</ElFormItem>
</ElFormItem>
<ElFormItem
v-if=
"searchForm.replaceShipment || searchForm.replaceShipment===0"
label=
"物流类型"
>
<ElFormItem
label=
"商品类型"
>
<ElSelect
v-model=
"searchForm.productMark"
placeholder=
"请选择商品类型"
clearable
filterable
collapse-tags
collapse-tags-tooltip
:teleported=
"false"
style=
"width: 150px"
>
<ElOption
v-for=
"(item, index) in productMarkList"
:key=
"index"
:value=
"item.value"
:label=
"item.label"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem
v-if=
"
searchForm.replaceShipment ||
searchForm.replaceShipment === 0
"
label=
"物流类型"
>
<ElSelect
<ElSelect
v-model=
"searchForm.shipmentType"
v-model=
"searchForm.shipmentType"
placeholder=
"物流类型"
placeholder=
"物流类型"
...
@@ -1050,7 +1142,9 @@ onMounted(() => {
...
@@ -1050,7 +1142,9 @@ onMounted(() => {
style=
"width: 150px"
style=
"width: 150px"
>
>
<ElOption
<ElOption
v-for=
"(item, index) in searchForm.replaceShipment === 0? ['自提', '快递']:['自有物流', '工厂物流']"
v-for=
"(item, index) in searchForm.replaceShipment === 0
? ['自提', '快递']
: ['自有物流', '工厂物流']"
:key=
"index"
:key=
"index"
:value=
"index"
:value=
"index"
:label=
"item"
:label=
"item"
...
@@ -1136,10 +1230,14 @@ onMounted(() => {
...
@@ -1136,10 +1230,14 @@ onMounted(() => {
<div>
{{
getStatus
(
row
.
status
)
}}
</div>
<div>
{{
getStatus
(
row
.
status
)
}}
</div>
</
template
>
</
template
>
<
template
#
shipmentType=
"{ row }"
>
<
template
#
shipmentType=
"{ row }"
>
{{
(
row
.
replaceShipment
===
0
?
[
'自提'
,
'快递'
]
:
[
'自有物流'
,
'工厂物流'
])[
row
.
shipmentType
]
}}
{{
(
row
.
replaceShipment
===
0
?
[
'自提'
,
'快递'
]
:
[
'自有物流'
,
'工厂物流'
])[
row
.
shipmentType
]
}}
</
template
>
</
template
>
<
template
#
replaceShipment=
"{ row }"
>
<
template
#
replaceShipment=
"{ row }"
>
{{
[
'不代发'
,
'代发'
][
row
.
replaceShipment
]
}}
{{
[
'不代发'
,
'代发'
][
row
.
replaceShipment
]
}}
</
template
>
</
template
>
</TableView>
</TableView>
</div>
</div>
...
@@ -1185,8 +1283,7 @@ onMounted(() => {
...
@@ -1185,8 +1283,7 @@ onMounted(() => {
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"changeChinaTime('Asia/Shanghai')"
@
click=
"changeChinaTime('Asia/Shanghai')"
>
北京时间
>
北京时间
</el-button
</el-button>
>
<el-button
<el-button
:type=
"zoneType === 'America/New_York' ? 'primary' : ''"
:type=
"zoneType === 'America/New_York' ? 'primary' : ''"
size=
"small"
size=
"small"
...
@@ -1194,8 +1291,7 @@ onMounted(() => {
...
@@ -1194,8 +1291,7 @@ onMounted(() => {
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"changeChinaTime('America/New_York')"
@
click=
"changeChinaTime('America/New_York')"
>
新泽西时间
>
新泽西时间
</el-button
</el-button>
>
<el-button
<el-button
:type=
"zoneType === 'America/Los_Angeles' ? 'primary' : ''"
:type=
"zoneType === 'America/Los_Angeles' ? 'primary' : ''"
size=
"small"
size=
"small"
...
@@ -1203,8 +1299,7 @@ onMounted(() => {
...
@@ -1203,8 +1299,7 @@ onMounted(() => {
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"changeChinaTime('America/Los_Angeles')"
@
click=
"changeChinaTime('America/Los_Angeles')"
>
洛杉矶时间
>
洛杉矶时间
</el-button
</el-button>
>
</div>
</div>
<LogList
<LogList
...
@@ -1334,14 +1429,9 @@ onMounted(() => {
...
@@ -1334,14 +1429,9 @@ onMounted(() => {
}
}
}
}
}
}
.radioBtn
{
.search-form
{
::v-deep
.el-radio-button__inner
{
::v-deep
.el-radio-button
{
width
:
75px
;
width
:
75px
;
.el-radio-button__inner
{
width
:
100%
;
}
}
}
}
}
</
style
>
</
style
>
src/views/order/podCN/index.vue
View file @
53681b11
...
@@ -167,7 +167,7 @@
...
@@ -167,7 +167,7 @@
v-model
.
trim=
"searchForm.thirdSkuCode"
v-model
.
trim=
"searchForm.thirdSkuCode"
placeholder=
"库存SKU"
placeholder=
"库存SKU"
clearable
clearable
style=
"width: 1
5
0px"
style=
"width: 1
8
0px"
></ElInput>
></ElInput>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"款号"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
label=
"款号"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
...
@@ -229,13 +229,14 @@
...
@@ -229,13 +229,14 @@
<el-option
value=
"desc"
label=
"倒序"
></el-option>
<el-option
value=
"desc"
label=
"倒序"
></el-option>
</el-select>
</el-select>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"
类型
"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
label=
"
印刷
"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<el-radio-group
<el-radio-group
v-model=
"searchForm.customizedQuantity"
v-model=
"searchForm.customizedQuantity"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
>
>
<el-radio-button
value=
"single"
>
单面
</el-radio-button>
<el-radio-button
label=
"single"
>
单面
</el-radio-button>
<el-radio-button
value=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
label=
"multiple"
>
多面
</el-radio-button>
<el-radio-button
label=
"normal"
>
普品
</el-radio-button>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"数量"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
label=
"数量"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
...
@@ -243,8 +244,12 @@
...
@@ -243,8 +244,12 @@
v-model=
"searchForm.multi"
v-model=
"searchForm.multi"
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
>
>
<el-radio-button
:value=
"false"
>
单件
</el-radio-button>
<el-radio-button
:value=
"false"
class=
"radioBtn"
<el-radio-button
:value=
"true"
>
多件
</el-radio-button>
>
单件
</el-radio-button
>
<el-radio-button
:value=
"true"
class=
"radioBtn"
>
多件
</el-radio-button
>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
...
@@ -372,6 +377,7 @@
...
@@ -372,6 +377,7 @@
></ElOption>
></ElOption>
</ElSelect>
</ElSelect>
</ElFormItem>
</ElFormItem>
<ElFormItem
<ElFormItem
v-if=
"searchForm.replaceShipment === 0"
v-if=
"searchForm.replaceShipment === 0"
label=
"物流类型"
label=
"物流类型"
...
@@ -2296,6 +2302,9 @@
...
@@ -2296,6 +2302,9 @@
<
div
class
=
"menu-item"
@
click
=
"rightChange('order-number')"
>
<
div
class
=
"menu-item"
@
click
=
"rightChange('order-number')"
>
复制订单号
复制订单号
<
/div
>
<
/div
>
<
div
class
=
"menu-item"
@
click
=
"rightChange('factorySubOrderNumber')"
>
复制生产单号
<
/div
>
<
/template
>
<
/template
>
<
/RightClickMenu
>
<
/RightClickMenu
>
<
el
-
dialog
<
el
-
dialog
...
@@ -4567,13 +4576,40 @@ const rightChange = async (code: string) => {
...
@@ -4567,13 +4576,40 @@ const rightChange = async (code: string) => {
}
else
if
(
code
===
'copy_shopNumber'
)
{
}
else
if
(
code
===
'copy_shopNumber'
)
{
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodCnOrderListData
[])
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodCnOrderListData
[])
.
map
((
item
)
=>
item
?.
shopNumber
)
.
map
((
item
)
=>
item
?.
shopNumber
)
.
join
()
.
filter
(
Boolean
)
.
join
(
','
)
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有店铺单号'
)
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'order-number'
)
{
}
else
if
(
code
===
'order-number'
)
{
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodCnOrderListData
[])
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodCnOrderListData
[])
.
map
((
item
)
=>
item
?.
factoryOrderNumber
)
.
map
((
item
)
=>
item
?.
factoryOrderNumber
)
.
join
()
.
filter
(
Boolean
)
.
join
(
','
)
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有订单号'
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'factorySubOrderNumber'
)
{
let
str
if
(
flat
)
{
str
=
(
tableData
.
value
as
(
ProductList
|
PodCnOrderListData
)[])
.
flatMap
(
(
item
)
=>
(
item
as
PodCnOrderListData
)?.
productList
?.
map
((
product
)
=>
product
.
factorySubOrderNumber
)
?.
filter
(
Boolean
)
??
[],
)
.
filter
(
Boolean
)
.
join
(
','
)
}
else
{
str
=
(
tableData
.
value
as
ProductList
[])
.
map
((
item
)
=>
item
?.
factorySubOrderNumber
)
.
filter
(
Boolean
)
.
join
(
','
)
}
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有生产单号'
)
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
}
...
@@ -6166,14 +6202,14 @@ useEnterKeyTrigger({
...
@@ -6166,14 +6202,14 @@ useEnterKeyTrigger({
color
:
white
;
color
:
white
;
font
-
weight
:
bold
;
font
-
weight
:
bold
;
}
}
.
search
-
form
{
//
.search-form
{
::
v
-
deep
.
el
-
radio
-
button
{
//
::v-deep .el-radio-button
{
width
:
75
px
;
//
width: 75px;
.
el
-
radio
-
button__inner
{
//
.el-radio-button__inner
{
width
:
100
%
;
//
width: 100%;
}
//
}
}
//
}
}
//
}
.
triangle
-
container
-
wrap
{
.
triangle
-
container
-
wrap
{
position
:
absolute
;
position
:
absolute
;
top
:
0
;
top
:
0
;
...
@@ -6202,6 +6238,11 @@ useEnterKeyTrigger({
...
@@ -6202,6 +6238,11 @@ useEnterKeyTrigger({
font
-
size
:
12
px
;
font
-
size
:
12
px
;
}
}
}
}
.
radioBtn
{
::
v
-
deep
.
el
-
radio
-
button__inner
{
width
:
75
px
;
}
}
<
/style
>
<
/style
>
<
style
lang
=
"scss"
>
<
style
lang
=
"scss"
>
.
customize
-
select
-
style
{
.
customize
-
select
-
style
{
...
...
src/views/order/podUs/index.vue
View file @
53681b11
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
<LogisticsWaySelect
<LogisticsWaySelect
v-model=
"searchForm.craftCode"
v-model=
"searchForm.craftCode"
:company-list=
"craftList"
:company-list=
"craftList"
:start-width=
"'1
78
px'"
:start-width=
"'1
50
px'"
search-placeholder=
"搜索工艺名称"
search-placeholder=
"搜索工艺名称"
start-placeholder=
"请选择工艺名称"
start-placeholder=
"请选择工艺名称"
></LogisticsWaySelect>
></LogisticsWaySelect>
...
@@ -142,7 +142,7 @@
...
@@ -142,7 +142,7 @@
v-model
.
trim=
"searchForm.thirdSkuCode"
v-model
.
trim=
"searchForm.thirdSkuCode"
placeholder=
"库存SKU"
placeholder=
"库存SKU"
clearable
clearable
style=
"width: 1
5
0px"
style=
"width: 1
8
0px"
></ElInput>
></ElInput>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"款号"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
label=
"款号"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
...
@@ -219,7 +219,7 @@
...
@@ -219,7 +219,7 @@
</ElSelect>
</ElSelect>
</ElFormItem>
</ElFormItem>
<!--
</div>
-->
<!--
</div>
-->
<ElFormItem
label=
"
类型
"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<ElFormItem
label=
"
印刷
"
v-if=
"status !== 'BATCH_DOWNLOAD'"
>
<el-radio-group
<el-radio-group
v-model=
"searchForm.customizedQuantity"
v-model=
"searchForm.customizedQuantity"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
@
click
.
stop=
"(e: Event) => handleRadioGroupClick(e)"
...
@@ -234,8 +234,12 @@
...
@@ -234,8 +234,12 @@
v-model=
"searchForm.multi"
v-model=
"searchForm.multi"
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
@
click
.
stop=
"(e: Event) => handleMultiRadioGroupClick(e)"
>
>
<el-radio-button
:label=
"false"
>
单件
</el-radio-button>
<el-radio-button
:label=
"false"
class=
"radioBtn"
<el-radio-button
:label=
"true"
>
多件
</el-radio-button>
>
单件
</el-radio-button
>
<el-radio-button
:label=
"true"
class=
"radioBtn"
>
多件
</el-radio-button
>
</el-radio-group>
</el-radio-group>
</ElFormItem>
</ElFormItem>
<ElFormItem>
<ElFormItem>
...
@@ -2542,6 +2546,9 @@
...
@@ -2542,6 +2546,9 @@
<
div
class
=
"menu-item"
@
click
=
"rightChange('order-number')"
>
<
div
class
=
"menu-item"
@
click
=
"rightChange('order-number')"
>
复制订单号
复制订单号
<
/div
>
<
/div
>
<
div
class
=
"menu-item"
@
click
=
"rightChange('factorySubOrderNumber')"
>
复制生产单号
<
/div
>
<
/template
>
<
/template
>
<
/RightClickMenu
>
<
/RightClickMenu
>
<
el
-
dialog
<
el
-
dialog
...
@@ -5178,13 +5185,38 @@ const rightChange = async (code: string) => {
...
@@ -5178,13 +5185,38 @@ const rightChange = async (code: string) => {
}
else
if
(
code
===
'copy_shopNumber'
)
{
}
else
if
(
code
===
'copy_shopNumber'
)
{
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodUsOrderListData
[])
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodUsOrderListData
[])
.
map
((
item
)
=>
item
?.
shopNumber
)
.
map
((
item
)
=>
item
?.
shopNumber
)
.
join
()
.
filter
(
Boolean
)
.
join
(
','
)
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有店铺单号'
)
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'order-number'
)
{
}
else
if
(
code
===
'order-number'
)
{
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodUsOrderListData
[])
const
str
=
(
tableData
.
value
as
ProductList
[]
|
PodUsOrderListData
[])
.
map
((
item
)
=>
item
?.
factoryOrderNumber
)
.
map
((
item
)
=>
item
?.
factoryOrderNumber
)
.
join
()
.
filter
(
Boolean
)
.
join
(
','
)
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有订单号'
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
}
else
if
(
code
===
'factorySubOrderNumber'
)
{
let
str
if
(
flat
)
{
str
=
(
tableData
.
value
as
(
ProductList
|
PodUsOrderListData
)[])
.
flatMap
(
(
item
)
=>
(
item
as
PodUsOrderListData
)?.
productList
?.
map
((
product
)
=>
product
.
factorySubOrderNumber
)
?.
filter
(
Boolean
)
??
[],
)
.
filter
(
Boolean
)
.
join
(
','
)
}
else
{
str
=
(
tableData
.
value
as
ProductList
[])
.
map
((
item
)
=>
item
?.
factorySubOrderNumber
)
.
filter
(
Boolean
)
.
join
(
','
)
}
if
(
!
str
)
return
ElMessage
.
warning
(
'当前数据没有生产单号'
)
navigator
.
clipboard
.
writeText
(
str
)
navigator
.
clipboard
.
writeText
(
str
)
ElMessage
.
success
(
'复制成功'
)
ElMessage
.
success
(
'复制成功'
)
}
}
...
@@ -7218,6 +7250,11 @@ const printNormal = async () => {
...
@@ -7218,6 +7250,11 @@ const printNormal = async () => {
font
-
size
:
12
px
;
font
-
size
:
12
px
;
}
}
}
}
.
radioBtn
{
::
v
-
deep
.
el
-
radio
-
button__inner
{
width
:
75
px
;
}
}
<
/style
>
<
/style
>
<
style
lang
=
"scss"
>
<
style
lang
=
"scss"
>
.
customize
-
select
-
style
{
.
customize
-
select
-
style
{
...
...
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