Commit cf5f0dfe by qinjianhui

fix: 胚衣问题修改

parent dbfd307b
......@@ -143,6 +143,7 @@ export interface ProductList {
sizeType?: number | null
productMark?: string | null
customTagList?: { name: string }[]
productMark?: string
}
export interface cardImages {
title: string
......
......@@ -211,6 +211,17 @@
<span v-if="item.data" class="number">
{{ item.data.pickingNumber }}/{{ item.data.purchaseNumber }}
</span>
<div
v-if="
item.data &&
item.data.productList?.some(
(e) => e.productMark === 'custom_normal',
)
"
class="cb-product-mark"
>
<div class="red-circle"></div>
</div>
</div>
</div>
</div>
......@@ -1204,6 +1215,17 @@ const printNormal = async () => {
color: #ddd;
}
}
.cb-product-mark {
position: absolute;
top: 0;
right: 0;
.red-circle {
width: 8px;
height: 8px;
border-radius: 50%;
background-color: red;
}
}
</style>
<style lang="scss">
.pod-make-order-dialog {
......
......@@ -1390,7 +1390,7 @@
</template>
</ElDropdown> -->
<div
v-if="status === 'WAIT_SHIPMENT'"
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
style="
display: flex;
flex-direction: column;
......@@ -1410,7 +1410,7 @@
<!-- f -->
</div>
<div
v-if="status === 'WAIT_SHIPMENT'"
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
style="display: flex; justify-content: space-between"
>
<el-button
......@@ -1432,7 +1432,7 @@
</el-button>
</div>
<div
v-if="status === 'WAIT_SHIPMENT'"
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'"
style="
display: flex;
flex-direction: column;
......@@ -3900,10 +3900,14 @@ watch(
order.productList?.forEach((product) => {
if (!product.previewImgs && product.imageAry) {
try {
if (product.productMark === 'custom_normal') {
product.previewImgs = []
} else {
product.previewImgs =
JSON.parse(product.imageAry)?.filter(
(el: { title: string }) => el.title,
) || []
JSON.parse(product.imageAry)?.filter(
(el: { title: string }) => el.title,
) || []
}
} catch (error) {
console.error('JSON解析失败:', error)
product.previewImgs = []
......@@ -5237,7 +5241,7 @@ const handleMark = (mark: string) => {
return {
name: 'CB',
color: '#67C23A',
label: '海外供应',
label: '胚衣',
}
default:
return {
......
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