Skip to content

F
factory_front
Commit 314fc48a by linjinhong
Options

Merge remote-tracking branch 'origin/dev'

parents e06eef02 14612664
Showing with 35 additions and 23 deletions
src/views/order/podUs/index.vue
...@@ -1618,9 +1618,9 @@ ...@@ -1618,9 +1618,9 @@
<div class="grid-item"> <div class="grid-item">
<div <div
:title="`variant SKU: ${cardItem?.variantSku || ''}`" :title="`variant SKU: ${cardItem?.variantSku || ''}`"
class="grid-item-value orderNumber" class="grid-item-value"
> >
{{ cardItem?.variantSku }} <div class="orderNumber">{{ cardItem?.variantSku }}</div>
<el-icon <el-icon
class="icon" class="icon"
style="margin-left: 3px" style="margin-left: 3px"
...@@ -1655,9 +1655,12 @@ ...@@ -1655,9 +1655,12 @@
<div class="grid-item"> <div class="grid-item">
<div <div
:title="`库存SKU:${cardItem?.thirdSkuCode || ''}`" :title="`库存SKU:${cardItem?.thirdSkuCode || ''}`"
class="grid-item-value orderNumber" class="grid-item-value"
> >
{{ cardItem?.thirdSkuCode }} <div class="orderNumber">
{{ cardItem?.thirdSkuCode }}
</div>
<el-icon <el-icon
class="icon" class="icon"
style="margin-left: 3px" style="margin-left: 3px"
...@@ -1691,11 +1694,13 @@ ...@@ -1691,11 +1694,13 @@
class="grid-item" class="grid-item"
:title="`店铺单号:${cardItem?.shopNumber || ''}`" :title="`店铺单号:${cardItem?.shopNumber || ''}`"
> >
<div class="grid-item-value orderNumber"> <div class="grid-item-value">
{{ cardItem?.shopNumber }} <div class="orderNumber">
{{ cardItem?.shopNumber }}
</div>
<el-icon <el-icon
class="icon" class="icon"
style="margin-left: 3px" style="margin-left: 3px; flex-shrink: 0"
size="14" size="14"
@click="copy(cardItem?.shopNumber || '')" @click="copy(cardItem?.shopNumber || '')"
> >
...@@ -1715,9 +1720,11 @@ ...@@ -1715,9 +1720,11 @@
<div class="grid-item"> <div class="grid-item">
<div <div
:title="`订单号:${cardItem?.thirdSubOrderNumber}`" :title="`订单号:${cardItem?.thirdSubOrderNumber}`"
class="grid-item-value orderNumber" class="grid-item-value"
> >
{{ cardItem?.thirdSubOrderNumber }} <div class="orderNumber">
{{ cardItem?.thirdSubOrderNumber }}
</div>
<el-icon <el-icon
class="icon" class="icon"
style="margin-left: 3px" style="margin-left: 3px"
...@@ -1735,17 +1742,19 @@ ...@@ -1735,17 +1742,19 @@
class="grid-item" class="grid-item"
:title="`批次号:${cardItem?.batchArrangeNumber || ''}`" :title="`批次号:${cardItem?.batchArrangeNumber || ''}`"
> >
<div class="grid-item-value orderNumber"> <div class="grid-item-value">
{{ cardItem?.batchArrangeNumber }} <div class="orderNumber">
<el-icon {{ cardItem?.batchArrangeNumber }}
class="icon" </div>
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.batchArrangeNumber || '')"
>
<DocumentCopy />
</el-icon>
</div> </div>
<el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.batchArrangeNumber || '')"
>
<DocumentCopy />
</el-icon>
</div> </div>
<div v-if="cardItem.isReplenishment" class="grid-item"> <div v-if="cardItem.isReplenishment" class="grid-item">
<el-tag size="small" type="danger" effect="dark" <el-tag size="small" type="danger" effect="dark"
...@@ -4976,8 +4985,9 @@ useRouter().beforeEach((to, from, next) => { ...@@ -4976,8 +4985,9 @@ useRouter().beforeEach((to, from, next) => {
.grid-item { .grid-item {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
width: 100%;
.grid-item-value { .grid-item-value {
display: flex;
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -5104,9 +5114,11 @@ useRouter().beforeEach((to, from, next) => { ...@@ -5104,9 +5114,11 @@ useRouter().beforeEach((to, from, next) => {
} }
} }
.orderNumber { .orderNumber {
display: flex; white-space: nowrap;
align-items: center; overflow: hidden;
justify-content: flex-start; text-overflow: ellipsis;
flex: 1;
min-width: 0; /* 关键属性 */
} }
.customizedQuantity { .customizedQuantity {
height: 28px; height: 28px;
......
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