Commit 1162a0de by qinjianhui

fix: 问题修改

parent 7bbd818e
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
item.price || '--' item.price || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title font-bold">
<span class="order-list-expand_item_label">购买数:</span> <span class="order-list-expand_item_label">购买数:</span>
<span class="order-list-expand_item_value">{{ item.num || 0 }}</span> <span class="order-list-expand_item_value">{{ item.num || 0 }}</span>
</div> </div>
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">待质检:</span> <span class="order-list-expand_item_label">待质检:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
(item.shipmentNum || 0) - ((item.passNum || 0) + (item.notPassNum || 0)) (item.shipmentNum || 0) -
((item.passNum || 0) + (item.notPassNum || 0))
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
...@@ -107,7 +108,13 @@ ...@@ -107,7 +108,13 @@
item.notPassNum || 0 item.notPassNum || 0
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div
v-if="
(status === 3 || status === 4 || status === 2) &&
item.shipmentNum === 0
"
class="order-list-expand_item_info_title"
>
<el-button <el-button
type="success" type="success"
size="small" size="small"
...@@ -134,6 +141,9 @@ defineProps({ ...@@ -134,6 +141,9 @@ defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
status: {
type: Number,
},
}) })
const downloadManuscriptBySubOrder = async (item: ProductList) => { const downloadManuscriptBySubOrder = async (item: ProductList) => {
try { try {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { val } from '@/utils' import { val } from '@/utils'
import type { DetailList, SendOrderData } from '@/types/api/order' import type { SendOrderData } from '@/types/api/order'
import type { PropType } from 'vue' import type { PropType } from 'vue'
defineProps({ defineProps({
...@@ -62,25 +62,10 @@ const productProps = [ ...@@ -62,25 +62,10 @@ const productProps = [
{ label: 'Base SKU', key: 'baseSku' }, { label: 'Base SKU', key: 'baseSku' },
{ label: '变体SKU', key: 'variantSku' }, { label: '变体SKU', key: 'variantSku' },
], ],
[ [{ label: '生产单号', key: 'subOrderNumber' }],
{ label: '生产单号', key: 'subOrderNumber' },
],
[ [
{ label: '生产数', key: 'productionNum' }, { label: '生产数', key: 'productionNum' },
{ label: '发货数', key: 'shipmentNum' }, { label: '发货数', key: 'shipmentNum' },
{
label: '未发数',
key: (data: DetailList) =>
(data.productionNum || 0) -
((data.shipmentNum || 0) - (data.notPassNum || 0)),
},
{
label: '待质检',
key: (data: DetailList) =>
(data.shipmentNum || 0) - ((data.passNum || 0) + (data.notPassNum || 0)),
},
{ label: '质检(通过)', key: 'passNum' },
{ label: '质检(不通过)', key: 'notPassNum' },
], ],
] ]
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
class="order-list-expand" class="order-list-expand"
:style="{ width: `${thOrderDetailWidth + 50}px` }" :style="{ width: `${thOrderDetailWidth + 50}px` }"
> >
<ProductInfo :row="row" /> <ProductInfo :row="row" :status="statusCode"/>
<template v-if="row.productList.length > 2"> <template v-if="row.productList.length > 2">
<div class="order-list-expand_more"> <div class="order-list-expand_more">
<span @click="openAll(row)"> <span @click="openAll(row)">
......
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