|
|
@@ -29,10 +29,20 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
- <template #table-column-yfPayWay="{scope}">
|
|
|
- <div>
|
|
|
- {{ scope.row.yfPayWay == 1 ? '寄付' : '到付' }}
|
|
|
- </div>
|
|
|
+ <template #table-column-itemList="{scope}">
|
|
|
+ <template v-for="(item,idx) in scope.row.itemList">
|
|
|
+ <div v-if="idx<2">{{ item.name }} ¥{{ item.bigPrice?parseFloat(item.bigPrice):0 }} {{ item.itemNum?parseFloat(item.itemNum):0 }}</div>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <el-tooltip placement="top" v-if="scope.row.itemList.length>2">
|
|
|
+ <div slot="content">
|
|
|
+ <template v-for="(item,idx) in scope.row.itemList">
|
|
|
+ <div>{{ item.name }} ¥{{ item.bigPrice?parseFloat(item.bigPrice):0 }} {{ item.itemNum?parseFloat(item.itemNum):0 }}</div>
|
|
|
+ </template>
|
|
|
+ </div>
|
|
|
+ <div style="color:blue;">更多</div>
|
|
|
+ </el-tooltip>
|
|
|
+
|
|
|
</template>
|
|
|
|
|
|
<template #table-column-addTime="{scope}">
|
|
|
@@ -258,13 +268,19 @@ export default {
|
|
|
prop: 'cgStaffName',
|
|
|
label: '采购人',
|
|
|
align: 'center',
|
|
|
- width: 110
|
|
|
+ width: 100
|
|
|
},
|
|
|
{
|
|
|
prop: 'adminName',
|
|
|
label: '录单人',
|
|
|
align: 'center',
|
|
|
- width: 110
|
|
|
+ width: 100
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'itemList',
|
|
|
+ label: '花材',
|
|
|
+ align: 'center',
|
|
|
+ width: 170
|
|
|
},
|
|
|
{
|
|
|
prop: 'itemNum',
|
|
|
@@ -276,7 +292,7 @@ export default {
|
|
|
prop: 'prePrice',
|
|
|
label: '总金额',
|
|
|
align: 'center',
|
|
|
- width: '110'
|
|
|
+ width: '90'
|
|
|
},
|
|
|
{
|
|
|
prop: 'actPrice',
|
|
|
@@ -285,12 +301,6 @@ export default {
|
|
|
emptyText: '无',
|
|
|
width: '110'
|
|
|
},
|
|
|
- {
|
|
|
- prop: 'yfPayWay',
|
|
|
- label: '支付方式',
|
|
|
- align: 'center',
|
|
|
- width: 90
|
|
|
- },
|
|
|
{
|
|
|
prop: 'status',
|
|
|
label: '状态',
|
