|
@@ -51,10 +51,10 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.goodsInfo')" min-width="300">
|
|
<el-table-column :label="t('modules.order.goodsInfo')" min-width="300">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
- <div class="sa-flex" v-if="scope.row.orderInfoVO && scope.row.orderInfoVO.length > 0">
|
|
|
|
|
- <el-image :src="scope.row.orderInfoVO[0].image" class="goods-image" fit="cover" />
|
|
|
|
|
|
|
+ <div class="sa-flex" v-if="scope.row.productName">
|
|
|
|
|
+ <el-image :src="scope.row.image" class="goods-image" fit="cover" />
|
|
|
<div>
|
|
<div>
|
|
|
- <div class="goods-title">{{ scope.row.orderInfoVO[0].productName }}</div>
|
|
|
|
|
|
|
+ <div class="goods-title">{{ scope.row.productName }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else>-</div>
|
|
<div v-else>-</div>
|
|
@@ -62,16 +62,16 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.specification')" min-width="120" align="center">
|
|
<el-table-column :label="t('modules.order.specification')" min-width="120" align="center">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
- <div v-if="scope.row.orderInfoVO && scope.row.orderInfoVO.length > 0">
|
|
|
|
|
- {{ scope.row.orderInfoVO[0].sku || '-' }}
|
|
|
|
|
|
|
+ <div v-if="scope.row.sku">
|
|
|
|
|
+ {{ scope.row.sku || '-' }}
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else>-</div>
|
|
<div v-else>-</div>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.quantity')" min-width="80" align="center">
|
|
<el-table-column :label="t('modules.order.quantity')" min-width="80" align="center">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
- <div v-if="scope.row.orderInfoVO && scope.row.orderInfoVO.length > 0">
|
|
|
|
|
- {{ scope.row.orderInfoVO[0].payNum || 0 }}
|
|
|
|
|
|
|
+ <div v-if="scope.row.payNum">
|
|
|
|
|
+ {{ scope.row.payNum || 0 }}
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else>0</div>
|
|
<div v-else>0</div>
|
|
|
</template>
|
|
</template>
|
|
@@ -97,8 +97,8 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('modules.order.groupStatusLabel')" min-width="100" align="center">
|
|
<el-table-column :label="t('modules.order.groupStatusLabel')" min-width="100" align="center">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
- <el-tag :type="getStatusType('pink', scope.row.storePink?.status)">
|
|
|
|
|
- {{ getStatusText('pink', scope.row.storePink?.status) }}
|
|
|
|
|
|
|
+ <el-tag :type="getStatusType('pink', scope.row.storePinkStatus)">
|
|
|
|
|
+ {{ getStatusText('pink', scope.row.storePinkStatus) }}
|
|
|
</el-tag>
|
|
</el-tag>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|