Skip to content

F
factory_front
Commit 5dbf2d7a by qinjianhui
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !55
parents 4aed8e54 f75b0645
Showing with 178 additions and 85 deletions
src/views/order/pod/index.vue
......@@ -331,21 +331,42 @@
<img :src="item?.image" height="28" />
</div>
</div>
<b
v-if="cardItem"
:style="{
color:
<div class="flex-row">
<el-tooltip
class="item"
effect="dark"
:content="'用户编码: ' + cardItem?.userMark"
placement="bottom"
>
<span
style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 100%;
display: inline-block;
"
@click.stop="copy(String(cardItem?.userMark || ''))"
>
{{ cardItem?.userMark }}
</span>
</el-tooltip>
<b
v-if="cardItem"
:style="{
color:
(Number(cardItem.customizedQuantity) || 0) > 1
? 'red'
: '#67C23A',
}"
>
{{
(Number(cardItem.customizedQuantity) || 0) > 1
? 'red'
: '#67C23A',
}"
>
{{
(Number(cardItem.customizedQuantity) || 0) > 1
? '多'
: '单'
}}
</b>
? '多'
: '单'
}}
</b>
</div>
</div>
</template>
<template #info>
......@@ -355,11 +376,10 @@
<el-tooltip
class="item"
effect="dark"
:content="cardItem?.baseSku"
:content="'Base SKU: ' + cardItem?.baseSku"
placement="bottom"
>
<span
title="Base SKU"
style="
white-space: nowrap;
overflow: hidden;
......@@ -381,14 +401,14 @@
<el-tooltip
class="item"
effect="dark"
:content="'补胚数量'"
:content="
'补胚数量: ' + (cardItem?.replenishmentNum || '--')
"
placement="bottom"
>
<span
>补胚数量：{{
cardItem?.replenishmentNum || '--'
}}</span
>
>补胚数量：{{ cardItem?.replenishmentNum || '--' }}
</span>
</el-tooltip>
</el-col>
<el-col
......@@ -397,11 +417,16 @@
:offset="0"
style="text-align: right"
>
<span
<el-tooltip
v-if="['INVALID', 'TO_BE_CONFIRMED'].includes(status)"
class="item"
effect="dark"
:content="'数量: ' + (cardItem?.num || '--')"
placement="bottom"
>
数量：{{ cardItem?.num }}
</span>
<span> 数量：{{ cardItem?.num }} </span>
</el-tooltip>
<template v-else>
<el-tooltip
v-if="status !== 'TO_BE_REPLENISHMENT'"
......@@ -411,8 +436,8 @@
['TO_BE_REPLENISHMENT', 'IN_PRODUCTION'].includes(
status,
)
? '未生产数量'
: '已生产数量'
? '未生产数量: ' + cardItem?.notPassNum
: '已生产数量: ' + cardItem?.passNum
"
placement="bottom"
>
......@@ -440,23 +465,31 @@
align-items: center;
"
>
<span
title="Variant SKU"
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
<el-tooltip
class="item"
effect="dark"
:content="'Variant SKU: ' + cardItem?.variantSku"
placement="bottom"
>
{{ cardItem?.variantSku }}
</span>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
>
{{ cardItem?.variantSku }}
</span>
</el-tooltip>
</el-col>
<el-col :span="10" :offset="0" style="text-align: right">
<el-tooltip
class="item"
effect="dark"
:content="'货号'"
:content="
'货号: ' + (cardItem?.supplierItemNo || '--')
"
placement="bottom"
>
<span
......@@ -475,35 +508,46 @@
align-items: center;
"
>
<span>工艺：</span>
<span
:title="String(cardItem?.processName)"
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
<el-tooltip
class="item"
effect="dark"
:content="'工艺: ' + (cardItem?.processName || '--')"
placement="bottom"
>
{{ cardItem?.processName }}
</span>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
>
{{ '工艺：' + (cardItem?.processName || '--') }}
</span>
</el-tooltip>
</el-col>
<el-col
:span="12"
:offset="0"
style="white-space: nowrap; text-align: right"
>
<span
:title="`店铺单号:${cardItem?.shopNumber}`"
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
<el-tooltip
class="item"
effect="dark"
:content="'店铺单号: ' + cardItem?.shopNumber"
placement="bottom"
>
{{ cardItem?.shopNumber }}
</span>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
>
{{ cardItem?.shopNumber }}
</span>
</el-tooltip>
</el-col>
</el-row>
<el-row style="margin-top: 5px">
......@@ -512,29 +556,63 @@
:offset="0"
style="white-space: nowrap"
>
<span
:title="`第三方生产单号:${cardItem?.thirdSubOrderNumber}`"
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.thirdSubOrderNumber || ''))
<el-tooltip
class="item"
effect="dark"
:content="
'第三方生产单号: ' + cardItem?.thirdSubOrderNumber
"
placement="bottom"
>
{{ cardItem?.thirdSubOrderNumber }}
</span>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.thirdSubOrderNumber || ''))
"
>
{{ cardItem?.thirdSubOrderNumber }}
</span>
</el-tooltip>
</el-col>
<el-col :span="12" :offset="0" style="text-align: right">
<el-col
:span="12"
:offset="0"
style="white-space: nowrap; text-align: right"
>
<el-tooltip
class="item"
effect="dark"
:content="'批次号: ' + cardItem?.factoryOrderNumber"
placement="bottom"
>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.factoryOrderNumber || ''))
"
>
{{ cardItem?.factoryOrderNumber }}
</span>
</el-tooltip>
</el-col>
<!-- <el-col :span="12" :offset="0" style="text-align: right">
<span v-if="!cardItem?.expectDeliveryTime"
>期望交货时间：--</span
>
<span v-else title="期望交货时间">
{{ cardItem?.expectDeliveryTime || '--' }}
</span>
</el-col>
</el-col> -->
</el-row>
<el-row style="margin-top: 5px">
<el-col
......@@ -560,20 +638,28 @@
:offset="0"
style="white-space: nowrap; text-align: right"
>
<span
:title="`第三方订单号:${cardItem?.thirdOrderNumber}`"
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.thirdOrderNumber || ''))
<el-tooltip
class="item"
effect="dark"
:content="
'第三方订单号: ' + cardItem?.thirdOrderNumber
"
placement="bottom"
>
{{ cardItem?.thirdOrderNumber }}
</span>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.thirdOrderNumber || ''))
"
>
{{ cardItem?.thirdOrderNumber }}
</span>
</el-tooltip>
</el-col>
</el-row>
</div>
......@@ -2317,6 +2403,13 @@ onBeforeUnmount(() => {
font-size: 15px;
}
}
.flex-row {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 15px;
}
}
}
.no-data {
......
src/views/order/podUs/index.vue
......@@ -1994,7 +1994,7 @@ const handleReComposingDesign = async (row: PodUsOrderListData) => {
try {
const res = await batchDownloadRecomposingApi({ id: row.id })
if (res.code !== 200) return
ElMessage.success('操作成功')
ElMessage.success(res.message)
search()
loadTabData()
} catch (e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment