|
|
@@ -160,11 +160,10 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.goods.goodsInfo')" min-width="300">
|
|
|
<template #default="{ row }">
|
|
|
- <div class="sa-flex" v-if="row.orderInfoVO && row.orderInfoVO.length > 0">
|
|
|
- <el-image :src="row.orderInfoVO[0].image" style="width: 60px; height: 60px; margin-right: 12px"
|
|
|
- fit="cover" />
|
|
|
+ <div class="sa-flex" v-if="row.productName">
|
|
|
+ <el-image :src="row.image" style="width: 60px; height: 60px; margin-right: 12px" fit="cover" />
|
|
|
<div>
|
|
|
- <div class="goods-title">{{ row.orderInfoVO[0].productName }}</div>
|
|
|
+ <div class="goods-title">{{ row.productName }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-else>-</div>
|
|
|
@@ -172,16 +171,16 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.goods.specification')" align="center">
|
|
|
<template #default="{ row }">
|
|
|
- <div v-if="row.orderInfoVO && row.orderInfoVO.length > 0">
|
|
|
- {{ row.orderInfoVO[0].sku || '-' }}
|
|
|
+ <div v-if="row.sku">
|
|
|
+ {{ row.sku || '-' }}
|
|
|
</div>
|
|
|
<div v-else>-</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.quantity')" min-width="80" align="center">
|
|
|
<template #default="{ row }">
|
|
|
- <div v-if="row.orderInfoVO && row.orderInfoVO.length > 0">
|
|
|
- {{ row.orderInfoVO[0].payNum || 0 }}
|
|
|
+ <div v-if="row.payNum">
|
|
|
+ {{ row.payNum || 0 }}
|
|
|
</div>
|
|
|
<div v-else>0</div>
|
|
|
</template>
|
|
|
@@ -200,8 +199,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.groupStatusLabel')" min-width="110" align="center">
|
|
|
<template #default="{ row }">
|
|
|
- <el-tag :type="getStatusType('pink', row.storePink?.status)">
|
|
|
- {{ getStatusText('pink', row.storePink?.status) }}
|
|
|
+ <el-tag :type="getStatusType('pink', row.storePinkStatus)">
|
|
|
+ {{ getStatusText('pink', row.storePinkStatus) }}
|
|
|
</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
